diff --git a/Android.mk b/Android.mk
index c08be7f..38732bb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_JAVA_LIBRARIES := bouncycastle
-LOCAL_STATIC_JAVA_LIBRARIES := guava
+LOCAL_STATIC_JAVA_LIBRARIES := guava android-support-v4
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cfa92b0..cf1f888 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -54,6 +54,7 @@
     <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" />
+    <uses-permission android:name="android.permission.SET_KEYBOARD_LAYOUT" />
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
@@ -77,7 +78,8 @@
         </activity>
 
         <activity android:name=".SubSettings"
-                android:taskAffinity="com.android.settings">
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings">
         </activity>
 
         <activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
@@ -91,7 +93,8 @@
         <!-- Wireless Controls -->
 
         <activity android:name="Settings$WirelessSettingsActivity"
-                android:label="@string/wireless_networks_settings_title">
+                android:label="@string/wireless_networks_settings_title"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -112,7 +115,8 @@
         <activity android:name="Settings$WifiSettingsActivity"
                 android:label="@string/wifi_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIFI_SETTINGS" />
@@ -140,7 +144,8 @@
         </activity-alias>
 
         <activity android:name=".wifi.WifiPickerActivity"
-                  android:clearTaskOnLaunch="true">
+                android:parentActivityName="Settings"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
@@ -148,6 +153,18 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".wifi.WifiSetupActivity"
+            android:theme="@style/setup_wizard_theme"
+            android:label="@string/wifi_setup_wizard_title"
+                android:icon="@drawable/empty_icon"
+            android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.net.wifi.SETUP_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"
@@ -158,7 +175,8 @@
         <activity android:name="Settings$AdvancedWifiSettingsActivity"
                 android:label="@string/wifi_advanced_settings_label"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIFI_IP_SETTINGS" />
@@ -176,7 +194,8 @@
         </activity>
 
         <activity android:name=".wifi.WifiInfo"
-                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+                android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -185,7 +204,8 @@
         </activity>
 
         <activity android:name=".wifi.WifiConfigInfo"
-                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+                android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -223,7 +243,8 @@
 
         <activity android:name="ApnSettings" android:label="@string/apn_settings"
                   android:configChanges="orientation|keyboardHidden|screenSize"
-                  android:launchMode="singleTask">
+                  android:launchMode="singleTask"
+                  android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -234,7 +255,8 @@
 
         <activity android:name="Settings$BluetoothSettingsActivity"
                 android:label="@string/bluetooth_settings_title"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.BLUETOOTH_SETTINGS" />
@@ -263,7 +285,8 @@
         <activity android:name=".bluetooth.DevicePickerActivity"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                 android:label="@string/device_picker"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -272,7 +295,8 @@
 
         <activity android:name="Settings$TetherSettingsActivity"
                 android:label="@string/tether_settings_title_all"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -306,7 +330,8 @@
         </activity-alias>
 
         <activity android:name="Settings$WifiP2pSettingsActivity"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -325,7 +350,8 @@
 
         <activity android:name="Settings$VpnSettingsActivity"
                 android:label="@string/vpn_settings_title"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.vpn.SETTINGS" />
@@ -344,7 +370,8 @@
         </activity>
 
         <activity android:name="Settings$DateTimeSettingsActivity"
-                android:label="@string/date_and_time">
+                android:label="@string/date_and_time"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.DATE_SETTINGS" />
@@ -368,7 +395,8 @@
 
         <activity android:name="Settings$LocalePickerActivity"
                 android:label="@string/language_picker_title"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.LOCALE_SETTINGS" />
@@ -383,7 +411,8 @@
 
         <activity android:name="Settings$InputMethodAndLanguageSettingsActivity"
                 android:label="@string/language_keyboard_settings_title"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
@@ -396,6 +425,19 @@
                 android:resource="@id/language_settings" />
         </activity>
 
+        <activity android:name="Settings$KeyboardLayoutPickerActivity"
+                android:label="@string/keyboard_layout_picker_title"
+                android:clearTaskOnLaunch="true">
+            <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.inputmethod.KeyboardLayoutPickerFragment" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/language_settings" />
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="LanguageSettings"
                 android:label="@string/language_keyboard_settings_title"
@@ -410,7 +452,8 @@
 
         <activity android:name="Settings$SpellCheckersSettingsActivity"
                 android:label="@string/spellcheckers_settings_title"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -446,11 +489,12 @@
 
         <activity android:name="Settings$UserDictionarySettingsActivity"
                 android:label="@string/user_dict_settings_titlebar"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:uiOptions="none"
+                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
-                <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -464,6 +508,20 @@
                 android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />
         </activity>
 
+        <activity android:name=".inputmethod.UserDictionaryAddWordActivity"
+                  android:label="@string/user_dict_settings_titlebar"
+                  android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
+                  android:windowSoftInputMode="stateVisible"
+                  android:noHistory="true"
+                  android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
+                <action android:name="com.android.settings.USER_DICTIONARY_EDIT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UserDictionarySettings"
                 android:label="@string/user_dict_settings_titlebar"
@@ -482,7 +540,8 @@
 
         <activity android:name="Settings$SoundSettingsActivity"
                 android:label="@string/sound_settings"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.SOUND_SETTINGS" />
@@ -511,7 +570,8 @@
 
         <activity android:name="Settings$DisplaySettingsActivity"
                 android:label="@string/display_settings"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -541,7 +601,8 @@
         <activity android:name="Settings$DockSettingsActivity"
                 android:label="@string/dock_settings_title"
                 android:enabled="@bool/has_dock_settings"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.DOCK_SETTINGS" />
@@ -569,7 +630,8 @@
 
         <activity android:name="Settings$DeviceInfoSettingsActivity"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
-                android:label="@string/device_info_settings">
+                android:label="@string/device_info_settings"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
@@ -603,7 +665,9 @@
 
         <activity android:name="Settings$ManageApplicationsActivity"
                 android:label="@string/applications_settings"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings"
+                android:uiOptions="none">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -670,7 +734,8 @@
              InstalledAppDetails. -->
         <activity android:name=".applications.InstalledAppDetailsTop"
                   android:label="@string/application_info_label"
-                  android:exported="true">
+                  android:exported="true"
+                  android:parentActivityName="Settings$ManageApplicationsActivity">
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -687,7 +752,8 @@
 
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$RunningServicesActivity"
-                android:label="@string/runningservices_settings_title">
+                android:label="@string/runningservices_settings_title"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -702,7 +768,8 @@
 
         <!-- Provide direct entry into manage apps showing storage usage of apps. -->
         <activity android:name="Settings$StorageUseActivity"
-                android:label="@string/storageuse_settings_title">
+                android:label="@string/storageuse_settings_title"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -719,7 +786,8 @@
         <activity android:name="Settings$LocationSettingsActivity"
                 android:label="@string/location_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
@@ -737,7 +805,8 @@
         <activity android:name="Settings$SecuritySettingsActivity"
                 android:label="@string/security_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SECURITY_SETTINGS" />
@@ -767,7 +836,8 @@
         <activity android:name="Settings$PrivacySettingsActivity"
                 android:label="@string/privacy_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.PRIVACY_SETTINGS" />
@@ -800,7 +870,8 @@
 
         <activity android:name="Settings$DeviceAdminSettingsActivity"
                 android:label="@string/device_admin_settings_title"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings$SecuritySettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -845,7 +916,8 @@
         <activity android:name="IccLockSettings"
                 android:label="@string/sim_lock_settings"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
-                android:process="com.android.phone">
+                android:process="com.android.phone"
+                android:parentActivityName="Settings$SecuritySettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -856,7 +928,8 @@
         <activity android:name="Settings$AccessibilitySettingsActivity"
                 android:label="@string/accessibility_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
@@ -871,7 +944,8 @@
         </activity>
 
         <activity android:name="Settings$TextToSpeechSettingsActivity"
-                android:label="@string/tts_settings">
+                android:label="@string/tts_settings"
+                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.TTS_SETTINGS" />
@@ -912,7 +986,8 @@
         <activity android:name=".deviceinfo.Status"
                 android:label="@string/device_status_activity_title"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
-                android:process="com.android.phone">
+                android:process="com.android.phone"
+                android:parentActivityName="Settings$DeviceInfoSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -921,7 +996,9 @@
         </activity>
 
         <activity android:name="Settings$StorageSettingsActivity"
-                android:label="@string/storage_settings_title">
+                android:label="@string/storage_settings_title"
+                android:uiOptions="none"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
@@ -981,7 +1058,8 @@
 
         <activity android:name="Settings$DevelopmentSettingsActivity"
                 android:label="@string/development_settings_title"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -1006,9 +1084,13 @@
                 android:resource="@id/development_settings" />
         </activity-alias>
 
+        <activity android:name=".AppPicker" android:label="@string/select_application"
+                android:theme="@android:style/Theme.Holo.Dialog" />
+
         <activity android:name="Settings$UsbSettingsActivity"
                 android:label="@string/storage_title_usb"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings$StorageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.STORAGE_USB_SETTINGS" />
@@ -1134,7 +1216,8 @@
         <!-- NFC settings -->
         <activity android:name="Settings$AndroidBeamSettingsActivity"
                 android:label="@string/android_beam_settings_title"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.NFCSHARING_SETTINGS" />
@@ -1144,18 +1227,6 @@
                 android:value="com.android.settings.nfc.AndroidBeam" />
         </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>
-
 
 
 
@@ -1175,7 +1246,8 @@
             </intent-filter>
         </receiver>
 
-        <activity android:name="BatteryInfo" android:label="@string/battery_info_label">
+        <activity android:name="BatteryInfo" android:label="@string/battery_info_label"
+                  android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -1184,7 +1256,8 @@
         </activity>
 
         <activity android:name="Display" android:label="@string/display_label"
-                android:configChanges="fontScale">
+                android:configChanges="fontScale"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -1238,7 +1311,7 @@
         <!-- Standard picker for widgets -->
         <activity android:name="AppWidgetPickActivity"
                 android:label="@string/widget_picker_title"
-                android:theme="@*android:style/Theme.Dialog.Alert"
+                android:theme="@*android:style/Theme.Holo.Dialog.Alert"
                 android:finishOnCloseSystemDialogs="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_PICK" />
@@ -1246,7 +1319,18 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="UsageStats" android:label="@string/usage_stats_label">
+        <activity android:name="AllowBindAppWidgetActivity"
+                android:theme="@*android:style/Theme.Holo.Dialog.Alert"
+                android:finishOnCloseSystemDialogs="true"
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_BIND" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="UsageStats" android:label="@string/usage_stats_label"
+                  android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -1254,7 +1338,9 @@
         </activity>
 
         <activity android:name="Settings$PowerUsageSummaryActivity"
-                android:label="@string/power_usage_summary_title">
+                android:label="@string/power_usage_summary_title"
+                android:uiOptions="none"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
@@ -1278,22 +1364,10 @@
                 android:resource="@id/battery_settings" />
         </activity-alias>
 
-        <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">
+            android:label="@string/account_sync_settings_title"
+            android:parentActivityName="Settings"
+            android:uiOptions="none">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -1302,13 +1376,24 @@
             <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" />
+                android:resource="@id/account_settings" />
+        </activity>
+
+        <activity android:name=".accounts.SyncSettingsActivity"
+            android:label="@string/account_sync_settings_title"
+            android:theme="@android:style/Theme.Holo.Dialog">
+            <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>
         </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">
+            android:label="@string/header_add_an_account"
+            android:parentActivityName="Settings$ManageAccountsSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
@@ -1326,8 +1411,8 @@
                   android:launchMode="singleTop"
                   android:excludeFromRecents="true"
                   android:theme="@android:style/Theme.Holo.NoActionBar"
-                  android:configChanges="mcc|mnc|keyboard|keyboardHidden|uiMode"
-                  android:windowSoftInputMode="stateVisible|adjustResize">
+                  android:configChanges="keyboard|keyboardHidden|uiMode"
+                  android:windowSoftInputMode="adjustResize">
             <intent-filter android:priority="10">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.HOME" />
@@ -1335,7 +1420,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".CryptKeeper$Blank"
+        <activity android:name=".CryptKeeper$FadeToBlack"
             android:immersive="true"
             android:launchMode="singleTop"
             android:theme="@style/CryptKeeperBlankTheme"
@@ -1363,7 +1448,8 @@
 
         <activity android:name="Settings$DataUsageSummaryActivity"
                 android:label="@string/data_usage_summary_title"
-                android:uiOptions="none">
+                android:uiOptions="none"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/assets/html/cs/tethering_help.html b/assets/html/cs/tethering_help.html
deleted file mode 100644
index 92ffb5a..0000000
--- a/assets/html/cs/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Sdílené datové připojení prostřednictvím portu USB</b></p>
-<span class="style1">Propojíte-li počítač a telefon kabelem USB, můžete připojení k internetu svého telefonu sdílet s připojeným počítačem.</span>
-<ul>
-<li>Sdílení datového připojení funguje v systémech Windows Vista, Windows 7 a Linux.</li><br>
-<li>Při sdílení datového připojení prostřednictvím portu USB nelze připojit kartu SD telefonu k počítači.</li><br>
-<li>Další informace včetně informací o sdílení datového připojení prostřednictvím portu USB v jiných operačních systémech naleznete na stránce <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Sdílení datového připojení prostřednictvím sítě WiFi</b></p>
-<span class="style1">Telefon může sloužit jako přístupový bod sítě WiFi. Připojení k internetu svého telefonu můžete sdílet hned s několika počítači nebo jinými zařízeními.</span>
-<ul>
-<li>Používáte-li telefon jako přístupový bod, nelze se pomocí aplikací v telefonu připojit k internetu prostřednictvím připojení WiFi.</li><br>
-<li>Přístupový bod WiFi můžete konfigurovat v nabídce nastavení  připojení WiFi.</li><br>
-<li>Další informace naleznete na stránce <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/cs/tethering_usb_help.html b/assets/html/cs/tethering_usb_help.html
deleted file mode 100644
index 425431f..0000000
--- a/assets/html/cs/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Sdílené datové připojení prostřednictvím portu USB</b></p>
-<span class="style1">Propojíte-li počítač a telefon kabelem USB, můžete připojení k internetu svého telefonu sdílet s připojeným počítačem.</span>
-<ul>
-<li>Sdílení datového připojení funguje v systémech Windows Vista, Windows 7 a Linux.</li><br>
-<li>Při sdílení datového připojení prostřednictvím portu USB nelze připojit kartu SD telefonu k počítači.</li><br>
-<li>Další informace včetně informací o sdílení datového připojení prostřednictvím portu USB v jiných operačních systémech naleznete na stránce <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/cs/tethering_wifi_help.html b/assets/html/cs/tethering_wifi_help.html
deleted file mode 100644
index 630438c..0000000
--- a/assets/html/cs/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Sdílení datového připojení prostřednictvím sítě WiFi</b></p>
-<span class="style1">Telefon může sloužit jako přístupový bod sítě WiFi. Připojení k internetu svého telefonu můžete sdílet hned s několika počítači nebo jinými zařízeními.</span>
-<ul>
-<li>Používáte-li telefon jako přístupový bod, nelze se pomocí aplikací v telefonu připojit k internetu prostřednictvím připojení WiFi.</li><br>
-<li>Přístupový bod WiFi můžete konfigurovat v nabídce nastavení  připojení WiFi.</li><br>
-<li>Další informace naleznete na stránce <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/da/tethering_help.html b/assets/html/da/tethering_help.html
deleted file mode 100644
index 3b2a553..0000000
--- a/assets/html/da/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB-tethering</b></p>
-<span class="style1">Du kan tether din telefon til din computer med et USB-kabel for at dele din telefons internetforbindelse med din computer</span>
-<ul>
-<li>Tethering fungerer med Windows Vista, Windows 7 og Linux</li><br>
-<li>Du kan ikke montere din telefons SD-kort på computeren, når USB er tethered</li><br>
-<li>Få flere oplysninger om bl.a. brug af USB-tethering med andre operativsystemer på <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Wi-Fi-tethering</b></p>
-<span class="style1">Du kan gøre din telefon til et Wi-Fi-adgangspunkt, så du kan dele din telefons internetforbindelse med en eller flere computere eller andre enheder</span>
-<ul>
-<li>Når din telefon fungerer som adgangspunkt, kan du ikke bruge programmerne på din telefon til at få adgang til internettet via dens Wi-Fi-forbindelse.</li><br>
-<li>Du kan konfigurere et Wi-Fi-adgangspunkt i indstillingerne for Wi-Fi-tethering</li><br>
-<li>Få flere oplysninger på <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/da/tethering_usb_help.html b/assets/html/da/tethering_usb_help.html
deleted file mode 100644
index f9f7fc1..0000000
--- a/assets/html/da/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB-tethering</b></p>
-<span class="style1">Du kan tether din telefon til din computer med et USB-kabel for at dele din telefons internetforbindelse med din computer</span>
-<ul>
-<li>Tethering fungerer med Windows Vista, Windows 7 og Linux</li><br>
-<li>Du kan ikke montere din telefons SD-kort på computeren, når USB er tethered</li><br>
-<li>Få flere oplysninger om bl.a. brug af USB-tethering med andre operativsystemer på <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/da/tethering_wifi_help.html b/assets/html/da/tethering_wifi_help.html
deleted file mode 100644
index 8c5063b..0000000
--- a/assets/html/da/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Wi-Fi-tethering</b></p>
-<span class="style1">Du kan gøre din telefon til et Wi-Fi-adgangspunkt, så du kan dele din telefons internetforbindelse med en eller flere computere eller andre enheder</span>
-<ul>
-<li>Når din telefon fungerer som adgangspunkt, kan du ikke bruge programmerne på din telefon til at få adgang til internettet via dens Wi-Fi-forbindelse.</li><br>
-<li>Du kan konfigurere et Wi-Fi-adgangspunkt i indstillingerne for Wi-Fi-tethering</li><br>
-<li>Få flere oplysninger på <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/de/tethering_help.html b/assets/html/de/tethering_help.html
deleted file mode 100644
index 317e176..0000000
--- a/assets/html/de/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB-Tethering</b></p>
-<span class="style1">Sie können Ihr Telefon über ein USB-Kabel mit Ihrem Computer verbinden, um die Internetverbindung auf Ihrem Telefon auf Ihrem Computer nutzen zu können.</span>
-<ul>
-<li>Tethering funktioniert mit Windows Vista, Windows 7 und Linux.</li><br>
-<li>Sie können die SD-Karte Ihres Telefons nicht in Ihren Computer einsetzen, solange eine USB-Verbindung besteht.</li><br>
-<li>Weitere Informationen (einschließlich USB-Tethering mit anderen Betriebssystemen) finden Sie auf <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-<p><b>Wi-Fi-Tethering</b></p>
-<span class="style1">Sie können Ihr Telefon in einen Wi-Fi-Zugangspunkt verwandeln, um die Internetverbindung Ihres Telefons auf einem oder mehreren Computern bzw. anderen Geräten nutzen zu können.</span>
-<ul>
-<li>Wenn Ihr Telefon als Zugangspunkt fungiert, können Sie die darauf installierten Anwendungen nicht verwenden, um über die Wi-Fi-Verbindung auf das Internet zuzugreifen.</li><br>
-<li>Sie konfigurieren einen Wi-Fi-Zugangspunkt in den Wi-Fi-Tethering-Einstellungen.</li><br>
-<li>Weitere Informationen erhalten Sie auf <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/de/tethering_usb_help.html b/assets/html/de/tethering_usb_help.html
deleted file mode 100644
index 8bad77d..0000000
--- a/assets/html/de/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB-Tethering</b></p>
-<span class="style1">Sie können Ihr Telefon über ein USB-Kabel mit Ihrem Computer verbinden, um die Internetverbindung auf Ihrem Telefon auf Ihrem Computer nutzen zu können.</span>
-<ul>
-<li>Tethering funktioniert mit Windows Vista, Windows 7 und Linux.</li><br>
-<li>Sie können die SD-Karte Ihres Telefons nicht in Ihren Computer einsetzen, solange eine USB-Verbindung besteht.</li><br>
-<li>Weitere Informationen (einschließlich USB-Tethering mit anderen Betriebssystemen) finden Sie auf <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/de/tethering_wifi_help.html b/assets/html/de/tethering_wifi_help.html
deleted file mode 100644
index a708766..0000000
--- a/assets/html/de/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Wi-Fi-Tethering</b></p>
-<span class="style1">Sie können Ihr Telefon in einen Wi-Fi-Zugangspunkt verwandeln, um die Internetverbindung Ihres Telefons auf einem oder mehreren Computern bzw. anderen Geräten nutzen zu können.</span>
-<ul>
-<li>Wenn Ihr Telefon als Zugangspunkt fungiert, können Sie die darauf installierten Anwendungen nicht verwenden, um über die Wi-Fi-Verbindung auf das Internet zuzugreifen.</li><br>
-<li>Sie konfigurieren einen Wi-Fi-Zugangspunkt in den Wi-Fi-Tethering-Einstellungen.</li><br>
-<li>Weitere Informationen erhalten Sie auf <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/el/tethering_help.html b/assets/html/el/tethering_help.html
deleted file mode 100644
index eae22eb..0000000
--- a/assets/html/el/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Σύνδεση μέσω κινητής συσκευής με USB</b></p>
-<span class="style1">Μπορείτε να συνδέσετε το τηλέφωνο με τον υπολογιστή σας με ένα καλώδιο USB, για κοινή χρήση της σύνδεσης στο Διαδίκτυο του τηλεφώνου σας με τον υπολογιστή σας</span>
-<ul>
-<li>Η σύνδεση μέσω κινητής συσκευής λειτουργεί με Windows Vista, Windows 7 και Linux</li><br>
-<li>Δεν είναι δυνατό να τοποθετήσετε την κάρτα SD του τηλεφώνου στον υπολογιστή σας, όταν υπάρχει σύνδεση μέσω κινητής συσκευής με USB</li><br>
-<li>Για περισσότερες πληροφορίες, συμπεριλαμβανομένης εκείνων για τη σύνδεση μέσω κινητής συσκευής με USB με άλλα λειτουργικά συστήματα, ανατρέξτε στη διεύθυνση <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Σύνδεση μέσω κινητής συσκευής με Wi-Fi</b></p>
-<span class="style1">Μπορείτε να μετατρέψετε το τηλέφωνό σας σε ένα σημείο πρόσβασης Wi-Fi, για κοινή χρήση της σύνδεσης στο Διαδίκτυο του τηλεφώνου σας με έναν ή περισσότερους υπολογιστές ή άλλες συσκευές</span>
-<ul>
-<li>Όταν το τηλέφωνό σας λειτουργεί ως σημείο πρόσβασης, δεν είναι δυνατό να χρησιμοποιήσετε τις εφαρμογές του τηλεφώνου σας για να αποκτήσετε πρόσβαση στο Διαδίκτυο μέσω της σύνδεσης Wi-Fi</li><br>
-<li>Μπορείτε να ρυθμίσετε ένα σημείο πρόσβασης Wi-Fi στις ρυθμίσεις σύνδεσης μέσω κινητής συσκευής με Wi-Fi</li><br>
-<li>Για περισσότερες πληροφορίες, επισκεφθείτε τη διεύθυνση <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/el/tethering_usb_help.html b/assets/html/el/tethering_usb_help.html
deleted file mode 100644
index 96ea2c8..0000000
--- a/assets/html/el/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Σύνδεση μέσω κινητής συσκευής με USB</b></p>
-<span class="style1">Μπορείτε να συνδέσετε το τηλέφωνο με τον υπολογιστή σας με ένα καλώδιο USB, για κοινή χρήση της σύνδεσης στο Διαδίκτυο του τηλεφώνου σας με τον υπολογιστή σας</span>
-<ul>
-<li>Η σύνδεση μέσω κινητής συσκευής λειτουργεί με Windows Vista, Windows 7 και Linux</li><br>
-<li>Δεν είναι δυνατό να τοποθετήσετε την κάρτα SD του τηλεφώνου στον υπολογιστή σας, όταν υπάρχει σύνδεση μέσω κινητής συσκευής με USB</li><br>
-<li>Για περισσότερες πληροφορίες, συμπεριλαμβανομένης εκείνων για τη σύνδεση μέσω κινητής συσκευής με USB με άλλα λειτουργικά συστήματα, ανατρέξτε στη διεύθυνση <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/el/tethering_wifi_help.html b/assets/html/el/tethering_wifi_help.html
deleted file mode 100644
index 8507748..0000000
--- a/assets/html/el/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Σύνδεση μέσω κινητής συσκευής με Wi-Fi</b></p>
-<span class="style1">Μπορείτε να μετατρέψετε το τηλέφωνό σας σε ένα σημείο πρόσβασης Wi-Fi, για κοινή χρήση της σύνδεσης στο Διαδίκτυο του τηλεφώνου σας με έναν ή περισσότερους υπολογιστές ή άλλες συσκευές</span>
-<ul>
-<li>Όταν το τηλέφωνό σας λειτουργεί ως σημείο πρόσβασης, δεν είναι δυνατό να χρησιμοποιήσετε τις εφαρμογές του τηλεφώνου σας για να αποκτήσετε πρόσβαση στο Διαδίκτυο μέσω της σύνδεσης Wi-Fi</li><br>
-<li>Μπορείτε να ρυθμίσετε ένα σημείο πρόσβασης Wi-Fi στις ρυθμίσεις σύνδεσης μέσω κινητής συσκευής με Wi-Fi</li><br>
-<li>Για περισσότερες πληροφορίες, επισκεφθείτε τη διεύθυνση <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/en_gb/tethering_help.html b/assets/html/en_gb/tethering_help.html
deleted file mode 100644
index 63fec31..0000000
--- a/assets/html/en_gb/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</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>
-<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>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>Wi-Fi tethering</b></p>
-<span class="style1">You can turn your phone into a Wi-Fi access point, to share your phone's Internet connection with one or more computers or other devices</span>
-<ul>
-<li>When your phone is acting as an access point, you can't use your phone's applications to access the Internet via its Wi-Fi connection</li><br>
-<li>You configure a Wi-Fi access point in Wi-Fi tethering 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>
-</body>
-</html>
diff --git a/assets/html/en_gb/tethering_usb_help.html b/assets/html/en_gb/tethering_usb_help.html
deleted file mode 100644
index 50e2154..0000000
--- a/assets/html/en_gb/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</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>
-<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>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>
-</html>
diff --git a/assets/html/en_gb/tethering_wifi_help.html b/assets/html/en_gb/tethering_wifi_help.html
deleted file mode 100644
index 3e8c1af..0000000
--- a/assets/html/en_gb/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Wi-Fi tethering</b></p>
-<span class="style1">You can turn your phone into a Wi-Fi access point, to share your phone's Internet connection with one or more computers or other devices</span>
-<ul>
-<li>When your phone is acting as an access point, you can't use your phone's applications to access the Internet via its Wi-Fi connection</li><br>
-<li>You configure a Wi-Fi access point in Wi-Fi tethering 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>
-</body>
-</html>
diff --git a/assets/html/en_us/tethering_bluetooth_help.html b/assets/html/en_us/tethering_bluetooth_help.html
deleted file mode 100644
index eb181f8..0000000
--- a/assets/html/en_us/tethering_bluetooth_help.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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
deleted file mode 100644
index e980b20..0000000
--- a/assets/html/en_us/tethering_help.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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>USB tethering</b></p>
-<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>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>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>
-
-<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>
-</body>
-</html>
diff --git a/assets/html/en_us/tethering_usb_help.html b/assets/html/en_us/tethering_usb_help.html
deleted file mode 100644
index b3dbf58..0000000
--- a/assets/html/en_us/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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>USB tethering</b></p>
-<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>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>
-</html>
diff --git a/assets/html/en_us/tethering_wifi_help.html b/assets/html/en_us/tethering_wifi_help.html
deleted file mode 100644
index 621f869..0000000
--- a/assets/html/en_us/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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>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>
-</body>
-</html>
diff --git a/assets/html/es/tethering_help.html b/assets/html/es/tethering_help.html
deleted file mode 100644
index 35a1e16..0000000
--- a/assets/html/es/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Anclaje de USB</b></p>
-<span class="style1">Puedes anclar el teléfono a tu ordenador con un cable USB para compartir la conexión a Internet del teléfono con el equipo.</span>
-<ul>
-<li>El anclaje funciona con Windows Vista, Windows 7 y Linux.</li><br>
-<li>Puedes montar la tarjeta SD del teléfono en el equipo una vez realizado el anclaje de USB.</li><br>
-<li>Para obtener más información, incluido el uso del anclaje de USB con otros sistemas operativos, consulta la página <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-<p><b>Anclaje a red Wi-Fi</b></p>
-<span class="style1">Puedes convertir el teléfono en un punto de acceso Wi-Fi para compartir la conexión a Internet del teléfono con uno o con varios equipos o dispositivos.</span>
-<ul>
-<li>Cuando el teléfono actúe como un punto de acceso, no podrás utilizar sus aplicaciones para acceder a Internet a través de la conexión Wi-Fi del dispositivo.</li><br>
-<li>Para configurar un punto de acceso Wi-Fi, accede a la configuración de anclaje a red Wi-Fi.</li><br>
-<li>Para obtener más información, consulta la página <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/es/tethering_usb_help.html b/assets/html/es/tethering_usb_help.html
deleted file mode 100644
index ec7a746..0000000
--- a/assets/html/es/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Anclaje de USB</b></p>
-<span class="style1">Puedes anclar el teléfono a tu ordenador con un cable USB para compartir la conexión a Internet del teléfono con el equipo.</span>
-<ul>
-<li>El anclaje funciona con Windows Vista, Windows 7 y Linux.</li><br>
-<li>Puedes montar la tarjeta SD del teléfono en el equipo una vez realizado el anclaje de USB.</li><br>
-<li>Para obtener más información, incluido el uso del anclaje de USB con otros sistemas operativos, consulta la página <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/es/tethering_wifi_help.html b/assets/html/es/tethering_wifi_help.html
deleted file mode 100644
index 0761735..0000000
--- a/assets/html/es/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Anclaje a red Wi-Fi</b></p>
-<span class="style1">Puedes convertir el teléfono en un punto de acceso Wi-Fi para compartir la conexión a Internet del teléfono con uno o con varios equipos o dispositivos.</span>
-<ul>
-<li>Cuando el teléfono actúe como un punto de acceso, no podrás utilizar sus aplicaciones para acceder a Internet a través de la conexión Wi-Fi del dispositivo.</li><br>
-<li>Para configurar un punto de acceso Wi-Fi, accede a la configuración de anclaje a red Wi-Fi.</li><br>
-<li>Para obtener más información, consulta la página <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/es_us/tethering_help.html b/assets/html/es_us/tethering_help.html
deleted file mode 100644
index f3055a0..0000000
--- a/assets/html/es_us/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Anclaje a red USB</b></p>
-<span class="style1">Puedes anclar tu teléfono a tu computadora con un cable USB para compartir la conexión a Internet de tu teléfono con tu computadora.</span>
-<ul>
-<li>El anclaje funciona con Windows Vista, Windows 7 y Linux.</li><br>
-<li>No puedes montar la tarjeta SD de tu teléfono en tu computadora cuando el USB esté anclado.</li><br>
-<li>Para obtener más información, incluido el anclaje a red USB con otros SO, consulta <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-<p><b>Anclaje a redes de Wi-Fi</b></p>
-<span class="style1">Puedes cambiar tu teléfono a un punto de acceso Wi-Fi para compartir la conexión a Internet de tu teléfono con una computadora o un dispositivo, o más.</span>
-<ul>
-<li>Cuando tu teléfono actúa como punto de acceso, no puedes usar las aplicaciones de tu teléfono para acceder a Internet a través de la conexión Wi-Fi.</li><br>
-<li>Debes configurar un punto de acceso Wi-Fi en configuración de anclaje a redes de Wi-Fi.</li><br>
-<li>Para obtener más información, visita <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/es_us/tethering_usb_help.html b/assets/html/es_us/tethering_usb_help.html
deleted file mode 100644
index b29b8a9..0000000
--- a/assets/html/es_us/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Anclaje a red USB</b></p>
-<span class="style1">Puedes anclar tu teléfono a tu computadora con un cable USB para compartir la conexión a Internet de tu teléfono con tu computadora.</span>
-<ul>
-<li>El anclaje funciona con Windows Vista, Windows 7 y Linux.</li><br>
-<li>No puedes montar la tarjeta SD de tu teléfono en tu computadora cuando el USB esté anclado.</li><br>
-<li>Para obtener más información, incluido el anclaje a red USB con otros SO, consulta <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/es_us/tethering_wifi_help.html b/assets/html/es_us/tethering_wifi_help.html
deleted file mode 100644
index ae08093..0000000
--- a/assets/html/es_us/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Anclaje a redes de Wi-Fi</b></p>
-<span class="style1">Puedes cambiar tu teléfono a un punto de acceso Wi-Fi para compartir la conexión a Internet de tu teléfono con una computadora o un dispositivo, o más.</span>
-<ul>
-<li>Cuando tu teléfono actúa como punto de acceso, no puedes usar las aplicaciones de tu teléfono para acceder a Internet a través de la conexión Wi-Fi.</li><br>
-<li>Debes configurar un punto de acceso Wi-Fi en configuración de anclaje a redes de Wi-Fi.</li><br>
-<li>Para obtener más información, visita <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/fr/tethering_help.html b/assets/html/fr/tethering_help.html
deleted file mode 100644
index 7356067..0000000
--- a/assets/html/fr/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Partage de connexion par USB</b></p>
-<span class="style1">Vous pouvez partager la connexion Internet de votre mobile avec votre ordinateur, cela en connectant le téléphone à l'ordinateur par le biais d'un câble USB.</span>
-<ul>
-<li>Ce procédé est possible avec Windows Vista, Windows 7 et Linux</li><br>
-<li>Vous ne pouvez cependant pas monter la carte SD du mobile sur l'ordinateur en cas de partage de connexion par USB.</li><br>
-<li>Pour de plus amples informations, en particulier sur le partage de connexion par USB avec d'autres systèmes d'exploitation, consultez la page <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Partage de connexion via Wi-Fi</b></p>
-<span class="style1">Vous pouvez transformer votre mobile en point d'accès Wi-Fi et ainsi partager la connexion Internet du téléphone avec un ou plusieurs ordinateurs ou autres appareils.</span>
-<ul>
-<li>Lorsque votre mobile fait office de point d'accès, notez qu'il n'est pas possible d'utiliser ses applications pour accéder à Internet via sa connexion Wi-Fi.</li><br>
-<li>Vous configurez un point d'accès Wi-Fi dans les paramètres de partage de connexion via Wi-Fi.</li><br>
-<li>Pour de plus amples informations, consultez la page <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/fr/tethering_usb_help.html b/assets/html/fr/tethering_usb_help.html
deleted file mode 100644
index 2000bcc..0000000
--- a/assets/html/fr/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Partage de connexion par USB</b></p>
-<span class="style1">Vous pouvez partager la connexion Internet de votre mobile avec votre ordinateur, cela en connectant le téléphone à l'ordinateur par le biais d'un câble USB.</span>
-<ul>
-<li>Ce procédé est possible avec Windows Vista, Windows 7 et Linux</li><br>
-<li>Vous ne pouvez cependant pas monter la carte SD du mobile sur l'ordinateur en cas de partage de connexion par USB.</li><br>
-<li>Pour de plus amples informations, en particulier sur le partage de connexion par USB avec d'autres systèmes d'exploitation, consultez la page <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/fr/tethering_wifi_help.html b/assets/html/fr/tethering_wifi_help.html
deleted file mode 100644
index 4fab911..0000000
--- a/assets/html/fr/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Partage de connexion via Wi-Fi</b></p>
-<span class="style1">Vous pouvez transformer votre mobile en point d'accès Wi-Fi et ainsi partager la connexion Internet du téléphone avec un ou plusieurs ordinateurs ou autres appareils.</span>
-<ul>
-<li>Lorsque votre mobile fait office de point d'accès, notez qu'il n'est pas possible d'utiliser ses applications pour accéder à Internet via sa connexion Wi-Fi.</li><br>
-<li>Vous configurez un point d'accès Wi-Fi dans les paramètres de partage de connexion via Wi-Fi.</li><br>
-<li>Pour de plus amples informations, consultez la page <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/it/tethering_help.html b/assets/html/it/tethering_help.html
deleted file mode 100644
index 7434bb8..0000000
--- a/assets/html/it/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Tethering USB</b></p>
-<span class="style1">È possibile eseguire il tethering tra telefono e computer con un cavo USB per condividere la connessione Internet del cellulare con il computer.</span>
-<ul>
-<li>Il tethering funziona con Windows Vista, Windows 7 e Linux.</li><br>
-<li>Non è possibile montare la scheda SD del telefono sul computer quando viene eseguito il tethering USB.</li><br>
-<li>Per ulteriori informazioni, incluso l'utilizzo del tethering USB con altri sistemi operativi, visita l'indirizzo <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-<p><b>Tethering Wi-Fi</b></p>
-<span class="style1">È possibile trasformare il telefono in un punto di accesso Wi-Fi per condividere la connessione Internet del cellulare con uno o più computer o altri dispositivi.</span>
-<ul>
-<li>Quando il telefono funge da punto di accesso, non è possibile utilizzare le applicazioni del telefono per accedere a Internet attraverso la sua connessione Wi-Fi.</li><br>
-<li>Puoi configurare un punto di accesso Wi-Fi nelle impostazioni di tethering Wi-Fi.</li><br>
-<li>Per ulteriori informazioni, visita l'indirizzo <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/it/tethering_usb_help.html b/assets/html/it/tethering_usb_help.html
deleted file mode 100644
index fcd7a03..0000000
--- a/assets/html/it/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Tethering USB</b></p>
-<span class="style1">È possibile eseguire il tethering tra telefono e computer con un cavo USB per condividere la connessione Internet del cellulare con il computer.</span>
-<ul>
-<li>Il tethering funziona con Windows Vista, Windows 7 e Linux.</li><br>
-<li>Non è possibile montare la scheda SD del telefono sul computer quando viene eseguito il tethering USB.</li><br>
-<li>Per ulteriori informazioni, incluso l'utilizzo del tethering USB con altri sistemi operativi, visita l'indirizzo <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/it/tethering_wifi_help.html b/assets/html/it/tethering_wifi_help.html
deleted file mode 100644
index d53b07f..0000000
--- a/assets/html/it/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Tethering Wi-Fi</b></p>
-<span class="style1">È possibile trasformare il telefono in un punto di accesso Wi-Fi per condividere la connessione Internet del cellulare con uno o più computer o altri dispositivi.</span>
-<ul>
-<li>Quando il telefono funge da punto di accesso, non è possibile utilizzare le applicazioni del telefono per accedere a Internet attraverso la sua connessione Wi-Fi.</li><br>
-<li>Puoi configurare un punto di accesso Wi-Fi nelle impostazioni di tethering Wi-Fi.</li><br>
-<li>Per ulteriori informazioni, visita l'indirizzo <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/ja/tethering_help.html b/assets/html/ja/tethering_help.html
deleted file mode 100644
index 4fd6065..0000000
--- a/assets/html/ja/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB テザリング</b></p>
-<span class="style1">USB ケーブルを使って携帯端末をパソコンにテザリングし、端末のインターネット接続をパソコンと共有できます。</span>
-<ul>
-<li>テザリング機能は、Windows Vista、Windows 7、Linux でご利用いただけます。</li><br>
-<li>USB テザリング中は、パソコンで端末の SD カードをマウントすることはできません。</li><br>
-<li>その他の OS で USB をテザリングする方法など、テザリングについて詳しくは <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a> をご覧ください。</li><br>
-</ul>
-<p><b>Wi-Fi テザリング</b></p>
-<span class="style1">お使いの携帯端末を Wi-Fi アクセス ポイントとして利用し、端末のインターネット接続を 1 台以上のパソコンやその他の端末で共有できます。</span>
-<ul>
-<li>端末がアクセス ポイントとして機能している場合は、端末のアプリケーションを使用して、端末の Wi-Fi 接続経由でインターネットにアクセスすることはできません。</li><br>
-<li>Wi-Fi アクセス ポイントの設定は [Wi-Fiテザリング設定] で行います。</li><br>
-<li>詳しくは <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> をご覧ください。</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/ja/tethering_usb_help.html b/assets/html/ja/tethering_usb_help.html
deleted file mode 100644
index 9bd95e6..0000000
--- a/assets/html/ja/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB テザリング</b></p>
-<span class="style1">USB ケーブルを使って携帯端末をパソコンにテザリングし、端末のインターネット接続をパソコンと共有できます。</span>
-<ul>
-<li>テザリング機能は、Windows Vista、Windows 7、Linux でご利用いただけます。</li><br>
-<li>USB テザリング中は、パソコンで端末の SD カードをマウントすることはできません。</li><br>
-<li>その他の OS で USB をテザリングする方法など、テザリングについて詳しくは <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a> をご覧ください。</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/ja/tethering_wifi_help.html b/assets/html/ja/tethering_wifi_help.html
deleted file mode 100644
index d6c2a9a..0000000
--- a/assets/html/ja/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Wi-Fi テザリング</b></p>
-<span class="style1">お使いの携帯端末を Wi-Fi アクセス ポイントとして利用し、端末のインターネット接続を 1 台以上のパソコンやその他の端末で共有できます。</span>
-<ul>
-<li>端末がアクセス ポイントとして機能している場合は、端末のアプリケーションを使用して、端末の Wi-Fi 接続経由でインターネットにアクセスすることはできません。</li><br>
-<li>Wi-Fi アクセス ポイントの設定は [Wi-Fiテザリング設定] で行います。</li><br>
-<li>詳しくは <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> をご覧ください。</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/ko/tethering_help.html b/assets/html/ko/tethering_help.html
deleted file mode 100644
index 0239f68..0000000
--- a/assets/html/ko/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB 테더링</b></p>
-<span class="style1">USB 케이블로 휴대전화를 컴퓨터에 테더링하여 휴대전화의 인터넷 연결을 컴퓨터와 공유할 수 있습니다.</span>
-<ul>
-<li>테더링은 Windows Vista, Windows 7, 및 Linux에서 지원합니다.</li><br>
-<li>USB 테더링 중에 휴대전화의 SD카드를 컴퓨터에 마운트할 수 없습니다.</li><br>
-<li>기타 운영 체제에서의 테더링 사용을 비롯한 자세한 내용은 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>를 참조하세요.</li><br>
-</ul>
-<p><b>Wi-Fi 테더링</b></p>
-<span class="style1">휴대전화를 Wi-Fi 액세스 포인트로 전환하여 휴대전화의 인터넷 연결을 하나 이상의 컴퓨터 또는 기타 기기와 공유할 수 있습니다.</span>
-<ul>
-<li>휴대전화가 액세스 포인트 역할을 하는 경우 휴대전화의 응용프로그램은 휴대전화의 Wi-Fi 연결을 통해 인터넷에 액세스할 수 없습니다.</li><br>
-<li>Wi-Fi 테더링 설정에서 Wi-Fi 액세스 포인트를 구성할 수 있습니다.</li><br>
-<li>자세한 내용은 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>를 참조하세요.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/ko/tethering_usb_help.html b/assets/html/ko/tethering_usb_help.html
deleted file mode 100644
index 66ac3de..0000000
--- a/assets/html/ko/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB 테더링</b></p>
-<span class="style1">USB 케이블로 휴대전화를 컴퓨터에 테더링하여 휴대전화의 인터넷 연결을 컴퓨터와 공유할 수 있습니다.</span>
-<ul>
-<li>테더링은 Windows Vista, Windows 7, 및 Linux에서 지원합니다.</li><br>
-<li>USB 테더링 중에 휴대전화의 SD카드를 컴퓨터에 마운트할 수 없습니다.</li><br>
-<li>기타 운영 체제에서의 테더링 사용을 비롯한 자세한 내용은 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>를 참조하세요.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/ko/tethering_wifi_help.html b/assets/html/ko/tethering_wifi_help.html
deleted file mode 100644
index b51b93e..0000000
--- a/assets/html/ko/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Wi-Fi 테더링</b></p>
-<span class="style1">휴대전화를 Wi-Fi 액세스 포인트로 전환하여 휴대전화의 인터넷 연결을 하나 이상의 컴퓨터 또는 기타 기기와 공유할 수 있습니다.</span>
-<ul>
-<li>휴대전화가 액세스 포인트 역할을 하는 경우 휴대전화의 응용프로그램은 휴대전화의 Wi-Fi 연결을 통해 인터넷에 액세스할 수 없습니다.</li><br>
-<li>Wi-Fi 테더링 설정에서 Wi-Fi 액세스 포인트를 구성할 수 있습니다.</li><br>
-<li>자세한 내용은 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>를 참조하세요.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/nl/tethering_help.html b/assets/html/nl/tethering_help.html
deleted file mode 100644
index febd1af..0000000
--- a/assets/html/nl/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB-tethering</b></p>
-<span class="style1">U kunt uw telefoon tetheren met een USB-kabel om de internetverbinding van uw telefoon te delen met uw computer</span>
-<ul>
-<li>Tethering werkt met Windows Vista, Windows 7 en Linux</li><br>
-<li>U kunt de SD-kaart van uw telefoon niet koppelen aan uw computer tijdens USB-tethering</li><br>
-<li>Raadpleeg <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a> voor meer informatie, waaronder het gebruik van USB-tethering met andere besturingssystemen.</li><br>
-</ul>
-<p><b>Wi-Fi-tethering</b></p>
-<span class="style1">U kunt uw telefoon gebruiken als Wi-Fi-toegangspunt om de internetverbinding van uw telefoon te delen met een of meer computers of andere apparaten</span>
-<ul>
-<li>Wanneer uw telefoon wordt gebruikt als toegangspunt, kunt u de toepassingen op uw telefoon niet gebruiken om via de Wi-Fi-verbinding toegang tot internet te krijgen</li><br>
-<li>U configureert een Wi-Fi-toegangspunt in de instellingen voor Wi-Fi-tethering</li><br>
-<li>Ga naar <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> voor meer informatie.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/nl/tethering_usb_help.html b/assets/html/nl/tethering_usb_help.html
deleted file mode 100644
index fc027da..0000000
--- a/assets/html/nl/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB-tethering</b></p>
-<span class="style1">U kunt uw telefoon tetheren met een USB-kabel om de internetverbinding van uw telefoon te delen met uw computer</span>
-<ul>
-<li>Tethering werkt met Windows Vista, Windows 7 en Linux</li><br>
-<li>U kunt de SD-kaart van uw telefoon niet koppelen aan uw computer tijdens USB-tethering</li><br>
-<li>Raadpleeg <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a> voor meer informatie, waaronder het gebruik van USB-tethering met andere besturingssystemen.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/nl/tethering_wifi_help.html b/assets/html/nl/tethering_wifi_help.html
deleted file mode 100644
index 13f0fa0..0000000
--- a/assets/html/nl/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Wi-Fi-tethering</b></p>
-<span class="style1">U kunt uw telefoon gebruiken als Wi-Fi-toegangspunt om de internetverbinding van uw telefoon te delen met een of meer computers of andere apparaten</span>
-<ul>
-<li>Wanneer uw telefoon wordt gebruikt als toegangspunt, kunt u de toepassingen op uw telefoon niet gebruiken om via de Wi-Fi-verbinding toegang tot internet te krijgen</li><br>
-<li>U configureert een Wi-Fi-toegangspunt in de instellingen voor Wi-Fi-tethering</li><br>
-<li>Ga naar <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> voor meer informatie.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/no/tethering_help.html b/assets/html/no/tethering_help.html
deleted file mode 100644
index 2883592..0000000
--- a/assets/html/no/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB-tilknytning</b></p>
-<span class="style1">Du kan knytte telefonen til datamaskinen med en USB-kabel, slik at du kan dele telefonens Internett-tilkobling med maskinen</span>
-<ul>
-<li>Tilknytning fungerer med Windows Vista, Windows 7 og Linux</li><br>
-<li>Du kan ikke montere telefonens SD-kort i datamaskinen når telefonen er tilknyttet via USB</li><br>
-<li>Du finner mer informasjon, herunder om hvordan du bruker USB-tilknytning med andre operativsystemer, på <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Tilknytning av trådløst nett</b></p>
-<span class="style1">Telefonen kan angis som et tilgangspunkt for trådløst nett for deling av Internett-tilkobling med én eller flere datamaskiner eller andre enheter</span>
-<ul>
-<li>Når telefonen fungerer som tilgangspunkt, kan du ikke bruke telefonens programmer til å få tilgang til Internett via trådløst nett</li><br>
-<li>Gå til innstillinger for tilknytning av trådløst nett for å konfigurere tilgangspunkt for trådløst nett</li><br>
-<li>Du finner mer informasjon på <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/no/tethering_usb_help.html b/assets/html/no/tethering_usb_help.html
deleted file mode 100644
index e32c8b2..0000000
--- a/assets/html/no/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB-tilknytning</b></p>
-<span class="style1">Du kan knytte telefonen til datamaskinen med en USB-kabel, slik at du kan dele telefonens Internett-tilkobling med maskinen</span>
-<ul>
-<li>Tilknytning fungerer med Windows Vista, Windows 7 og Linux</li><br>
-<li>Du kan ikke montere telefonens SD-kort i datamaskinen når telefonen er tilknyttet via USB</li><br>
-<li>Du finner mer informasjon, herunder om hvordan du bruker USB-tilknytning med andre operativsystemer, på <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/no/tethering_wifi_help.html b/assets/html/no/tethering_wifi_help.html
deleted file mode 100644
index 84e5910..0000000
--- a/assets/html/no/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Tilknytning av trådløst nett</b></p>
-<span class="style1">Telefonen kan angis som et tilgangspunkt for trådløst nett for deling av Internett-tilkobling med én eller flere datamaskiner eller andre enheter</span>
-<ul>
-<li>Når telefonen fungerer som tilgangspunkt, kan du ikke bruke telefonens programmer til å få tilgang til Internett via trådløst nett</li><br>
-<li>Gå til innstillinger for tilknytning av trådløst nett for å konfigurere tilgangspunkt for trådløst nett</li><br>
-<li>Du finner mer informasjon på <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/pl/tethering_help.html b/assets/html/pl/tethering_help.html
deleted file mode 100644
index 271f92f..0000000
--- a/assets/html/pl/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Powiązanie USB</b></p>
-<span class="style1">Telefon możesz powiązać z komputerem przy użyciu kabla USB, aby udostępniać na nim połączenie internetowe telefonu.</span>
-<ul>
-<li>Powiązanie działa w systemach Windows Vista, Windows 7 oraz Linux.</li><br>
-<li>Podczas powiązania USB nie ma możliwości podłączenia na komputerze karty SD telefonu.</li><br>
-<li>Więcej informacji, w tym również na temat korzystania z powiązania USB z innymi systemami operacyjnymi, znajdziesz pod adresem <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-<p><b>Powiązanie Wi-Fi</b></p>
-<span class="style1">Telefon możesz przekształcić w punkt dostępowy Wi-Fi, aby udostępniać połączenie internetowe telefonu jednemu lub większej liczbie komputerów i innych urządzeń.</span>
-<ul>
-<li>Gdy telefon działa jako punkt dostępowy, nie możesz korzystać z aplikacji telefonu w celu uzyskania dostępu do internetu za pośrednictwem jego połączenia Wi-Fi.</li><br>
-<li>Punkt dostępowy Wi-Fi konfiguruje się w ustawieniach powiązania Wi-Fi.</li><br>
-<li>Aby uzyskać więcej informacji, odwiedź stronę <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/pl/tethering_usb_help.html b/assets/html/pl/tethering_usb_help.html
deleted file mode 100644
index 67d343c..0000000
--- a/assets/html/pl/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Powiązanie USB</b></p>
-<span class="style1">Telefon możesz powiązać z komputerem przy użyciu kabla USB, aby udostępniać na nim połączenie internetowe telefonu.</span>
-<ul>
-<li>Powiązanie działa w systemach Windows Vista, Windows 7 oraz Linux.</li><br>
-<li>Podczas powiązania USB nie ma możliwości podłączenia na komputerze karty SD telefonu.</li><br>
-<li>Więcej informacji, w tym również na temat korzystania z powiązania USB z innymi systemami operacyjnymi, znajdziesz pod adresem <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/pl/tethering_wifi_help.html b/assets/html/pl/tethering_wifi_help.html
deleted file mode 100644
index 50a66a7..0000000
--- a/assets/html/pl/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Powiązanie Wi-Fi</b></p>
-<span class="style1">Telefon możesz przekształcić w punkt dostępowy Wi-Fi, aby udostępniać połączenie internetowe telefonu jednemu lub większej liczbie komputerów i innych urządzeń.</span>
-<ul>
-<li>Gdy telefon działa jako punkt dostępowy, nie możesz korzystać z aplikacji telefonu w celu uzyskania dostępu do internetu za pośrednictwem jego połączenia Wi-Fi.</li><br>
-<li>Punkt dostępowy Wi-Fi konfiguruje się w ustawieniach powiązania Wi-Fi.</li><br>
-<li>Aby uzyskać więcej informacji, odwiedź stronę <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/pt_br/tethering_help.html b/assets/html/pt_br/tethering_help.html
deleted file mode 100644
index 00c4251..0000000
--- a/assets/html/pt_br/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Vínculo USB</b></p>
-<span class="style1">Você pode vincular seu telefone ao seu computador com um cabo USB, compartilhando a conexão com a internet do telefone</span>
-<ul>
-<li>O vínculo funciona com Windows Vista, Windows 7 e Linux</li><br>
-<li>Você não pode usar o cartão SD do telefone no computador com vínculo USB</li><br>
-<li>Para mais informações, incluindo o uso de vínculo USB em outros SOs, veja <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Vínculo Wi-Fi</b></p>
-<span class="style1">Use seu telefone como um ponto de acesso Wi-Fi, compartilhando a conexão com a internet do telefone com computadores ou outros aparelhos</span>
-<ul>
-<li>Quando seu telefone atua como ponto de acesso, você não pode usar os aplicativos do telefone para acessar a internet via conexão Wi-Fi</li><br>
-<li>Configure um ponto de acesso Wi-Fi nas configurações de vínculo Wi-Fi</li><br>
-<li>Para mais informações, visite <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/pt_br/tethering_usb_help.html b/assets/html/pt_br/tethering_usb_help.html
deleted file mode 100644
index 8db1cc2..0000000
--- a/assets/html/pt_br/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Vínculo USB</b></p>
-<span class="style1">Você pode vincular seu telefone ao seu computador com um cabo USB, compartilhando a conexão com a internet do telefone</span>
-<ul>
-<li>O vínculo funciona com Windows Vista, Windows 7 e Linux</li><br>
-<li>Você não pode usar o cartão SD do telefone no computador com vínculo USB</li><br>
-<li>Para mais informações, incluindo o uso de vínculo USB em outros SOs, veja <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/pt_br/tethering_wifi_help.html b/assets/html/pt_br/tethering_wifi_help.html
deleted file mode 100644
index 88ca44f..0000000
--- a/assets/html/pt_br/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Vínculo Wi-Fi</b></p>
-<span class="style1">Use seu telefone como um ponto de acesso Wi-Fi, compartilhando a conexão com a internet do telefone com computadores ou outros aparelhos</span>
-<ul>
-<li>Quando seu telefone atua como ponto de acesso, você não pode usar os aplicativos do telefone para acessar a internet via conexão Wi-Fi</li><br>
-<li>Configure um ponto de acesso Wi-Fi nas configurações de vínculo Wi-Fi</li><br>
-<li>Para mais informações, visite <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/pt_pt/tethering_help.html b/assets/html/pt_pt/tethering_help.html
deleted file mode 100644
index ecf9c65..0000000
--- a/assets/html/pt_pt/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Associação USB</b></p>
-<span class="style1">Pode associar o seu telefone ao computador com um cabo USB, para partilhar com o computador a ligação à internet do telefone</span>
-<ul>
-<li>A associação funciona com o Windows Vista, Windows 7 e Linux</li><br>
-<li>Durante a associação USB, não é possível instalar o cartão SD do telefone no computador</li><br>
-<li>Para mais informações, incluindo como utilizar a associação USB com outros sistemas operativos, consulte <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Associação Wi-Fi</b></p>
-<span class="style1">Pode transformar o seu telefone num ponto de acesso Wi-Fi para partilhar a ligação à internet do telefone com um ou mais computadores ou outros dispositivos</span>
-<ul>
-<li>Quando o telefone estiver a ser usado como ponto de acesso, não poderá utilizar as aplicações do telefone para aceder à internet através da sua ligação Wi-Fi</li><br>
-<li>Para configurar um ponto de acesso Wi-Fi, aceda às definições de associação Wi-Fi</li><br>
-<li>Para mais informações, visite <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/pt_pt/tethering_usb_help.html b/assets/html/pt_pt/tethering_usb_help.html
deleted file mode 100644
index 8cfab8c..0000000
--- a/assets/html/pt_pt/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Associação USB</b></p>
-<span class="style1">Pode associar o seu telefone ao computador com um cabo USB, para partilhar com o computador a ligação à internet do telefone</span>
-<ul>
-<li>A associação funciona com o Windows Vista, Windows 7 e Linux</li><br>
-<li>Durante a associação USB, não é possível instalar o cartão SD do telefone no computador</li><br>
-<li>Para mais informações, incluindo como utilizar a associação USB com outros sistemas operativos, consulte <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/pt_pt/tethering_wifi_help.html b/assets/html/pt_pt/tethering_wifi_help.html
deleted file mode 100644
index c214ae0..0000000
--- a/assets/html/pt_pt/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Associação Wi-Fi</b></p>
-<span class="style1">Pode transformar o seu telefone num ponto de acesso Wi-Fi para partilhar a ligação à internet do telefone com um ou mais computadores ou outros dispositivos</span>
-<ul>
-<li>Quando o telefone estiver a ser usado como ponto de acesso, não poderá utilizar as aplicações do telefone para aceder à internet através da sua ligação Wi-Fi</li><br>
-<li>Para configurar um ponto de acesso Wi-Fi, aceda às definições de associação Wi-Fi</li><br>
-<li>Para mais informações, visite <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/ru/tethering_help.html b/assets/html/ru/tethering_help.html
deleted file mode 100644
index e09e428..0000000
--- a/assets/html/ru/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB-подключение</b></p>
-<span class="style1">Вы можете подключить телефон к компьютеру с помощью USB-кабеля и предоставить компьютеру интернет-подключение, установленное посредством телефона.</span>
-<ul>
-<li>Такое подключение возможно для ОС Windows Vista, Windows 7 и Linux.</li><br>
-<li>При USB-подключении вы не сможете получить доступ к SD-карте телефона с компьютера.</li><br>
-<li>Дополнительная информация и сведения об USB-подключении в других ОС приведена на странице <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-<p><b>Подключение Wi-Fi</b></p>
-<span class="style1">Телефон можно использовать как точку доступа Wi-Fi. В этом случае несколько компьютеров или других устройств смогут использовать интернет-подключение, установленное посредством телефона.</span>
-<ul>
-<li>Когда телефон выступает в роли точки доступа, его приложения не смогут получить доступ к Интернету через подключение Wi-Fi.</li><br>
-<li>Включить режим общего доступа к Интернету через Wi-Fi можно в настройках подключения Wi-Fi.</li><br>
-<li>Дополнительная информация приведена на странице <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/ru/tethering_usb_help.html b/assets/html/ru/tethering_usb_help.html
deleted file mode 100644
index 570b88b..0000000
--- a/assets/html/ru/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB-подключение</b></p>
-<span class="style1">Вы можете подключить телефон к компьютеру с помощью USB-кабеля и предоставить компьютеру интернет-подключение, установленное посредством телефона.</span>
-<ul>
-<li>Такое подключение возможно для ОС Windows Vista, Windows 7 и Linux.</li><br>
-<li>При USB-подключении вы не сможете получить доступ к SD-карте телефона с компьютера.</li><br>
-<li>Дополнительная информация и сведения об USB-подключении в других ОС приведена на странице <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/ru/tethering_wifi_help.html b/assets/html/ru/tethering_wifi_help.html
deleted file mode 100644
index 6fcca62..0000000
--- a/assets/html/ru/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Подключение Wi-Fi</b></p>
-<span class="style1">Телефон можно использовать как точку доступа Wi-Fi. В этом случае несколько компьютеров или других устройств смогут использовать интернет-подключение, установленное посредством телефона.</span>
-<ul>
-<li>Когда телефон выступает в роли точки доступа, его приложения не смогут получить доступ к Интернету через подключение Wi-Fi.</li><br>
-<li>Включить режим общего доступа к Интернету через Wi-Fi можно в настройках подключения Wi-Fi.</li><br>
-<li>Дополнительная информация приведена на странице <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/sv/tethering_help.html b/assets/html/sv/tethering_help.html
deleted file mode 100644
index 2242e98..0000000
--- a/assets/html/sv/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Internetdelning via USB</b></p>
-<span class="style1">Du kan ansluta telefonen till datorn med en USB-kabel om du vill dela telefonens Internetanslutning med datorn</span>
-<ul>
-<li>Internetdelning fungerar även med Windows Vista, Windows 7 och Linux</li><br>
-<li>Det går inte att montera telefonens SD-kort i datorn när du delar Internet via USB</li><br>
-<li>Om du vill veta mer, till exempel hur du använder Internetdelning via USB i andra operativsystem, besöker du <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Internetdelning via Wi-Fi</b></p>
-<span class="style1">Du kan göra din telefon till en åtkomstpunkt för Wi-FI om du vill dela telefonens Internetanslutning med en eller flera datorer eller enheter</span>
-<ul>
-<li>När telefonen fungerar som åtkomstpunkt kan du inte använda telefonens program med Internet via telefonens Wi-Fi-anslutning</li><br>
-<li>Du konfigurerar en Wi-Fi-åtkomstpunkt under inställningarna för Internetdelning via Wi-Fi</li><br>
-<li>Om du vill veta mer besöker du <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/sv/tethering_usb_help.html b/assets/html/sv/tethering_usb_help.html
deleted file mode 100644
index a16ec51..0000000
--- a/assets/html/sv/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Internetdelning via USB</b></p>
-<span class="style1">Du kan ansluta telefonen till datorn med en USB-kabel om du vill dela telefonens Internetanslutning med datorn</span>
-<ul>
-<li>Internetdelning fungerar även med Windows Vista, Windows 7 och Linux</li><br>
-<li>Det går inte att montera telefonens SD-kort i datorn när du delar Internet via USB</li><br>
-<li>Om du vill veta mer, till exempel hur du använder Internetdelning via USB i andra operativsystem, besöker du <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/sv/tethering_wifi_help.html b/assets/html/sv/tethering_wifi_help.html
deleted file mode 100644
index cfffe4d..0000000
--- a/assets/html/sv/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Internetdelning via Wi-Fi</b></p>
-<span class="style1">Du kan göra din telefon till en åtkomstpunkt för Wi-FI om du vill dela telefonens Internetanslutning med en eller flera datorer eller enheter</span>
-<ul>
-<li>När telefonen fungerar som åtkomstpunkt kan du inte använda telefonens program med Internet via telefonens Wi-Fi-anslutning</li><br>
-<li>Du konfigurerar en Wi-Fi-åtkomstpunkt under inställningarna för Internetdelning via Wi-Fi</li><br>
-<li>Om du vill veta mer besöker du <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/tr/tethering_help.html b/assets/html/tr/tethering_help.html
deleted file mode 100644
index cb59618..0000000
--- a/assets/html/tr/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB bağlantısı</b></p>
-<span class="style1">Telefonunuzun internet bağlantısını bilgisayarınızla paylaşmak için telefonunuzu bir USB kablosuyla bilgisayarınıza bağlayabilirsiniz</span>
-<ul>
-<li>Bu tür bağlantı Windows Vista, Windows 7 ve Linux işletim sistemlerinde kullanılır</li><br>
-<li>USB ile bağlandığında telefonunuzun SD kartını bilgisayarınızda kullanamazsınız</li><br>
-<li>Diğer işletim sistemlerinde USB bağlantısı hakkında daha fazla bilgi için bkz. <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Kablosuz bağlantı</b></p>
-<span class="style1">Telefonunuzun internet bağlantısını bir veya daha fazla bilgisayarla ya da diğer cihazlarla paylaşmak için telefonunuzu kablosuz erişim noktasına dönüştürebilirsiniz</span>
-<ul>
-<li>Telefonunuz erişim noktası görevi görürken kablosuz bağlantısı üzerinden internete erişmek için telefonunuzun uygulamalarını kullanamazsınız</li><br>
-<li>Kablosuz bağlantı ayarlarında bir kablosuz erişim noktası yapılandırırsınız</li><br>
-<li>Daha fazla bilgi için <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> adresini ziyaret edin</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/tr/tethering_usb_help.html b/assets/html/tr/tethering_usb_help.html
deleted file mode 100644
index 9b01ff9..0000000
--- a/assets/html/tr/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB bağlantısı</b></p>
-<span class="style1">Telefonunuzun internet bağlantısını bilgisayarınızla paylaşmak için telefonunuzu bir USB kablosuyla bilgisayarınıza bağlayabilirsiniz</span>
-<ul>
-<li>Bu tür bağlantı Windows Vista, Windows 7 ve Linux işletim sistemlerinde kullanılır</li><br>
-<li>USB ile bağlandığında telefonunuzun SD kartını bilgisayarınızda kullanamazsınız</li><br>
-<li>Diğer işletim sistemlerinde USB bağlantısı hakkında daha fazla bilgi için bkz. <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/tr/tethering_wifi_help.html b/assets/html/tr/tethering_wifi_help.html
deleted file mode 100644
index 60f8206..0000000
--- a/assets/html/tr/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Kablosuz bağlantı</b></p>
-<span class="style1">Telefonunuzun internet bağlantısını bir veya daha fazla bilgisayarla ya da diğer cihazlarla paylaşmak için telefonunuzu kablosuz erişim noktasına dönüştürebilirsiniz</span>
-<ul>
-<li>Telefonunuz erişim noktası görevi görürken kablosuz bağlantısı üzerinden internete erişmek için telefonunuzun uygulamalarını kullanamazsınız</li><br>
-<li>Kablosuz bağlantı ayarlarında bir kablosuz erişim noktası yapılandırırsınız</li><br>
-<li>Daha fazla bilgi için <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> adresini ziyaret edin</li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/zh_cn/tethering_help.html b/assets/html/zh_cn/tethering_help.html
deleted file mode 100644
index 0513eb7..0000000
--- a/assets/html/zh_cn/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB 绑定</b></p>
-<span class="style1">您可以通过 USB 线将手机与计算机绑定，从而与计算机共享手机的互联网连接</span>
-<ul>
-<li>绑定适用于 Windows Vista、Windows 7 和 Linux</li><br>
-<li>在 USB 绑定期间，您无法在计算机上安装手机的 SD 卡</li><br>
-<li>要了解详细信息（包括如何在其他操作系统上使用 USB 绑定），请访问 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Wi-Fi 绑定</b></p>
-<span class="style1">您可以将手机设为 Wi-Fi 接入点，从而与一台或多台计算机或者其他设备共享手机的互联网连接</span>
-<ul>
-<li>手机成为接入点后，您就无法通过 Wi-Fi 连接使用手机的应用程序访问互联网了</li><br>
-<li>您可以在 Wi-Fi 绑定设置中配置 Wi-Fi 接入点</li><br>
-<li>要了解详细信息，请访问 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/zh_cn/tethering_usb_help.html b/assets/html/zh_cn/tethering_usb_help.html
deleted file mode 100644
index adb3769..0000000
--- a/assets/html/zh_cn/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB 绑定</b></p>
-<span class="style1">您可以通过 USB 线将手机与计算机绑定，从而与计算机共享手机的互联网连接</span>
-<ul>
-<li>绑定适用于 Windows Vista、Windows 7 和 Linux</li><br>
-<li>在 USB 绑定期间，您无法在计算机上安装手机的 SD 卡</li><br>
-<li>要了解详细信息（包括如何在其他操作系统上使用 USB 绑定），请访问 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/zh_cn/tethering_wifi_help.html b/assets/html/zh_cn/tethering_wifi_help.html
deleted file mode 100644
index 32a8792..0000000
--- a/assets/html/zh_cn/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Wi-Fi 绑定</b></p>
-<span class="style1">您可以将手机设为 Wi-Fi 接入点，从而与一台或多台计算机或者其他设备共享手机的互联网连接</span>
-<ul>
-<li>手机成为接入点后，您就无法通过 Wi-Fi 连接使用手机的应用程序访问互联网了</li><br>
-<li>您可以在 Wi-Fi 绑定设置中配置 Wi-Fi 接入点</li><br>
-<li>要了解详细信息，请访问 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/zh_tw/tethering_help.html b/assets/html/zh_tw/tethering_help.html
deleted file mode 100644
index 15f69c0..0000000
--- a/assets/html/zh_tw/tethering_help.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB 數據連線</b></p>
-<span class="style1">您可以使用 USB 纜線讓手機和電腦連線，使電腦可以共用手機的網際網路連線</span>
-<ul>
-<li>支援數據連線的作業系統包括 Windows Vista、Windows 7 及 Linux</li><br>
-<li>使用 USB 數據連線時，您無法將手機的 SD 卡插到電腦上</li><br>
-<li>如需更多資訊，包括在其他作業系統中使用 USB 數據連線的資訊，請參閱 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-<p><b>Wi-Fi 數據連線</b></p>
-<span class="style1">您可以將手機變成 Wi-Fi 存取點，讓一或多台電腦或其他裝置可以共用手機的網際網路連線</span>
-<ul>
-<li>將手機當作存取點使用時，手機的應用程式將無法透過 Wi-Fi 連線存取網際網路</li><br>
-<li>您可以在 Wi-Fi 數據連線設定中配置 Wi-Fi 存取點</li><br>
-<li>如需更多資訊，請造訪 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/zh_tw/tethering_usb_help.html b/assets/html/zh_tw/tethering_usb_help.html
deleted file mode 100644
index f1a20df..0000000
--- a/assets/html/zh_tw/tethering_usb_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>USB 數據連線</b></p>
-<span class="style1">您可以使用 USB 纜線讓手機和電腦連線，使電腦可以共用手機的網際網路連線</span>
-<ul>
-<li>支援數據連線的作業系統包括 Windows Vista、Windows 7 及 Linux</li><br>
-<li>使用 USB 數據連線時，您無法將手機的 SD 卡插到電腦上</li><br>
-<li>如需更多資訊，包括在其他作業系統中使用 USB 數據連線的資訊，請參閱 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/assets/html/zh_tw/tethering_wifi_help.html b/assets/html/zh_tw/tethering_wifi_help.html
deleted file mode 100644
index f91b151..0000000
--- a/assets/html/zh_tw/tethering_wifi_help.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html DIR="LTR">
-<head>
-<style>
-P {
-    font-size: 14 px;
-    }
-B {
-	font-size: 16px;
-}
-A {
-	color: #OOC;
-}
-.style1 {
-	font-size: 16px;
-}
-</style>
-</head>
-<body>
-<p><b>Wi-Fi 數據連線</b></p>
-<span class="style1">您可以將手機變成 Wi-Fi 存取點，讓一或多台電腦或其他裝置可以共用手機的網際網路連線</span>
-<ul>
-<li>將手機當作存取點使用時，手機的應用程式將無法透過 Wi-Fi 連線存取網際網路</li><br>
-<li>您可以在 Wi-Fi 數據連線設定中配置 Wi-Fi 存取點</li><br>
-<li>如需更多資訊，請造訪 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
-</ul>
-</body>
-</html>
diff --git a/proguard.flags b/proguard.flags
index 6d41d17..0805d68 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -11,4 +11,9 @@
 -keep class com.android.settings.MasterClearConfirm
 -keep class com.android.settings.accounts.*
 -keep class com.android.settings.fuelgauge.*
+-keep class com.android.settings.users.*
 
+# Keep click responders
+-keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
+  *** onClick*(...);
+}
diff --git a/res/drawable-hdpi/app_gauge.9.png b/res/drawable-hdpi/app_gauge.9.png
deleted file mode 100644
index ac79d21..0000000
--- a/res/drawable-hdpi/app_gauge.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_item_delete.png b/res/drawable-hdpi/ic_item_delete.png
index f3e53d7..2956109 100644
--- a/res/drawable-hdpi/ic_item_delete.png
+++ 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
index c02bd42..32da776 100644
--- a/res/drawable-hdpi/ic_launcher_settings.png
+++ b/res/drawable-hdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
index 9f7d982..4b68f52 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_sync_error.png b/res/drawable-hdpi/ic_sync_error.png
deleted file mode 100644
index 914d44d..0000000
--- a/res/drawable-hdpi/ic_sync_error.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wps.png b/res/drawable-hdpi/ic_wps.png
new file mode 100644
index 0000000..36c2a32
--- /dev/null
+++ b/res/drawable-hdpi/ic_wps.png
Binary files differ
diff --git a/res/drawable-mdpi/app_gauge.9.png b/res/drawable-mdpi/app_gauge.9.png
deleted file mode 100644
index f6c7c99..0000000
--- a/res/drawable-mdpi/app_gauge.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_item_delete.png b/res/drawable-mdpi/ic_item_delete.png
index f074db3..6ed1327 100644
--- a/res/drawable-mdpi/ic_item_delete.png
+++ 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
index 05cdd9a..32a22ac 100644
--- a/res/drawable-mdpi/ic_launcher_settings.png
+++ b/res/drawable-mdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
index 254a572..15ffadd 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_sync_error.png b/res/drawable-mdpi/ic_sync_error.png
deleted file mode 100644
index 2b98bca..0000000
--- a/res/drawable-mdpi/ic_sync_error.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wps.png b/res/drawable-mdpi/ic_wps.png
new file mode 100644
index 0000000..e522e97
--- /dev/null
+++ b/res/drawable-mdpi/ic_wps.png
Binary files differ
diff --git a/res/drawable-xhdpi/app_gauge.9.png b/res/drawable-xhdpi/app_gauge.9.png
deleted file mode 100644
index ceb798c..0000000
--- a/res/drawable-xhdpi/app_gauge.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_item_delete.png b/res/drawable-xhdpi/ic_item_delete.png
index 2dcd299..942cf23 100644
--- a/res/drawable-xhdpi/ic_item_delete.png
+++ b/res/drawable-xhdpi/ic_item_delete.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_settings.png b/res/drawable-xhdpi/ic_launcher_settings.png
index 2b2907b..9bfdd78 100644
--- a/res/drawable-xhdpi/ic_launcher_settings.png
+++ b/res/drawable-xhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png
index 6b1df2f..420510e 100644
--- a/res/drawable-xhdpi/ic_menu_add.png
+++ b/res/drawable-xhdpi/ic_menu_add.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_error.png b/res/drawable-xhdpi/ic_sync_error.png
deleted file mode 100644
index b9a5357..0000000
--- a/res/drawable-xhdpi/ic_sync_error.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wps.png b/res/drawable-xhdpi/ic_wps.png
new file mode 100644
index 0000000..71308f2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wps.png
Binary files differ
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 588d8da..e178e7c 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -19,8 +19,7 @@
     android:id="@+id/topLayout"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+    android:layout_height="match_parent">
 
     <!-- left side: instructions and messages -->
     <LinearLayout
@@ -43,38 +42,38 @@
                 android:layout_height="0dip"
                 android:layout_weight="1.0">
 
-            <!-- right / bottom button: confirm or ok -->
-            <Button android:id="@+id/footerRightButton"
-                android:layout_height="wrap_content"
-                android:layout_width="140dip"
+            <!-- confirm / restart buttons -->
+            <LinearLayout android:id="@+id/buttonContainer"
+                style="@style/SecurityPreferenceButtonContainer"
+                android:layout_centerHorizontal="true"
                 android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:ellipsize="marquee"
-                android:singleLine="true"
-                android:drawableRight="@drawable/ic_btn_next"
-                android:drawablePadding="3dip"
-                android:text="@string/lockpattern_confirm_button_text"/>
+                android:orientation="vertical">
 
+                <!-- left / top button: skip, or re-try -->
+                <Button android:id="@+id/footerLeftButton"
+                    style="@style/SecurityPreferenceButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/lockpattern_restart_button_text"/>
 
-            <!-- left / top button: skip, or re-try -->
-            <Button android:id="@+id/footerLeftButton"
-                android:layout_height="wrap_content"
-                android:layout_width="140dip"
-                android:layout_above="@id/footerRightButton"
-                android:layout_centerHorizontal="true"
-                android:ellipsize="marquee"
-                android:singleLine="true"
-                android:text="@string/lockpattern_restart_button_text"/>
+                <!-- right / bottom button: confirm or ok -->
+                <Button android:id="@+id/footerRightButton"
+                    style="@style/SecurityPreferenceButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/lockpattern_confirm_button_text"/>
 
+            </LinearLayout>
 
             <!-- message above buttons -->
             <TextView android:id="@+id/footerText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_above="@+id/footerLeftButton"
+                android:layout_above="@+id/buttonContainer"
                 android:layout_centerHorizontal="true"
                 android:layout_marginBottom="4dip"
                 android:textSize="14sp"/>
+
         </RelativeLayout>
     </LinearLayout>
 
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
index 3361603..f8a939f 100644
--- a/res/layout-land/crypt_keeper_progress.xml
+++ b/res/layout-land/crypt_keeper_progress.xml
@@ -69,6 +69,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/encroid_waiting"
+            android:contentDescription="@null"
         />
 
         <Button
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
index ad08e44..3e642d5 100644
--- a/res/layout-sw600dp-land/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp-land/confirm_lock_pattern.xml
@@ -47,7 +47,8 @@
             style="@style/SecurityPreferenceButtonContainer"
             android:layout_alignParentRight="true"
             android:layout_alignParentBottom="true"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:visibility="invisible">
 
             <!-- left / top button: skip, or re-try -->
             <Button android:id="@+id/footerLeftButton"
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
index 8898b76..a8f5651 100644
--- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
@@ -16,11 +16,16 @@
 ** limitations under the License.
 */
 -->
+<!-- Layout containing two panes and a keyboard entry. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 >
+
+    <include layout="@layout/crypt_keeper_status" />
+
+    <!-- The right pane contains the encdroid image, a string, and an edit field. -->
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="0dip"
@@ -32,6 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:src="@drawable/encroid_resignin"
+            android:contentDescription="@null"
         />
 
         <TextView android:id="@+id/passwordLabel"
@@ -56,20 +62,8 @@
             <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>
-
+<!-- And this is the keyboard. -->
     <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout-sw600dp/accessibility_tutorial_container.xml b/res/layout-sw600dp/accessibility_tutorial_container.xml
deleted file mode 100644
index f5da706..0000000
--- a/res/layout-sw600dp/accessibility_tutorial_container.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index ad8205a..1e33230c 100644
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -16,7 +16,8 @@
 ** limitations under the License.
 */
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 >
@@ -25,7 +26,7 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
+        android:layout_gravity="center_horizontal"
         android:layout_marginTop="318dip"
     >
         <ImageView android:id="@+id/encroid"
@@ -33,6 +34,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:src="@drawable/encroid_resignin"
+            android:contentDescription="@null"
         />
 
         <TextView android:id="@+id/passwordLabel"
@@ -53,23 +55,11 @@
             android:layout_width="320dip"
             android:layout_toRightOf="@+id/passwordLabel"
             android:layout_marginTop="26dip"
+            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>
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
index f958f00..176c9fb 100644
--- a/res/layout-sw600dp/crypt_keeper_progress.xml
+++ b/res/layout-sw600dp/crypt_keeper_progress.xml
@@ -33,6 +33,7 @@
             android:layout_alignParentBottom="true"
             android:paddingRight="65dip"
             android:src="@drawable/encroid_waiting"
+            android:contentDescription="@null"
         />
 
         <TextView
diff --git a/res/layout-h720dp/tab_widget.xml b/res/layout-sw720dp/tab_widget.xml
similarity index 75%
rename from res/layout-h720dp/tab_widget.xml
rename to res/layout-sw720dp/tab_widget.xml
index 5a4e580..4cd4547 100644
--- a/res/layout-h720dp/tab_widget.xml
+++ b/res/layout-sw720dp/tab_widget.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- 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.
@@ -17,13 +17,16 @@
 <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:scrollbars="none">
+    android:scrollbars="none"
+    android:fillViewport="true">
 
     <TabWidget
         android:id="@android:id/tabs"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
+        android:paddingRight="@*android:dimen/preference_fragment_padding_side"
         style="?android:attr/tabWidgetStyle" />
 
 </HorizontalScrollView>
diff --git a/res/layout-w720dp/tab_widget.xml b/res/layout-w720dp/tab_widget.xml
deleted file mode 100644
index 5a4e580..0000000
--- a/res/layout-w720dp/tab_widget.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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
deleted file mode 100644
index b2bb40d..0000000
--- a/res/layout/accessibility_tutorial_1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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
deleted file mode 100644
index 5f9c69d..0000000
--- a/res/layout/accessibility_tutorial_2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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
deleted file mode 100644
index fe8399e..0000000
--- a/res/layout/accessibility_tutorial_app_icon.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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
deleted file mode 100644
index 6566cff..0000000
--- a/res/layout/accessibility_tutorial_container.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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
index 5e2edc6..bc3f8f9 100644
--- a/res/layout/account_preference.xml
+++ b/res/layout/account_preference.xml
@@ -18,4 +18,5 @@
         android:id="@+id/syncStatusIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:contentDescription="@null" />
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index d54d750..117b58a 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -26,6 +26,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="fitXY"
+        android:src="?android:attr/listDivider" />
+
     <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="0dip"
diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml
index e91ec50..8ce90d7 100644
--- a/res/layout/android_beam.xml
+++ b/res/layout/android_beam.xml
@@ -41,6 +41,7 @@
             <ImageView android:id="@+id/android_beam_image"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:contentDescription="@null"
             />
         </LinearLayout>
 
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index e5710e4..eee6165 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -18,8 +18,8 @@
     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:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
     android:paddingTop="8dip"
     android:paddingBottom="8dip"
     android:columnCount="3">
@@ -30,7 +30,8 @@
         android:layout_height="48dip"
         android:layout_rowSpan="3"
         android:layout_marginRight="8dip"
-        android:scaleType="centerInside" />
+        android:scaleType="centerInside"
+        android:contentDescription="@null" />
 
     <TextView
         android:id="@android:id/title"
diff --git a/res/layout/apps_spinner_dropdown_item.xml b/res/layout/apps_spinner_dropdown_item.xml
new file mode 100644
index 0000000..6f641e7
--- /dev/null
+++ b/res/layout/apps_spinner_dropdown_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 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.
+*/
+-->
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerDropDownItemStyle"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:singleLine="true"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeightSmall"
+    android:ellipsize="marquee" />
diff --git a/res/layout/apps_spinner_item.xml b/res/layout/apps_spinner_item.xml
new file mode 100644
index 0000000..1ca6ffc
--- /dev/null
+++ b/res/layout/apps_spinner_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 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.
+*/
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerItemStyle"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:singleLine="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:ellipsize="marquee" />
diff --git a/res/layout/bookmark_picker_item.xml b/res/layout/bookmark_picker_item.xml
index a0d71c6..b4ffe73 100644
--- a/res/layout/bookmark_picker_item.xml
+++ b/res/layout/bookmark_picker_item.xml
@@ -26,7 +26,8 @@
     <ImageView android:id="@+id/icon"
         android:layout_width="@android:dimen/app_icon_size"
         android:layout_height="@android:dimen/app_icon_size"
-        android:scaleType="fitCenter" />
+        android:scaleType="fitCenter"
+        android:contentDescription="@null" />
 
     <TextView android:id="@+id/title"
         android:layout_width="match_parent"
diff --git a/res/layout/crypt_keeper_blank.xml b/res/layout/crypt_keeper_blank.xml
index 1c880c2..2cd9c91 100644
--- a/res/layout/crypt_keeper_blank.xml
+++ b/res/layout/crypt_keeper_blank.xml
@@ -27,6 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:src="@drawable/encroid_progress"
+        android:contentDescription="@null"
     />
 
 </LinearLayout>
diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
index 17968e8..97afe6a 100644
--- a/res/layout/crypt_keeper_password_field.xml
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -26,8 +26,7 @@
         android:layout_weight="1"
         android:singleLine="true"
         android:inputType="textPassword"
-        android:imeOptions="actionDone"
-        android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"
+        android:imeOptions="flagForceAscii|actionDone"
         android:textAppearance="?android:attr/textAppearanceMedium"
      />
 
@@ -36,6 +35,7 @@
        android:layout_height="wrap_content"
        android:src="@drawable/ic_lockscreen_ime"
        android:clickable="true"
+       android:contentDescription="@string/crypt_keeper_switch_input_method"
        android:padding="8dip"
        android:layout_gravity="center"
        android:background="?android:attr/selectableItemBackground"
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
index 35760cf..0d408c2 100644
--- a/res/layout/crypt_keeper_progress.xml
+++ b/res/layout/crypt_keeper_progress.xml
@@ -64,6 +64,7 @@
         android:layout_weight="1"
         android:layout_gravity="bottom|right"
         android:src="@drawable/encroid_waiting"
+        android:contentDescription="@null"
     />
 
     <Button
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index 5144e75..80da437 100644
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -23,14 +23,15 @@
     android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
 >
 
     <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_gravity="center"
         android:layout_marginBottom="8dip"
         >
 
@@ -63,16 +64,6 @@
     </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"
diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml
index 136fec6..c9647c8 100644
--- a/res/layout/data_usage_cycles.xml
+++ b/res/layout/data_usage_cycles.xml
@@ -20,8 +20,8 @@
     android:layout_height="40dip"
     android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:paddingLeft="@*android:dimen/preference_item_padding_side"
-    android:paddingRight="@*android:dimen/preference_item_padding_side">
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
index 639fcf5..6c09d09 100644
--- a/res/layout/data_usage_detail.xml
+++ b/res/layout/data_usage_detail.xml
@@ -18,27 +18,30 @@
     android:id="@+id/app_detail"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:visibility="gone">
 
     <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:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
         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:layout_marginTop="8dip"
+            android:layout_marginRight="8dip"
             android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/app_icon"
                 android:layout_width="48dip"
                 android:layout_height="48dip"
-                android:scaleType="centerInside" />
+                android:scaleType="centerInside"
+                android:contentDescription="@null" />
 
             <LinearLayout
                 android:id="@+id/app_titles"
@@ -82,8 +85,8 @@
         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_marginLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
         android:layout_marginTop="16dip"
         android:layout_marginBottom="16dip"
         android:text="@string/data_usage_app_settings" />
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
index aa2beb2..619956d 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -41,21 +41,10 @@
         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:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
         android:paddingTop="8dip"
         android:paddingBottom="8dip"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    <TextView
-        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:paddingBottom="8dip"
-        android:text="@string/data_usage_disclaimer"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <TextView
@@ -63,8 +52,8 @@
         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:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
         android:paddingBottom="8dip"
         android:text="@string/data_usage_empty"
         android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index d6a0dcb..3b4824f 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -44,7 +44,8 @@
                     android:layout_height="@android:dimen/app_icon_size"
                     android:layout_marginRight="16dip"
                     android:layout_gravity="center_vertical"
-                    android:scaleType="fitCenter"/>
+                    android:scaleType="fitCenter"
+                    android:contentDescription="@null" />
                 <TextView android:id="@+id/admin_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -74,7 +75,8 @@
                     <ImageView android:id="@+id/add_msg_expander"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical" />
+                        android:gravity="center_vertical"
+                        android:contentDescription="@null" />
                     <TextView android:id="@+id/add_msg"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index fe9e45a..24dab5e 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -38,6 +38,7 @@
             android:layout_width="@android:dimen/app_icon_size"
             android:layout_height="@android:dimen/app_icon_size"
             android:layout_gravity="center_vertical"
+            android:contentDescription="@null"
             />
     </LinearLayout>
 
diff --git a/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index 6b849ac..80911da 100644
--- a/res/layout/dialog_edittext.xml
+++ b/res/layout/dialog_edittext.xml
@@ -25,6 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:maxLength="50"
+        android:singleLine="true"
     />
         
 </LinearLayout>
diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml
new file mode 100644
index 0000000..18fe4f0
--- /dev/null
+++ b/res/layout/dream_picker_row.xml
@@ -0,0 +1,39 @@
+<?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"
+        android:contentDescription="@null" />
+
+    <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 afec517..f623d04 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -39,15 +39,24 @@
             android:paddingTop="5dip"
             android:paddingBottom="5dip" >
 
-        <!-- Application snippet label, version and icon -->
-        <include
-            layout="@layout/manage_applications_item"
-            android:id="@+id/app_snippet"/>
+            <!-- Application snippet label, version and icon -->
+            <include
+                layout="@layout/manage_applications_item"
+                android:id="@+id/app_snippet"/>
 
-        <!-- Force stop and uninstall buttons -->
-        <include
-            layout="@layout/two_buttons_panel"
-            android:id="@+id/control_buttons_panel"/>
+            <!-- Force stop and uninstall buttons -->
+            <include
+                layout="@layout/two_buttons_panel"
+                android:id="@+id/control_buttons_panel"/>
+
+            <!-- Ban notifications for this package -->
+            <CheckBox android:id="@+id/notification_switch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dip"
+                android:layout_gravity="left"
+                android:text="@string/app_notifications_switch_label" />
+
         </LinearLayout>
 
         <TextView
@@ -86,7 +95,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/total_size_text"
                     android:paddingTop="6dip"
@@ -122,7 +132,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/application_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
@@ -159,7 +170,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/external_code_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
@@ -197,7 +209,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
@@ -234,7 +247,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/external_data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
@@ -289,7 +303,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/cache_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
@@ -310,7 +325,7 @@
         </RelativeLayout>
 
         <!-- Prefered activities section -->
-        <TextView
+        <TextView android:id="@+id/auto_launch_title"
             style="?android:attr/listSeparatorTextViewStyle"
             android:layout_marginTop="8dip"
             android:text="@string/auto_launch_label" />
diff --git a/res/layout/keyboard_layout_dialog_switch_hint.xml b/res/layout/keyboard_layout_dialog_switch_hint.xml
new file mode 100644
index 0000000..af8c3f4
--- /dev/null
+++ b/res/layout/keyboard_layout_dialog_switch_hint.xml
@@ -0,0 +1,38 @@
+<?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="wrap_content"
+    android:orientation="vertical">
+
+    <ImageView android:id="@+id/titleDivider"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:scaleType="fitXY"
+        android:gravity="fill_horizontal"
+        android:src="@android:drawable/divider_horizontal_dark"
+        android:contentDescription="@null" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/keyboard_layout_dialog_switch_hint"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorAlertDialogListItem"
+        android:minHeight="48dp"
+        android:gravity="center" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/manage_applications.xml b/res/layout/manage_applications_apps.xml
old mode 100755
new mode 100644
similarity index 90%
rename from res/layout/manage_applications.xml
rename to res/layout/manage_applications_apps.xml
index 7df2f54..51ab412
--- a/res/layout/manage_applications.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- 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.
@@ -49,7 +49,9 @@
                 android:paddingTop="30dp"
                 android:paddingLeft="4dp"
                 android:paddingRight="4dp"
-                android:paddingBottom="1dp">
+                android:paddingBottom="1dp"
+                android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
+                android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
             <TextView android:id="@+id/usedStorageText"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
@@ -81,16 +83,12 @@
         </view>
     </LinearLayout>
 
-    <view class="com.android.settings.applications.RunningProcessesView"
-            android:id="@+id/running_processes"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone" />
-
     <LinearLayout android:id="@+id/loading_container"
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
             android:visibility="gone"
             android:gravity="center">
 
@@ -106,4 +104,4 @@
 
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/manage_applications_content.xml b/res/layout/manage_applications_content.xml
new file mode 100644
index 0000000..96ddeb3
--- /dev/null
+++ b/res/layout/manage_applications_content.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 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">
+
+    <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+        <android.support.v4.view.PagerTabStrip
+                android:id="@+id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:textAppearance="@style/TextAppearance.PagerTabs">
+        </android.support.v4.view.PagerTabStrip>
+    </android.support.v4.view.ViewPager>
+
+</LinearLayout>
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index 78d9a02..6708647 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -33,7 +33,8 @@
         android:layout_height="@android:dimen/app_icon_size"
         android:layout_marginRight="11dip"
         android:layout_gravity="center_vertical"
-        android:scaleType="fitCenter"/>
+        android:scaleType="fitCenter"
+        android:contentDescription="@null"/>
 
     <LinearLayout
         android:orientation="vertical"
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
new file mode 100644
index 0000000..634de1c
--- /dev/null
+++ b/res/layout/manage_applications_running.xml
@@ -0,0 +1,47 @@
+<?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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+    <view class="com.android.settings.applications.RunningProcessesView"
+            android:id="@+id/running_processes"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+
+    <LinearLayout android:id="@+id/loading_container"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
+            android:visibility="gone"
+            android:gravity="center">
+
+        <ProgressBar style="?android:attr/progressBarStyleLarge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        <TextView android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:text="@string/settings_safetylegal_activity_loading"
+                android:paddingTop="4dip"
+                android:singleLine="true" />
+
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/manage_apps_tab_content.xml b/res/layout/manage_apps_tab_content.xml
deleted file mode 100644
index 3898227..0000000
--- a/res/layout/manage_apps_tab_content.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml
index e10c65f..5a7aee5 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -26,6 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:src="@drawable/nav_divider"
+        android:contentDescription="@null"
          />
 
     <!-- Details button -->
@@ -36,6 +37,7 @@
         android:layout_gravity="center_vertical"
         android:padding="8dip"
         android:background="?android:attr/selectableItemBackground"
-        android:src="@drawable/ic_bt_config" />
+        android:src="@drawable/ic_bt_config"
+        android:contentDescription="@string/bluetooth_device_details" />
 
 </LinearLayout>
diff --git a/res/layout/preference_bluetooth_profile.xml b/res/layout/preference_bluetooth_profile.xml
index 1ed971e..f8e6bdc 100644
--- a/res/layout/preference_bluetooth_profile.xml
+++ b/res/layout/preference_bluetooth_profile.xml
@@ -26,6 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:src="@drawable/nav_divider"
+        android:contentDescription="@null"
          />
 
     <!-- Details button -->
@@ -36,6 +37,7 @@
         android:layout_gravity="center_vertical"
         android:padding="8dip"
         android:background="?android:attr/selectableItemBackground"
-        android:src="@drawable/ic_bt_config" />
+        android:src="@drawable/ic_bt_config"
+        android:contentDescription="@string/bluetooth_profile_details" />
 
 </LinearLayout>
diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
index a6893e7..82c6f28 100644
--- a/res/layout/preference_dialog_brightness.xml
+++ b/res/layout/preference_dialog_brightness.xml
@@ -31,7 +31,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingTop="20dip"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:contentDescription="@null" />
 
         <CheckBox android:id="@+id/automatic_mode"
                 android:layout_width="match_parent"
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index 2c83f12..a92f0ef 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -30,7 +30,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingTop="20dip"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                android:contentDescription="@null" />
 
         <!-- Dummy -->
         <SeekBar android:id="@*android:id/seekbar"
@@ -61,6 +62,7 @@
                         android:layout_height="wrap_content"
                         android:padding="16dip"
                         android:background="?android:attr/selectableItemBackground"
+                        android:contentDescription="@string/volume_media_mute"
                     />
 
                 <SeekBar android:id="@+id/media_volume_seekbar"
@@ -101,6 +103,7 @@
                             android:layout_height="wrap_content"
                             android:padding="16dip"
                             android:background="?android:attr/selectableItemBackground"
+                            android:contentDescription="@string/volume_ring_mute"
                         />
 
                     <SeekBar android:id="@+id/ringer_volume_seekbar"
@@ -143,6 +146,7 @@
                             android:layout_height="wrap_content"
                             android:padding="16dip"
                             android:background="?android:attr/selectableItemBackground"
+                            android:contentDescription="@string/volume_notification_mute"
                         />
 
                     <SeekBar android:id="@+id/notification_volume_seekbar"
@@ -178,7 +182,7 @@
                         android:layout_height="wrap_content"
                         android:padding="16dip"
                         android:background="?android:attr/selectableItemBackground"
-                    />
+                        android:contentDescription="@string/volume_alarm_mute" />
                 <SeekBar android:id="@+id/alarm_volume_seekbar"
                         android:layout_width="0dip"
                         android:layout_height="wrap_content"
diff --git a/res/layout/preference_header_item.xml b/res/layout/preference_header_item.xml
new file mode 100644
index 0000000..28da8a1
--- /dev/null
+++ b/res/layout/preference_header_item.xml
@@ -0,0 +1,66 @@
+<?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.
+-->
+
+<!-- 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">
+
+    <LinearLayout
+        android:layout_width="@dimen/header_icon_width"
+        android:layout_marginLeft="6dip"
+        android:layout_marginRight="6dip"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+    </LinearLayout>
+
+    <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>
+
+</LinearLayout>
diff --git a/res/layout/preference_header_switch_item.xml b/res/layout/preference_header_switch_item.xml
index 877ad7c..9d89c25 100644
--- a/res/layout/preference_header_switch_item.xml
+++ b/res/layout/preference_header_switch_item.xml
@@ -23,13 +23,17 @@
     android:gravity="center_vertical"
     android:paddingRight="?android:attr/scrollbarSize">
 
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <LinearLayout
+        android:layout_width="@dimen/header_icon_width"
         android:layout_marginLeft="6dip"
         android:layout_marginRight="6dip"
-        android:layout_gravity="center" />
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+    </LinearLayout>
 
     <RelativeLayout
         android:layout_width="wrap_content"
diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml
index 51612ce..7660646 100644
--- a/res/layout/preference_icon.xml
+++ b/res/layout/preference_icon.xml
@@ -31,7 +31,8 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="6dip"
         android:layout_marginRight="6dip"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:contentDescription="@null" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
index 1d6b237..e6188dc 100644
--- a/res/layout/preference_powergauge.xml
+++ b/res/layout/preference_powergauge.xml
@@ -27,7 +27,8 @@
         android:layout_width="48dip"
         android:layout_height="wrap_content"
         android:layout_marginRight="6dip"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:contentDescription="@null" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
@@ -65,7 +66,8 @@
             android:layout_width="match_parent"
             android:layout_marginTop="5dip"
             android:layout_below="@id/percent"
-            android:layout_gravity="center_vertical" />
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@null" />
 
         <TextView android:id="@+android:id/summary"
             android:layout_width="wrap_content"
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index 0a860af..ad782f2 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -21,7 +21,7 @@
     android:orientation="horizontal"
     >
 
-    <!-- This and the other text view have the style of the list separator text view without the background and padding -->
+    <!-- This text view has the style of the list separator text view without the background and padding. -->
     <TextView
         style="?android:attr/listSeparatorTextViewStyle"
         android:background="@null"
@@ -33,18 +33,6 @@
         android:layout_gravity="left|bottom"
     />
 
-    <TextView
-        style="?android:attr/listSeparatorTextViewStyle"
-        android:background="@null"
-        android:paddingLeft="0dip"
-        android:id="@+id/scanning_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_gravity="right|bottom"
-        android:text="@string/progress_scanning"
-        />
-
     <ProgressBar
         android:id="@+id/scanning_progress"
         android:text="@string/progress_scanning"
diff --git a/res/layout/preference_settings_checkbox_widget.xml b/res/layout/preference_settings_checkbox_widget.xml
index a65e56f..960661f 100644
--- a/res/layout/preference_settings_checkbox_widget.xml
+++ b/res/layout/preference_settings_checkbox_widget.xml
@@ -36,7 +36,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/nav_divider" />
+        android:src="@drawable/nav_divider"
+        android:contentDescription="@null" />
 
     <!-- CheckBox -->
     <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout/preference_spellchecker.xml b/res/layout/preference_spellchecker.xml
index d8b4a75..f64c26c 100644
--- a/res/layout/preference_spellchecker.xml
+++ b/res/layout/preference_spellchecker.xml
@@ -46,7 +46,7 @@
                 android:id="@+android:id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
+                android:maxLines="2"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal" />
@@ -70,7 +70,8 @@
         android:gravity="center_vertical"
         android:clickable="true"
         android:focusable="true"
-        android:background="?android:attr/selectableItemBackground" >
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@string/spellchecker_quick_settings" >
         <View
             android:layout_width="2dip"
             android:layout_height="match_parent"
@@ -83,7 +84,8 @@
             android:paddingLeft="5dip"
             android:paddingRight="5dip"
             android:src="@drawable/ic_sysbar_quicksettings"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"
+            android:contentDescription="@string/spellchecker_quick_settings" />
     </LinearLayout>
     <View
         android:id="@+id/pref_right_separator2"
@@ -102,5 +104,6 @@
         android:layout_gravity="right"
         android:clickable="true"
         android:focusable="true"
-        android:background="?android:attr/selectableItemBackground" />
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@string/spellchecker_language" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 5057aab..7cb2997 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -27,14 +27,16 @@
         android:src="@drawable/ic_sync_error_holo"
         android:layout_width="wrap_content"
         android:layout_marginRight="8dip"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/sync_failed" />
 
     <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" />
+        android:layout_marginRight="8dip"
+        android:contentDescription="@string/sync_active" />
 
     <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/checkbox"
diff --git a/res/layout/preference_widget_wifi_signal.xml b/res/layout/preference_widget_wifi_signal.xml
index a4e8763..6df203c 100644
--- a/res/layout/preference_widget_wifi_signal.xml
+++ b/res/layout/preference_widget_wifi_signal.xml
@@ -18,4 +18,5 @@
     android:id="@+id/signal" 
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:src="@drawable/wifi_signal" />
+    android:src="@drawable/wifi_signal"
+    android:contentDescription="@null" />
diff --git a/res/layout/profile_icon_small.xml b/res/layout/profile_icon_small.xml
index 3a113e0..9967f77 100644
--- a/res/layout/profile_icon_small.xml
+++ b/res/layout/profile_icon_small.xml
@@ -20,4 +20,5 @@
         android:layout_height="30dp"
         android:layout_marginRight="4dip"
         android:gravity="center"
-        android:layout_gravity="center_vertical" />
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@null" />
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index dacee9e..f46527a 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -38,7 +38,8 @@
             android:layout_height="@android:dimen/app_icon_size"
             android:layout_marginRight="11dip"
             android:layout_gravity="center_vertical"
-            android:scaleType="fitCenter"/>
+            android:scaleType="fitCenter"
+            android:contentDescription="@null" />
     
         <LinearLayout
             android:orientation="vertical"
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index 3558e92..e23de16 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -26,7 +26,10 @@
         <ListView android:id="@android:id/list"
                 android:layout_width="match_parent" 
                 android:layout_height="match_parent"
+                android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
+                android:paddingRight="@*android:dimen/preference_fragment_padding_side"
                 android:drawSelectorOnTop="false"
+                android:scrollbarStyle="outsideOverlay"
                 android:fastScrollEnabled="true" />
         <TextView android:id="@android:id/empty"
                 android:layout_width="match_parent"
@@ -46,7 +49,9 @@
             android:paddingTop="30dp"
             android:paddingLeft="4dp"
             android:paddingRight="4dp"
-            android:paddingBottom="1dp">
+            android:paddingBottom="1dp"
+            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
         <TextView android:id="@+id/foregroundText"
             android:layout_width="0px"
             android:layout_height="wrap_content"
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
new file mode 100644
index 0000000..79d59b3
--- /dev/null
+++ b/res/layout/setup_preference.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+<view
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    class="com.android.settings.wifi.WifiSettings$ProportionalOuterFrame"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/title_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:gravity="bottom">
+
+        <LinearLayout
+            android:id="@+id/button_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/title"
+            android:gravity="bottom"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1.0"
+                style="@style/SetupTitle"
+                android:text="@string/wifi_setup_wizard_title"
+                android:gravity="bottom" />
+
+            <ImageButton
+                android:id="@+id/more"
+                android:layout_width="@dimen/setup_button_size"
+                android:layout_height="@dimen/setup_button_size"
+                android:layout_marginLeft="8dip"
+                android:layout_marginRight="8dip"
+                android:layout_marginBottom="8dip"
+                android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
+                android:background="?android:attr/actionBarItemBackground"
+                android:contentDescription="@string/wifi_menu_wps_pbc" />
+
+        </LinearLayout>
+
+        <!-- Divider -->
+        <View
+            android:id="@+id/top_divider"
+            style="@style/TopDivider"
+            android:layout_below="@id/button_bar" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/title_area"
+        android:background="@android:color/transparent"
+        android:orientation="vertical" >
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"
+            android:cacheColorHint="@android:color/transparent"
+            android:clipToPadding="false"
+            android:drawSelectorOnTop="false"
+            android:paddingTop="0dip"
+            android:scrollbarAlwaysDrawVerticalTrack="true" />
+
+        <TextView
+            android:id="@android:id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/setup_item_margin"
+            android:background="@*android:drawable/list_divider_holo_dark" />
+
+        <LinearLayout
+            android:id="@+id/other_network"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/setup_item_margin"
+            android:background="?android:attr/selectableItemBackground"
+            android:gravity="center_vertical"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:paddingRight="?android:attr/scrollbarSize" >
+
+            <ImageView
+                android:id="@+id/add_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:src="@drawable/ic_menu_add" />
+
+            <TextView
+                android:id="@+id/other"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="6dip"
+                android:layout_marginLeft="15dip"
+                android:layout_marginRight="6dip"
+                android:layout_marginTop="6dip"
+                android:layout_weight="1"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/wifi_other_network" />
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/button_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:visibility="gone" >
+
+            <Button
+                android:id="@+id/back_button"
+                android:layout_width="150dip"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_margin="5dip"
+                android:text="@string/wifi_setup_back" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/skip_button"
+                    android:layout_width="150dip"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dip"
+                    android:text="@string/wifi_setup_skip"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@+id/next_button"
+                    android:layout_width="150dip"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dip"
+                    android:text="@string/wifi_setup_next" />
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+</view>
\ No newline at end of file
diff --git a/res/layout/text_description_preference.xml b/res/layout/text_description_preference.xml
index eeaa81b..7d73f58 100644
--- a/res/layout/text_description_preference.xml
+++ b/res/layout/text_description_preference.xml
@@ -24,7 +24,7 @@
         android:id="@+id/summary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?android:attr/textColorSecondary"
         android:padding="16dip" />
 
diff --git a/res/layout/title.xml b/res/layout/title.xml
index 63a30a7..eb2222b 100644
--- a/res/layout/title.xml
+++ b/res/layout/title.xml
@@ -27,7 +27,8 @@
         android:layout_width="48dip"
         android:layout_height="48dip"
         android:layout_margin="5dip"
-        android:layout_gravity="center_vertical" />
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@null" />
 
     <LinearLayout
         android:layout_width="0dip"
diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
new file mode 100644
index 0000000..4089299
--- /dev/null
+++ b/res/layout/user_dictionary_add_word.xml
@@ -0,0 +1,84 @@
+<?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/user_dict_settings_add_dialog_top"
+              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:orientation="vertical">
+    <com.android.internal.widget.DialogTitle
+          style="?android:attr/windowTitleStyle"
+          android:singleLine="true"
+          android:ellipsize="end"
+          android:layout_width="match_parent"
+          android:layout_height="64dip"
+          android:layout_marginLeft="16dip"
+          android:layout_marginRight="16dip"
+          android:gravity="center_vertical|left"
+          android:text="@string/user_dict_settings_add_dialog_title" />
+    <View android:layout_width="match_parent"
+          android:layout_height="2dip"
+          android:background="@android:color/holo_blue_light" />
+  </LinearLayout>
+
+  <EditText android:id="@+id/user_dictionary_add_word_text"
+            android:maxLength="@integer/maximum_user_dictionary_word_length"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_gravity="fill_horizontal|center_vertical"
+            android:layout_marginLeft="8dip"
+            android:layout_marginBottom="8dip"
+            android:layout_marginTop="8dip"
+            android:inputType="textNoSuggestions"
+            android:imeOptions="flagNoFullscreen">
+    <requestFocus />
+  </EditText>
+
+  <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:divider="?android:attr/dividerHorizontal"
+                android:showDividers="beginning"
+                android:dividerPadding="0dip">
+    <LinearLayout style="?android:attr/buttonBarStyle"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  android:measureWithLargestChild="true">
+      <Button android:layout_width="0dip"
+              android:layout_gravity="left"
+              android:layout_weight="1"
+              android:maxLines="2"
+              style="?android:attr/buttonBarButtonStyle"
+              android:textSize="14sp"
+              android:text="@string/cancel"
+              android:layout_height="wrap_content"
+              android:onClick="onClickCancel" />
+      <Button android:layout_width="0dip"
+              android:layout_gravity="right"
+              android:layout_weight="1"
+              android:maxLines="2"
+              style="?android:attr/buttonBarButtonStyle"
+              android:textSize="14sp"
+              android:text="@string/user_dict_settings_add_dialog_confirm"
+              android:layout_height="wrap_content"
+              android:onClick="onClickConfirm" />
+    </LinearLayout>
+  </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml
new file mode 100644
index 0000000..c0f3f53
--- /dev/null
+++ b/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -0,0 +1,74 @@
+<?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:id="@+id/user_dict_settings_add_dialog_top"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+  <TextView
+     android:layout_height="wrap_content"
+     android:layout_width="match_parent"
+     android:text="@string/user_dict_settings_add_screen_title"
+     style="?android:attr/listSeparatorTextViewStyle" />
+
+  <EditText android:id="@+id/user_dictionary_add_word_text"
+            android:maxLength="@integer/maximum_user_dictionary_word_length"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_gravity="fill_horizontal|center_vertical"
+            android:layout_marginLeft="8dip"
+            android:layout_marginBottom="8dip"
+            android:layout_marginTop="8dip"
+            android:inputType="textNoSuggestions"
+            android:imeOptions="flagNoFullscreen">
+    <requestFocus />
+  </EditText>
+  <GridLayout android:id="@+id/user_dictionary_add_word_grid"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="8dip"
+              android:layout_marginRight="8dip"
+              android:columnCount="2">
+    <TextView android:id="@+id/user_dictionary_add_shortcut_label"
+              style="?android:attr/textAppearanceSmall"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="left|center_vertical"
+              android:text="@string/user_dict_settings_add_shortcut_option_name" />
+    <EditText android:id="@+id/user_dictionary_add_shortcut"
+              android:maxLength="@integer/maximum_user_dictionary_word_length"
+              android:layout_width="wrap_content"
+              android:layout_gravity="fill_horizontal|center_vertical"
+              android:layout_marginLeft="8dip"
+              android:layout_marginBottom="8dip"
+              android:layout_marginTop="8dip"
+              android:inputType="textNoSuggestions"
+              android:imeOptions="flagNoFullscreen" />
+    <TextView android:id="@+id/user_dictionary_add_locale_label"
+              style="?android:attr/textAppearanceSmall"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="left|center_vertical"
+              android:text="@string/user_dict_settings_add_locale_option_name" />
+    <Spinner  android:id="@+id/user_dictionary_add_locale"
+              android:layout_marginLeft="8dip"
+              android:layout_marginBottom="8dip"
+              android:layout_marginTop="8dip"
+              android:layout_width="wrap_content"
+              android:layout_gravity="fill_horizontal|center_vertical" />
+    </GridLayout>
+</LinearLayout>
diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml
index aaf3cbd..749986e 100644
--- a/res/layout/user_dictionary_item.xml
+++ b/res/layout/user_dictionary_item.xml
@@ -15,36 +15,38 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+    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:background="?android:attr/selectableItemBackground" >
 
-    <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"/>
+  <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">
 
-    <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"
-        />
+    <TextView android:id="@+android:id/text1"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              android:ellipsize="marquee"
+              android:fadingEdge="horizontal" />
 
-    <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"
-        />
+    <TextView android:id="@+android:id/text2"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_below="@android:id/text1"
+              android:layout_alignLeft="@android:id/text1"
+              android:textAppearance="?android:attr/textAppearanceSmall"
+              android:textColor="?android:attr/textColorSecondary"
+              android:maxLines="1" />
+
+  </RelativeLayout>
+
 </LinearLayout>
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index fa8f3de..d000a46 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -38,6 +38,7 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:scaleType="center"
+            android:contentDescription="@null"
             />
 
         <ImageView
@@ -45,6 +46,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
+            android:contentDescription="@null"
             />
         </LinearLayout>
 
@@ -52,6 +54,7 @@
         android:layout_width="1dip"
         android:layout_height="match_parent"
         android:background="@drawable/appwidget_settings_divider_holo"
+        android:contentDescription="@null"
         />
 
     <LinearLayout
@@ -71,6 +74,7 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:scaleType="center"
+            android:contentDescription="@null"
             />
 
         <ImageView
@@ -78,6 +82,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
+            android:contentDescription="@null"
             />
 
     </LinearLayout>
@@ -86,6 +91,7 @@
         android:layout_width="1dip"
         android:layout_height="match_parent"
         android:background="@drawable/appwidget_settings_divider_holo"
+        android:contentDescription="@null"
         />
 
     <LinearLayout
@@ -105,6 +111,7 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:scaleType="center"
+            android:contentDescription="@null"
             />
 
         <ImageView
@@ -112,6 +119,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
+            android:contentDescription="@null"
             />
     </LinearLayout>
 
@@ -119,6 +127,7 @@
         android:layout_width="1dip"
         android:layout_height="match_parent"
         android:background="@drawable/appwidget_settings_divider_holo"
+        android:contentDescription="@null"
         />    
 
     <LinearLayout
@@ -138,6 +147,7 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:scaleType="center"
+            android:contentDescription="@null"
             />
 
         <ImageView
@@ -145,6 +155,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
+            android:contentDescription="@null"
             />
     </LinearLayout>
 
@@ -152,6 +163,7 @@
         android:layout_width="1dip"
         android:layout_height="match_parent"
         android:background="@drawable/appwidget_settings_divider_holo"
+        android:contentDescription="@null"
         />
 
     <LinearLayout
@@ -171,6 +183,7 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:scaleType="center"
+            android:contentDescription="@null"
             />
 
         <ImageView
@@ -178,6 +191,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
+            android:contentDescription="@null"
             />
     </LinearLayout>
 
diff --git a/res/layout/wifi_config_preference.xml b/res/layout/wifi_config_preference.xml
deleted file mode 100644
index 6103fb9..0000000
--- a/res/layout/wifi_config_preference.xml
+++ /dev/null
@@ -1,346 +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.
--->
-<!-- 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
index 138458b..1b10f90 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -52,30 +52,6 @@
             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"
@@ -204,44 +180,6 @@
                   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"
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index f06c332..5103e8b 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -19,7 +19,7 @@
          android:layout_height="wrap_content">
 
     <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
@@ -179,35 +179,6 @@
                     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="@style/wifi_item_label"
-                        android:text="@string/wifi_network_setup" />
-
-                <Spinner android:id="@+id/network_setup"
-                        style="@style/wifi_item_content"
-                        android:prompt="@string/wifi_network_setup"
-                        android:entries="@array/wifi_network_setup" />
-
-            </LinearLayout>
-
-            <LinearLayout android:id="@+id/wps_fields"
-                    style="@style/wifi_item"
-                    android:visibility="gone">
-
-                <TextView
-                        style="@style/wifi_item_label"
-                        android:text="@string/wifi_wps_pin" />
-
-                <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"
diff --git a/res/layout/wifi_p2p_dialog.xml b/res/layout/wifi_p2p_dialog.xml
deleted file mode 100644
index 7a86c1e..0000000
--- a/res/layout/wifi_p2p_dialog.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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_wps_dialog.xml b/res/layout/wifi_wps_dialog.xml
new file mode 100644
index 0000000..1c5713a
--- /dev/null
+++ b/res/layout/wifi_wps_dialog.xml
@@ -0,0 +1,66 @@
+<?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.
+-->
+
+<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">
+
+        <TextView
+                android:id="@+id/wps_dialog_txt"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dip" />
+
+        <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="8dip"
+                android:src="@drawable/ic_wps" />
+
+        <ProgressBar
+                android:id="@+id/wps_timeout_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dip"
+                style="?android:attr/progressBarStyleHorizontal" />
+
+        <ProgressBar
+                android:id="@+id/wps_progress_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dip"
+                style="?android:attr/progressBarStyle" />
+
+        <RelativeLayout
+                android:gravity="center"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+            <Button
+                    android:id="@+id/wps_dialog_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cancel" />
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/res/menu/data_usage.xml b/res/menu/data_usage.xml
index 4e938aa..ea3effa 100644
--- a/res/menu/data_usage.xml
+++ b/res/menu/data_usage.xml
@@ -28,6 +28,10 @@
         android:title="@string/data_usage_menu_split_4g"
         android:checkable="true" />
     <item
+        android:id="@+id/data_usage_menu_auto_sync"
+        android:title="@string/data_usage_menu_auto_sync"
+        android:checkable="true" />
+    <item
         android:id="@+id/data_usage_menu_show_wifi"
         android:title="@string/data_usage_menu_show_wifi"
         android:checkable="true" />
@@ -35,4 +39,10 @@
         android:id="@+id/data_usage_menu_show_ethernet"
         android:title="@string/data_usage_menu_show_ethernet"
         android:checkable="true" />
+    <item
+        android:id="@+id/data_usage_menu_metered"
+        android:title="@string/data_usage_menu_metered" />
+    <item
+        android:id="@+id/data_usage_menu_help"
+        android:title="@string/help_label" />
 </menu>
diff --git a/res/values-sw600dp/themes.xml b/res/menu/storage.xml
similarity index 72%
rename from res/values-sw600dp/themes.xml
rename to res/menu/storage.xml
index 22cf17e..2e4c660 100644
--- a/res/values-sw600dp/themes.xml
+++ b/res/menu/storage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- 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.
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<resources>
-
-    <style name="Theme.AccessibilityTutorialActivity" parent="@android:style/Theme.Holo.NoActionBar">
-    </style>
-</resources>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/storage_usb"
+        android:title="@string/storage_menu_usb" />
+</menu>
diff --git a/res/values-sw600dp/themes.xml b/res/menu/wifi_setup.xml
similarity index 72%
copy from res/values-sw600dp/themes.xml
copy to res/menu/wifi_setup.xml
index 22cf17e..91d5516 100644
--- a/res/values-sw600dp/themes.xml
+++ b/res/menu/wifi_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- 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.
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<resources>
-
-    <style name="Theme.AccessibilityTutorialActivity" parent="@android:style/Theme.Holo.NoActionBar">
-    </style>
-</resources>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/wifi_wps"
+        android:title="@string/wifi_setup_wps" />
+</menu>
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
index c02bd42..32da776 100644
--- a/res/mipmap-hdpi/ic_launcher_settings.png
+++ 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
index 05cdd9a..32a22ac 100644
--- a/res/mipmap-mdpi/ic_launcher_settings.png
+++ 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
index 2b2907b..9bfdd78 100644
--- a/res/mipmap-xhdpi/ic_launcher_settings.png
+++ b/res/mipmap-xhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 4408f01..397ee9e 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Ontkoppel tans…"</item>
     <item msgid="1634960474403853625">"Ontkoppel"</item>
     <item msgid="746097431216080650">"Onsuksesvol"</item>
+    <item msgid="6367044185730295334">"Geblokkeer"</item>
+    <item msgid="503942654197908005">"Vermy tydelik swak verbinding"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <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>
+    <item msgid="5660739516542454527">"Geblokkeer"</item>
+    <item msgid="1805837518286731242">"Vermy tydelik swak verbinding"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Druk knoppie"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Geen"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN van toegangspunt"</item>
-    <item msgid="7364462169350112617">"PIN van dié toestel"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Staties"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Verwyderbare SD-kaart"</item>
     <item msgid="4498124044785815005">"Laat die stelsel besluit"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Af"</item>
-    <item msgid="4804571292609523335">"Vibreer"</item>
-    <item msgid="595707141547423573">"Demp"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Medium"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animasieskaal 5x"</item>
     <item msgid="6660750935954853365">"Animasieskaal 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animasie af"</item>
+    <item msgid="1138649021950863198">"Animasieskaal 0,5x"</item>
+    <item msgid="4394388961370833040">"Animasieskaal 1x"</item>
+    <item msgid="8125427921655194973">"Animasieskaal 1,5x"</item>
+    <item msgid="3334024790739189573">"Animasieskaal 2x"</item>
+    <item msgid="3170120558236848008">"Animasieskaal 5x"</item>
+    <item msgid="1069584980746680398">"Animasieskaal 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen agtergrondprosesse"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ffa7696..6ad5d7f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nee"</string>
+    <string name="create" msgid="3578857613172647409">"Skep"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"DRAADLOOS en NETWERKE"</string>
     <string name="header_category_device" msgid="5781174212691167553">"TOESTEL"</string>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Voorkom die gebruik van die Bluetooth-beller wanneer die skerm gesluit is"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-toestelle"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Toestelnaam"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Toestelinstellings"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profielinstellings"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Geen naam gestel nie, gebruik rekeningnaam"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skandeer vir toestelle"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Hernoem tablet"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Verbind tans…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Onbenoemde Bluetooth-toestel"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Soek"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Raak om saam te bind"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Geen Bluetooth-toestelle is naby gevind nie."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-saambindingsversoek"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Saambindingsversoek"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"Raak om saam te bind met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Raak om saam te bind aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Wys ontvangde lêers"</string>
-    <string name="device_picker" msgid="8721012448931226323">"Bluetooth-toestelkieser"</string>
+    <string name="device_picker" msgid="8398232791303186677">"Kieser vir Bluetooth-toestelle"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-toestemmingsversoek"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"\'n Program wil Bluetooth aanskakel. Toelaat?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"\'n Program op jou tablet wil jou tablet opspoorbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes . Toelaat?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Raak om te koppel aan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Wil jy koppel aan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Foonboek-versoek"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s wil graag toegang kry tot jou kontakte en oproepgeskiedenis. Wil jy toegang gee aan %2$s?"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wil toegang hê tot jou kontakte en oproepgeskiedenis. Gee toegang aan %2$s?"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Moenie weer vra nie"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum- en tydinstellings"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 nm"</string>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Die gasheernaam wat jy ingevoer het, is nie geldig nie."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Die uitsluitingslys wat jy ingevoer het, is nie behoorlik geformateer nie. Voer asseblief \'n kommageskeide lys uitgeslote domeine in."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Jy moet die poortveld voltooi."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Jy moet die poortveld voltooi."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Die poortveld moet leeg wees as die gasheerveld leeg is."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Die poort wat jy ingevoer het, is nie geldig nie."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Die HTTP-instaanbediener word deur die blaaier gebruik, maar kan nie deur die ander programme gebruik word nie."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Stel"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Onsuksesvol"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Suksesvol"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Wysigings tree in werking wanneer USB-kabel weer gekoppel word."</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Veranderings tree in werking wanneer USB-kabel herkoppel word."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Aktiveer USB-massastoorfunksie"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Totale grepe:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-berging nie geheg nie"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Geen SD-kaart nie"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB-geheue nie geheg nie."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Geen SD-kaart nie."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Beskikbare grepe:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-berging word tans as \'n massabergingtoestel gebruik"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Die SD-kaart word as \'n massastoortoestel gebruik"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Dit is nou veilig om die USB-berging te verwyder"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Dit is nou veilig om die SD-kaart te verwyder"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB-geheue word gebruik as bergingstoestel."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD-kaart word gebruik as bergingstoestel."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Dit is nou veilig om die USB-geheue uit te haal."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Dit is nou veilig om die SD-kaart uit te haal."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-berging is uitgehaal terwyl dit nog in gebruik is!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-kaart is uitgehaal terwyl dit nog in gebruik was!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Gebruikte grepe:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Ondersoek tans USB-berging vir media…"</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Skandeer tans SD-kaart vir media…"</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-berging geheg as leesalleen"</string>
-    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Die SD-kaart is as leesalleen geheg"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB-geheue is leesalleen geheg."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD-kaart is leesalleen geheg."</string>
     <string name="skip_label" msgid="47510779345218297">"Slaan oor"</string>
     <string name="next_label" msgid="4693520878012668114">"Volgende"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Taal"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Verbind aan datadienste wanneer swerf"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Jy het dataverbinding verloor omdat jy wegbeweeg het van jou tuisnetwerk af sonder om dataswerwing weer aan te skakel."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Skakel dit aan"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Laat dataswerwing toe? Dit kan lei tot aansienlike swerwingskoste!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Aandag"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"As jy dataswerwing toelaat, kan dit moontlik heelwat swerfkoste veroorsaak!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Laat dataswerwing toe?"</string>
     <string name="networks" msgid="6333316876545927039">"Operateurkeuse"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Kies \'n netwerkoperateur"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum en tyd"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Stel tyd"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Kies tydsone"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Stel datum"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Kies datumformaat"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Kies datumformaat"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Verbeter gesigpassing"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Lewendigheidstoets"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Vereis dat oë geknip word"</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>
@@ -306,26 +310,27 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vereis \'n numeriese PIN of wagwoord om jou tablet te dekripteer elke keer as jy dit aanskakel"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vereis \'n numeriese PIN of wagwoord om jou foon te dekripteer elke keer as jy dit aanskakel"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Geënkripteer"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media- en ander lêers enkripteer. Sodra jy jou tablet enkripteer moet jy \'n numeriese PIN of wagwoord invoer om dit te dekripteer elke keer as jy dit aanskakel: jy kan nie enkripsie ontdoen nie, tensy jy \'n fabrieksterugstelling doen, wat al jou data sal uitvee."\n\n"Enkripsie duur \'n uur of meer. Jy moet begin met \'n gelaaide battery en jou tablet ingeprop hou totdat enkripsie voltooi is. As jy die enkripsieproses onderbreek sal jy sommige of al jou data verloor."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media- en ander lêers enkripteer. Sodra jy jou foon enkripteer moet jy \'n numeriese PIN of wagwoord invoer om dit te dekripteer elke keer as jy dit aanskakel: jy kan nie enkripsie ontdoen nie, tensy jy \'n fabrieksterugstelling doen, wat al jou data sal uitvee."\n\n"Enkripsie duur \'n uur of meer. Jy moet begin met \'n gelaaide battery en jou foon ingeprop hou totdat enkripsie voltooi is. As jy die enkripsieproses onderbreek sal jy sommige of al jou data verloor."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou tablet geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou tablet dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee."\n\n"Enkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou tablet ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou foon geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou foon dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee."\n\n"Enkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou foon ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripteer tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripteer foon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laai jou battery en probeer weer."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Prop jou laaier in en probeer weer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen skermslot-PIN of -wagwoord nie"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Jy moet \'n PIN of wagwoord vir die skermslot stel voordat jy met enkripsie kan begin."</string>
-    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bevestig enkripsie"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Enkripteer tablet? Hierdie handeling kan nie ontdoen word nie, en as jy dit onderbreek, sal jy data verloor. Enkripsie duur \'n uur of meer, waartydens die tablet \'n paar keer sal herbegin."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Enkripteer foon? Hierdie handeling kan nie ontdoen word nie, en as jy dit onderbreek, sal jy data verloor. Enkripsie duur \'n uur of meer, waartydens die foon \'n paar keer sal herbegin."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Jy moet \'n PIN of wagwoord vir die skermslot stel, voordat jy met enkripsie kan begin."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Enkripteer?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Die enkripsiehandeling is onomkeerbaar en as jy dit onderbreek, sal jy data verloor. Enkripsie neem \'n uur of langer en in daardie tyd sal die tablet \'n paar keer herbegin."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Die enkripsiehandeling is onomkeerbaar en as jy dit onderbreek, sal jy data verloor. Enkripsie neem \'n uur of langer en in daardie tyd sal die foon \'n paar keer herbegin."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Enkripteer"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Wag asseblief terwyl jou tablet geënkripteer word. <xliff:g id="PERCENT">^1</xliff:g>% voltooi."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Wag asseblief terwyl jou foon geënkripteer word. <xliff:g id="PERCENT">^1</xliff:g>% voltooi."</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer weer oor <xliff:g id="DELAY">^1</xliff:g> sekondes."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Voer jou wagwoord in"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsie onsuksesvol"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Enkripsie is onderbreek en kan nie voltooi nie. Gevolglik is die data op jou tablet nie langer toeganklik nie. "\n\n"Om gebruik van jou tablet te hervat, moet jy \'n fabriekterugstelling doen. As jy jou tablet opstel na die terugstelling, sal jy \'n geleentheid kry om enige inligting te herstel wat ntot jou Google-rekening was gerugsteun te herstel."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Enkripsie is onderbreek en kan nie voltooi nie. Gevolglik is die data op jou selfoon nie langer toeganklik nie. "\n\n"Om gebruik van jou selfoon te hervat, moet jy \'n fabriekterugstelling doen. As jy jou foon na die terugstelling weer opstel, het jy \'n geleentheid om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Kies skermslot"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou tablet nie langer toeganklik nie. "\n\n" Om gebruik van jou tablet te hervat, moet jy \'n fabriekterugstelling doen. As jy jou tablet opstel na die terugstelling, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou selfoon nie langer toeganklik nie. "\n\n"Om gebruik van jou selfoon te hervat, moet jy \'n fabriekterugstelling doen. As jy jou foon na die terugstelling weer opstel, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Wissel invoermetode"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Kies skermslot"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Kies rugsteunslot"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face-ontsluit"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Patroon"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <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>
-    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Wagwoord moet minder as <xliff:g id="NUMBER">%d</xliff:g> karakters wees"</string>
-    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN moet uit minder as <xliff:g id="NUMBER">%d</xliff:g> syfers bestaan"</string>
-    <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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Wagwoord moet korter as <xliff:g id="NUMBER">%d</xliff:g> karakters wees."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN moet korter as <xliff:g id="NUMBER">%d</xliff:g> syfers wees."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN moet net die syfers 0-9 bevat."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Toesteladministrateur laat nie toe dat jy \'n onlangse PIN gebruik nie."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Wagwoord bevat \'n ongeldige karakter."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Wagwoord moet ten minste een letter bevat."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Wagwoord moet ten minste een syfer bevat."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Wagwoord moet ten minste 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>
+    <item quantity="one" msgid="3063853802158131458">"Wagwoord moet ten minste 1 letter bevat."</item>
+    <item quantity="other" msgid="8186027808415585970">"Wagwoord moet ten minste %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>
+    <item quantity="one" msgid="5583986519662091001">"Wagwoord moet ten minste 1 onderkas-letter bevat."</item>
+    <item quantity="other" msgid="2693910942679679225">"Wagwoord moet ten minste %d onderkas-letters 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>
+    <item quantity="one" msgid="2611909966725502768">"Wagwoord moet ten minste 1 bokas-letter bevat."</item>
+    <item quantity="other" msgid="3030801209112209245">"Wagwoord moet ten minste %d bokas-letters 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>
+    <item quantity="one" msgid="3820355568839621231">"Wagwoord moet ten minste 1 syfer bevat."</item>
+    <item quantity="other" msgid="4703982391407595924">"Wagwoord moet ten minste %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>
+    <item quantity="one" msgid="8456579939292408631">"Wagwoord moet ten minste 1 spesiale simbool bevat."</item>
+    <item quantity="other" msgid="1221290525051187757">"Wagwoord moet ten minste %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>
+    <item quantity="one" msgid="4594051152085925921">"Wagwoord moet ten minste 1 nieletter-karakter bevat."</item>
+    <item quantity="other" msgid="3952508584649046404">"Wagwoord moet ten minste %d nieletter-karakters bevat."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Toesteladministrateur verbied gebruik van \'n onlangse wagwoord"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Toesteladministrateur laat nie toe dat jy \'n onlangse wagwoord gebruik nie."</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="lock_setup" msgid="1759001157415978959">"Opstelling klaar"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Opstelling is klaar."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Om saam te bind met: <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Voer die toestel se vereiste wagwoordleutel in:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN bevat letters of simbole"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Gewoonlik 0000 of 1234"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Jy sal dalk ook hierdie PIN op die ander toestel moet invoer."</string>
-    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Jy moet dalk ook hierdie geheimsleutel op die ander toestel invoer."</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Jy sal hierdie PIN dalk op die ander toestel ook moet invoer."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Jy sal hierdie sleutel dalk op die ander toestel ook moet invoer."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Om saam te bind 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;maak seker dit wys hierdie geheimsleutel:&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;Bind met hierdie toestel saam?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Om saam te bind met:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Voer daarop in:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, druk dan Return of Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Kon nie met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saambind nie weens \'n verkeerde PIN of wagwoordsleutel."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kan nie met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kommunikeer 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_connecting_error_message" msgid="229861986106185022">"Kon nie aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koppel nie."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Soek vir toestelle"</string>
     <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Soek vir toestelle"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Soek tans…"</string>
@@ -478,19 +483,23 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Vir musiek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Onthou instellings"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="5237208142892767592">"Laat data-ruilprogram toe wanneer die foon aan \'n ander toestel raak"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Laat dataruiling toe wanneer die tablet aan \'n ander toestel raak"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Laat data-ruilprogram toe wanneer die foon aan \'n ander toestel raak"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Gereed om program-inhoud te stuur via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Af"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Onbeskikbaar omdat NFC afgeskakel is"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Wanneer hierdie funksie aangeskakel is, kan jy programinhoud na \'n ander NFC-toestel oorsein deur die toestelle naby aan mekaar te hou. Jy kan byvoorbeeld blaaierbladsye, YouTube-video\'s, Mense-kontakte en meer oorsein. "\n" "\n"Bring bloot die toestelle bymekaar (gewoonlik rug teen rug) en raak dan aan jou skerm. Die program bepaal wat oorgesein word."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Netwerkdiens-ontdekking"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Laat programme op ander toestelle toe om programme op hierdie toestel te ontdek"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Skakel Wi-Fi aan"</string>
     <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi-instellings"</string>
     <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Stel en beheer draadlose toegangspunte"</string>
+    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Kies Wi-Fi"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"Skakel tans Wi-Fi aan…"</string>
     <string name="wifi_stopping" msgid="244864762599017659">"Skakel tans Wi-Fi af…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fout"</string>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan nie skandeer vir netwerke nie"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netwerkkennisgewing"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Stel my in kennis wanneer \'n oop netwerk beskikbaar is"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Vermy swak verbindings"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Moenie \'n Wi-Fi-netwerk gebruik tensy dit \'n goeie internetverbinding het nie"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vermy swak verbindings"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Moenie \'n Wi-Fi-netwerk gebruik tensy dit \'n goeie internetverbinding het nie"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Hou Wi-Fi aan tydens sluimer"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kon nie die instelling verander nie"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Voeg netwerk by"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerke"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-drukknoppie"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN-invoering"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skandeer"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gevorderd"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koppel aan netwerk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Vergeet netwerk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Wysig netwerk"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Om beskikbare netwerke te sien, skakel Wi-Fi aan."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Soek tans vir Wi-Fi-netwerke..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Nog"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Outomatiese opstelling (WPS)"</string>
     <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="8242979682530043184">"Voer PIN van toegangspunt in"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS-opstelling"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Voer die PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> by die toegangspunt in"</string>
-    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS is reeds besig en kan etlike sekondes duur om af te handel"</string>
-    <string name="wifi_wps_failed" msgid="1648418410092969300">"Kon nie WPS begin nie, probeer weer."</string>
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskermde opstelling"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS begin..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Druk die Wi-Fi-beskermde-opstelling-knoppie op jou roeteerder. Dit word moontlik \"WPS\" genoem of bevat hierdie simbool:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Voer die PIN <xliff:g id="NUMBER">%1$s</xliff:g> op jou Wi-Fi-roeteerder in. Die opstelling kan tot twee minute neem om te voltooi."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS suksesvol. Koppel tans aan die netwerk..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Gekoppel aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS is reeds besig en kan tot twee minute neem om te voltooi"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS het misluk. Probeer asseblief oor \'n paar minute weer."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Die koordlose roeteerder se sekuriteitsinstelling (WEP) word nie ondersteun nie"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Die draadlose roeteerder se sekuriteitsinstelling (TKIP) word nie ondersteun nie"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Stawingmislukking. Probeer asseblief weer."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Nog \'n WPS-sessie is opgespoor. Probeer asseblief oor \'n paar minute weer."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Netwerk-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sekuriteit"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Seinsterkte"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Gestoor"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Gedeaktiveer"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Swak internetverbinding vermy"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Die netwerk is weens \'n swak verbinding vermy. Skakel hierdie gedrag af in die Instellings- en Wi-Fi-skerm, Gevorderde kieslysitem."</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="3538912605343585226">"Beskermde netwerk beskikbaar"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (beskermde netwerk beskikbaar)"</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_failed_connect_message" msgid="8491902558970292871">"Netwerkverbinding het misluk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeet"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Kon netwerk nie vergeet nie"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Stoor"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netwerkstoring het misluk"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Kanselleer"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Nog \'n Wi-Fi-beskermde sessie is ontdek. Probeer weer in \'n paar minute."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Gevorderde Wi-Fi"</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Deurgang"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengte van netwerkvoorvoegsel"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Stel eweknie-verbinding op"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Toestelinligting"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi-beskermde opstelling"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Voer PIN in"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Onthou hierdie verbinding"</string>
-    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Soek"</string>
-    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Skep groep"</string>
-    <string name="wifi_p2p_menu_remove_group" msgid="4844634506540667517">"Verwyder groep"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Gevorderd"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Beskikbare toestelle"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Soek vir toestelle"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Soek tans…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Hernoem toestel"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Portuurtoestelle"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Kon nie koppel nie."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Kon nie toestel hernoem nie."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Ontkoppel?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"As jy ontkoppel, sal jou verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> ophou."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"As jy ontkoppel, sal jou verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> en <xliff:g id="PEER_COUNT">%2$s</xliff:g> ander toestelle ophou."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kanselleer uitnodiging?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Wil jy die uitnodiging kanselleer om met <xliff:g id="PEER_NAME">%1$s</xliff:g> te koppel?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi-warmkol"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Wi-Fi-warmkol <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktief"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fout met Wi-Fi-warmkol"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Stel Wi-Fi-warmkol op"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"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> Wi-Fi-warmkol"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Stilmodus"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Foon-luitoon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musiekeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Luiervolume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreer wanneer stil"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibreer en lui"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Verstek kennisgewing"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Flikker kennisgewing-liggie"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Luitoon"</string>
@@ -614,6 +637,11 @@
     <string name="volume_ring_description" msgid="5936851631698298989">"Luitoon en kennisgewings"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Kennisgewings"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Wekkers"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Demp luitoon en kennisgewings"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Demp musiek en ander media"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Demp kennisgewings"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Demp alarms"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibreer wanneer dit lui"</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>
@@ -623,14 +651,15 @@
     <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="9015625921245904495">"Jy moet die tablet dok voordat jy dokoudio opstel."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Jy moet die foon dok voordat jy die dokoudio opstel."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Jy moet die tablet dok voordat jy die dok-oudio opstel."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Jy moet die foon dok voordat jy die dok-oudio opstel."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"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 sinkronisering"</string>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <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">"Skerm"</string>
@@ -702,7 +731,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"My foonnommer"</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-weergawe"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL-weergawe"</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">"Mobielenetwerk-tipe"</string>
@@ -823,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vee al jou persoonlike inligting en afgelaaide programme uit? Jy kan nie hierdie handeling ongedaan maak nie!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Vee alles uit"</string>
     <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>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Jy moet jou ontsluitpatroon teken om \'n fabrieksterugstelling te bevestig."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Omdat die Stelsel Skoonmaak-diens nie beskikbaar was nie, is geen terugstel gedoen nie."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Stel terug?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Vee USB-berging uit"</string>
@@ -838,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vee SD-kaart uit, wat alle lêers wat daar gestoor word, sal uitvee? Handeling kan nie ontdoen 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>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"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="6288926293245938415">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die SD-kaart wil uitvee."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Oproepinstellings"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Stel stemboodskapdiens, oproepaanstuur, oproep wag, beller-ID op"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-verbinding"</string>
@@ -870,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerke"</string>
     <string name="location_title" msgid="1029961368397484576">"My ligging"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google se liggingsdiens"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Laat programme data vanaf bronne soos Wi-Fi en mobiele netwerke gebruik om jou benaderde ligging te bepaal"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Laat toe dat anonieme ligigngsdata na Google gestuur word. Laat ook toegelate programme toe om data van bronne soos Wi-Fi en mobiele netwerke te gebruik om jou benaderde ligging te bepaal."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ligging deur Wi-Fi vasgestel"</string>
     <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>
@@ -915,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Druk Kieslys vir hulp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Lig vinger wanneer jy klaar is."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Verbind ten minste <xliff:g id="NUMBER">%d</xliff:g> kolletjies. Probeer weer:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Patroon opgeneem!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Patroon opgeneem."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Teken weer patroon om te bevestig:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Jou nuwe ontsluitpatroon:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bevestig"</string>
@@ -937,7 +966,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Volgende"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Beveilig jou tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Beveilig jou foon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Beskerm jou tablet teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. Gly met jou vinger om die kolletjies in enige volgorde te verbind op die volgende skerm. Jy moet ten minste vier kolletjies verbind. "\n\n"Reg om te begin? Raak “Volgende”."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskerm jou tablet teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. Laat gly jou vinger oor die volgende skerm om die kolletjies in enige volgorde te verbind. Jy moet ten minste vier kolletjies verbind. "\n\n"Reg om te begin? Raak Volgende."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskerm jou foon teen ongemagtigde gebruik deur \'n persoonlike skermontsluit-patroon te skep. Gly met jou vinger om ten minste vier kolletjies in enige volgorde op die volgende skerm te verbind. "\n\n"Gereed? Raak \"Volgende\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Bestuur programme"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Bestuur en verwyder geïnstalleerde programme"</string>
@@ -945,7 +974,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Bestuur programme, stel kits-loodskortpaaie op"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Program-instellings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Onbekende bronne"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Laat installering van nie-Market-programme toe"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Laat die installering van programme van onbekende bronne toe"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Jou tablet en persoonlike inligting is meer blootgestel aan aanvalle van programme uit onbekende bronne. Jy stem in dat slegs jy verantwoordelik is vir enige skade aan jou tablet of verlies van data weens die gebruik van hierdie programme."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Jou selfoon en persoonlike inligting is meer kwesbaar vir aanvalle deur programme van onbekende bronne. Jy stem saam dat slegs jy verantwoordelik is vir enige skade aan jou foon of verlies van data weens die gebruik van hierdie programme."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Gevorderde instellings"</string>
@@ -953,6 +982,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Programinligting"</string>
     <string name="storage_label" msgid="8700867073480107253">"Berging"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Loods by verstek"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Verstekke"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Skermversoenbaarheid"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Toestemmings"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Kasgeheue"</string>
@@ -972,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Vee data uit"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Deïnstalleer opdaterings"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Jy het gekies om hierdie program by verstek vir \'n paar handelinge te loods."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Jy het gekies om toe te laat dat hierdie program legstukke skep en by hulle data ingaan."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Verstek instellings nie opgestel nie."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Vee verstekke uit"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Hierdie program is dalk nie vir jou skerm ontwerp nie; jy kan hier beheer hoe dit by jou skerm aanpas."</string>
@@ -982,6 +1013,10 @@
     <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>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Stel programvoorkeure terug"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Stel programvoorkeure terug?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dit sal alle voorkeure terugstel vir:"\n\n<li>"Gedeaktiveerde programme"</li>\n" "<li>"Gedeaktiveerde programkennisgewings"</li>\n" "<li>"Verstek programme vir aksies"</li>\n" "<li>"Agtergronddata-beperkings vir programme"</li>\n" "\n" Jy sal nie enige programdata verloor nie."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Stel programme terug"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Bestuur spasie"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Kies filteropsies"</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Hierdie program het toegang tot die volgende op jou tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"Kon nie pakketgrootte bereken nie."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Jy het geen geïnstalleerde derdeparty-programme 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>
@@ -1032,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Verander die voorkeur-installeerligging vir nuwe programme."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktiveer ingeboude program?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"As jy \'n ingeboude program deaktiveer, kan ander hulle programme wangedra."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Wil jy kennisgewings afskakel?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"As jy kennisgewings vir hierdie program afskakel, kan jy moontlik belangrike waarskuwings en opdaterings mis."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Geheuegebruik"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Sien berging wat deur programme gebruik word"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Lopende dienste"</string>
@@ -1084,19 +1121,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Die invoermetode kan dalk alle teks wat jy invoer, versamel, insluitend 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>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Hierdie speltoetser is dalk in staat om al die teks wat jy invoer te versamel, insluitend persoonlike inligting soos wagwoorde en kredietkaartnommers. Dit kom van die <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>-program. Gebruik hierdie speltoetser?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Instellings"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Taal"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Kon nie instellings vir <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> oopmaak nie"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Muis/spoorbord"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Wyserspoed"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Speletjiekontroleerder"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Gebruik vibreerder"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Herlei vibreerder na speletjiekontroleerder wanneer dit gekoppel is."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Kies sleutelborduitleg"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Stel sleutelborduitlegte op"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Om te wissel, druk Control-spasiebalk"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Verstek"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Sleutelborduitlegte"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerwoordeboek"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Persoonlike woordeboek"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persoonlike woordeboeke"</string>
     <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_add_screen_title" msgid="742580720124344291">"Frase"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Meer opsies"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Minder opsies"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Woord:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Kortpad:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Taal:"</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>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"Jy het geen woorde in die gebruikerwoordeboek nie. Jy kan \'n woord byvoeg deur die byvoeg-knoppie ( + ) te raak."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Alle tale"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Vir alle tale"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Meer tale..."</string>
     <string name="testing" msgid="6584352735303604146">"Toets"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tabletinligting"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Fooninligting"</string>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Stel opsies vir programontwikkeling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-ontfouting"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"In ontfoutmodus wanneer USB gekoppel is"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Ontwikkelingstoestel se ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Toesteldata nie beskikbaar nie"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Bly wakker"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skerm sal nooit slaap terwyl laai nie"</string>
     <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="7316799925425402244">"USB-ontfouting is net vir ontwikkelingsdoeleindes bedoel. Gebruik dit om data te kopieer tussen jou rekenaar en jou toestel, programme op jou toestel te installeer sonder kennisgewing en om loglêerdata te lees."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Laat ontwikkeling-instellings toe?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Hierdie instellings is bedoel net vir ontwikkelinggebruik. Dit kan jou toestel en die programme daarop breek of vreemde dinge laat doen."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Beskerm USB-berging"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Programme moet toestemming versoek om USB-berging te lees"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Beskerm USB-berging?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wanneer USB-geheue beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees."\n\n" Sommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word.berging"</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Beskerm SD-kaart"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Programme moet toestemming versoek om SD-kaart te lees"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Beskerm SD-kaart?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer die SD-kaart beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees."\n\n"Sommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Kies apparaat"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Kies legstuk"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Skep legstuk en laat toegang toe?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Nadat jy die legstuk geskep het, kan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> toegang verkry tot alle data wat dit vertoon."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Laat <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> altyd toe om legstukke te skep en om by hul data in te gaan."</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>
@@ -1160,12 +1227,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Groot teks"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Krag-knoppie beëindig oproep"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Sê wagwoorde hardop"</string>
-    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Ontdek-met-raak"</string>
-    <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>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Raak-en-hou-vertraging"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Installeer webskripte"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Verbeter webtoeganklikheid"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Instellings"</string>
-    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Tutoriaal"</string>
     <string name="accessibility_service_state_on" msgid="8791337599927106344">"Aan"</string>
     <string name="accessibility_service_state_off" msgid="2458594460762620776">"Af"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Toegelaat"</string>
@@ -1180,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Geen dienste geïnstalleer nie"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Soek jy \'n skermleser?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack bied gesproke terugvoer om blindes en gebruikers met swak sig te help. Wil jy dit gratis vanaf Android Market installeer?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Installeer webskripte?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Wil jy dat programme skripte van Google installeer wat hul webinhoud meer toeganklik sal maak?"</string>
-    <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="1072730037861494125">"Geen beskrywing verskaf nie."</string>
     <string name="settings_button" msgid="3006713718908152930">"Instellings"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Wat het die battery gebruik"</string>
-    <string name="power_usage_not_available" msgid="3583407442633768046">"Data oor batterygebruik nie beskikbaar nie"</string>
+    <string name="power_usage_not_available" msgid="3214000535532434353">"Batterygebruikdata is nie beskikbaar nie."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batterygebruik sedert uitgeprop"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Batterygebruik sedert terugstelling"</string>
@@ -1285,7 +1347,7 @@
     <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" msgid="3305141107104670703">"Die enjin wat jy gekies het, werk nie."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Stel op"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"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>
@@ -1301,7 +1363,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"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>
@@ -1318,6 +1380,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Verwyder alle sertifikate"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertroude eiebewyse"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wys vertroude CA-sertifikate"</string>
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken jou ontsluitpatroon"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Jy moet jou ontsluitpatroon teken om eiebewysinstallasie te bevestig."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Voer die wagwoord in vir eiebewysberging."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidige wagwoord:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Eiebewysberging is uitgevee."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Eiebewysberging kon nie uitgevee word nie."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Eiebewysberging is geaktiveer."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Jy moet \'n sluitskerm se PIN of wagwoord stel voordat jy eiebewysberging kan gebruik."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Jy moet \'n sluitskerm-PIN of -wagwoord stel voordat jy eiebewysberging kan gebruik."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Noodtoon"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Stel gedrag wanneer \'n noodoproep gemaak word"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Rugsteun en terugstelling"</string>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Outomatiese teruglaai"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wanneer \'n program weer geïnstalleer word, herstel gerugsteunde instellings en data"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Werkskerm-rugsteunwagwoord"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Volle rekenaarrugsteune word nie tans beskerm nie"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Raak om die wagwoord vir volledige rekenaarrugsteune te verander of te verwyder"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Hou op om jou Wi-Fi-wagwoorde, boekmerke, ander instellings, en programdata te rugsteun en vee al die kopieë op Google-bedieners uit?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Toesteladministrasie-instellings"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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 en kennisgewings"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Kennisgewings"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Stelsel"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Oproep se luitoon en vibreer"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"Stelsel"</string>
     <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi-opstelling"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Koppel aan Wi-Fi  netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Koppel tans aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1457,10 @@
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasie geaktiveer"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasie gedeaktiveer"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinkroniseerfout."</string>
-    <string name="account_sync_settings_title" msgid="4578227872921044660">"Sinkroniseer-instellings"</string>
+    <string name="sync_failed" msgid="1696499856374109647">"Sinkronisasie het misluk"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sinkronisasie aktief"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <string name="sync_is_failing" msgid="1591561768344128377">"Sinkronisering ondervind tans probleme. Dit sal binnekort terug wees."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Voeg rekening by"</string>
     <string name="background_data" msgid="5779592891375473817">"Agtergronddata"</string>
@@ -1404,6 +1471,10 @@
     <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>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <string name="settings_backup" msgid="2274732978260797031">"Rugsteun instellings"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Rugsteun my instellings"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sinkroniseer nou"</string>
@@ -1413,7 +1484,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakte"</string>
-    <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welkom by Google Sync!"</font>" "\n"\'n Google-benadering om data te sinchroniseer vir toegang tot al jou kontakte, afsprake en meer, ongeag waar jy is."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"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>
@@ -1427,7 +1498,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Hierdie rekening word deur sommige programme vereis. Jy kan dit slegs verwyder deur die tablet se verstekinstellings terug te stel (wat al jou persoonlike data sal uitvee) in Instellings &gt; Rugsteun &amp; terugstel."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Hierdie rekening word deur sommige programme vereis. Jy kan dit slegs verwyder deur die foon se verstekinstellings terug te stel (wat al jou persoonlike data sal uitvee) in Instellings &gt; Rugsteun &amp; terugstel."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Kan nie handmatig sinkroniseer nie"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinkronisering vir hierdie item is tans gedeaktiveer. Om hierdie instelling te verander, skakel agtergronddata en outomatiese sinkronisering tydelik aan."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G-instellings"</string>
@@ -1435,7 +1507,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-Mac-adres"</string>
     <string name="enter_password" msgid="4131758584074246224">"Voer wagwoord in om berging te dekripteer"</string>
     <string name="try_again" msgid="4272075051293936921">"Probeer weer."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Die diens is besig. Probeer weer."</string>
     <string name="delete" msgid="4219243412325163003">"Vee uit"</string>
     <string name="misc_files" msgid="6720680815969643497">"Diverse lêers"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"het <xliff:g id="NUMBER">%1$d</xliff:g> gekies uit <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1443,21 +1514,46 @@
     <string name="select_all" msgid="1562774643280376715">"Kies almal"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontrolering"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Stel HDCP-kontrolering se gedrag"</string>
-    <string name="debug_ui_category" msgid="9023948280291055349">"Gebruikerskoppelvlak"</string>
+    <string name="debug_debugging_category" msgid="6781250159513471316">"Ontfouting"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Kies ontfoutprogram"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Geen ontfoutprogram gestel nie"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Ontfoutingsprogram: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Kies program"</string>
+    <string name="no_application" msgid="2813387563129153880">"Niks"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Wag vir ontfouter"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Ontfoutde program wag vir ontfouter om te heg voordat dit uitgevoer word"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Invoer"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Skets"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitering"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Strengmodus geaktiveer"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Flits skerm as programme lang handelinge doen op die hoofdraad"</string>
     <string name="pointer_location" msgid="6084434787496938001">"Wyserligging"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Skermlaag wys huidige raakdata"</string>
     <string name="show_touches" msgid="1356420386500834339">"Wys aanrakings"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Toon visuele terugvoer vir aanrakings"</string>
-    <string name="show_screen_updates" msgid="8282711794220426931">"Wys skermopdaterings"</string>
-    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Flits areas van die skerm wanneer hulle opdateer"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Wys oppervlakopdaterings"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flits vensteroppervlaktes in geheel wanneer dit opdateer"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Wys GPU-aansigopdaterings"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flits aansigte binne die vensters wanneer dit met die GPU geskets is"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Deaktiveer HW-oorleggers"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Gebruik altyd GPU vir skermsamestelling"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Aktiveer spore"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Kies geaktiveerde spore"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Geen spore is tans geaktiveer nie"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> spore tans geaktiveer"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alle spore is tans geaktiveer"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Wys uitleg se grense"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Wys CPU-verbruik"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skermlaag wys huidige CPU-gebruik"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forseer GPU-lewering"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Gebruik 2D-hardewareversnelling in programme"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Dwing gebruik van GPU vir 2D-tekening"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profiel se GPU-lewering"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Meet leweringstyd in die adb-dop dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Vensteranimasieskaal"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Oorganganimasieskaal"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator-tydsduurskaal"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Programme"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Moenie aktiwiteite behou nie"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Vernietig elke aktiwiteit sodra die gebruiker dit verlaat"</string>
@@ -1471,13 +1567,15 @@
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Aparte 4G-gebruik"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wys Wi-Fi-gebruik"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Wys Ethernet-gebruik"</string>
+    <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobiele warmkolle"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Verander siklus..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dag van maand om dataverbruiksiklus terug te stel:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"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>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Gemeet deur jou tablet. Jou diensverskaffer se berekening van datagebruik mag verskil."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Gemeet deur jou foon. Jou diensverskaffer se berekening van datagebruik mag verskil."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"beperk"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Deaktiveer mobieldata?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Stel mobieldatalimiet"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Stel 4G-datalimiet"</string>
@@ -1488,33 +1586,50 @@
     <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">"sel"</string>
-    <string name="data_usage_list_none" msgid="2899530183512542206">"geen"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobiel"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Geen"</string>
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobiele 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="8430240158135453271">"Bekyk programinstellings"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Beperk agtergronddata"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Deaktiveer agtergronddata slegs op mobieldatanetwerk. Wi-Fi sal gebruik word, indien beskikbaar."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Deaktiveer agtergronddata op mobiele netwerke. Niesellulêre netwerke sal gebruik word, indien beskikbaar."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Om agtergronddata vir hierdie program te beperk, moet jy eers \'n mobieldatalimiet stel."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Beperk agtergronddata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Hierdie funksie kan veroorsaak dat \'n program wat afhanklik is van agtergrondinligting ophou werk as Wi-Fi nie beskikbaar is nie."\n\n"Jy kan meer beheer uitoefen oor datagebruik binne-in die spesifieke program se instellings."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Hierdie funksie kan veroorsaak dat \'n program wat afhanklik is van agtergronddata, ophou werk wanneer slegs mobiele netwerke beskikbaar is."\n\n"Jy kan meer geskikte datagebruik-kontroles vind in die instellings wat in die program self beskikbaar is."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Beperking van agtergronddata is moontlik slegs as jy \'n mobieldatalimiet gestel het."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Gebruiksiklus-terugsteldatum"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum van elke maand:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Stel"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Stel dataverbruik-waarskuwing"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Stel dataverbruik-limiet"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Beperk datagebruik"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Jou <xliff:g id="NETWORKS">%1$s</xliff:g>-dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word."\n\n"Aangesien die datagebruik deur jou tablet gemeet word en jou diensverskaffer dit ander mag bereken, oorweeg dit om \'n  konserwatiewe limiet te gebruik."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Jou <xliff:g id="NETWORKS">%1$s</xliff:g>-dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word."\n\n"Aangesien datagebruik deur jou foon gemeet word en jou diensverskaffer gebruik anders mag bereken, oorweeg dit om \'n konserwatiewe limiet te gebruik."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Jou mobiele dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word."\n\n"Aangesien die datagebruik deur jou tablet gemeet word en jou diensverskaffer dit dalk anders bereken, oorweeg dit maar om \'n konserwatiewe limiet te gebruik."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Jou mobiele dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word."\n\n"Aangesien datagebruik deur jou foon gemeet word en jou diensverskaffer gebruik dalk anders bereken, oorweeg dit maar om \'n konserwatiewe limiet te gebruik."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Beperk agtergronddata?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"As jy agtergrondmobieldata beperk, sal sommige programme en dienste nie werk nie, tensy jy gekoppel is aan \'n Wi-Fi-netwerk."</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">"waarsku"</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">"Verwyderde programme"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ontvang, <xliff:g id="SENT">%2$s</xliff:g> gestuur"</string>
-    <string name="data_usage_total_during_range" msgid="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g> : ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruik"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruik."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> is gebruik, soos gemeet deur jou tablet. Jou diensverskaffer kan datagebruik dalk anders bereken."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> is gebruik, soos gemeet deur jou foon. Jou diensverskaffer kan datagebruik dalk anders bereken."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobiele warmkolle"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Kies die Wi-Fi-netwerke wat mobiele warmkolle is. Programme kan beperk word om hierdie netwerke te gebruik wanneer hulle in die agtergrond is. Programme kan ook waarsku voor hierdie netwerke gebruik word vir groot aflaaisels."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Selnetwerke"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-netwerke"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Om mobiele warmkolle te kies, skakel Wi-Fi aan."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Keer terug na oproep"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Naam"</string>
@@ -1540,12 +1655,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Kanselleer"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Stoor"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Koppel"</string>
-    <string name="vpn_edit" msgid="1111459297288136079">"Redigeer VPN-netwerk"</string>
-    <string name="vpn_connect_to" msgid="7328758950427515753">"Koppel aan <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Redigeer VPN-profiel"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Koppel aan <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <string name="vpn_create" msgid="8966010925994175306">"Voeg VPN-netwerk by"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Redigeer netwerk"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Vee netwerk uit"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Voeg VPN-profiel by"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Redigeer profiel"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Vee profiel uit"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Daar is geen netwerkverbinding nie. Probeer asseblief later weer."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"\'n Sertifikaat ontbreek. Wysig asseblief die profiel."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Stelsel"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Gebruiker"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktiveer"</string>
@@ -1554,25 +1671,7 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Aktiveer die stelsel se CA-sertifikaat?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Deaktiveer die stelsel se CA-sertifikaat?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Verwyder die gebruiker se CA-sertifikaat permanent?"</string>
-    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Toeganklikheidstutoriaal"</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">"Maak klaar"</string>
-    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Slaan tutoriaal oor"</string>
-    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Les 1: Ontdek die skerm"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"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>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Mooi so. Hou aan om met jou vinger oor die skerm te gly totdat jy ten minste nog een ikoon kry."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Om iets te aktiveer waaraan jy raak, tik daarop. Gly jou vinger totdat jy die ikoon vir die <xliff:g id="APP_NAME">%s</xliff:g> kry. Tik dan die ikoon een keer om dit te aktiveer."</string>
-    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Jou vinger raak nou aan die <xliff:g id="APP_NAME">%s</xliff:g>-ikoon. Tik een keer om die ikoon te aktiveer."</string>
-    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Jou vinger het oor die <xliff:g id="APP_NAME">%s</xliff:g> ikoon beweeg en toe wegbeweeg. Gly jou vinger stadig oor die skerm totdat jy weer die Blaaier-ikoon kry."</string>
-    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Mooi so. Om na die volgende les te beweeg, vind en aktiveer die <xliff:g id="NEXT">%s</xliff:g>-knoppie, wat naby die onderste hoek regs op die skerm geleë is."</string>
-    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Les 2: Rollees met twee vingers"</string>
-    <string name="accessibility_tutorial_lesson_2_text_1" msgid="8764686624055084454">"Om deur \'n lys te rollees, gly twee vingers met die skerm langs. Byvoorbeeld, die huidige skerm bevat \'n lys programname wat op of af gerollees kan word. Identifiseer eers \'n paar items in die lys deur met een vinger rond te gly."</string>
-    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Mooi so. Hou aan om met jou vinger rond te gly om minstens nog een item te kry."</string>
-    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Plaas nou twee vingers op \'n item in die lys en gly met albei vingers op. As jy die bokant van die skerm bereik, lig jou vingers, plaas hulle laer af op die lys en gly weer op."</string>
-    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Mooi so. Gly jou vingers opwaarts om verder te rollees."</string>
-    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3055831259260848004">"Jy het die tutoriaal voltooi. Om uit te gaan, vind en tik op die <xliff:g id="FINISH">%s</xliff:g>-knoppie."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Spelkorrigering"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Speltoetser"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Voer jou huidige wagwoord vir volle rugsteun hier in"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Voer \'n nuwe wagwoord vir volledige rugsteune hier in"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Voer weer jou nuwe wagwoord vir volle rugsteun hier in"</string>
@@ -1580,4 +1679,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Kanselleer"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Bykomende stelselopdaterings"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Gebruikers en beperkings"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Gebruikers"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Voeg gebruiker by"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Redigeer besonderhede"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Gebruikerinligting"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Naam"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Inhoudbeperkings"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Vereis PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Inhoudgradering"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Stelselprogramme"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Geïnstalleerde programme"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Gooi weg"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Verwyder gebruiker"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Lastige kind"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Verwyder gebruiker?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Is jy seker jy wil die gebruiker en alle verwante data van die toestel verwyder?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Wys kennisgewings"</string>
+    <string name="help_label" msgid="1107174367904110532">"Hulp"</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index b78eff2..00b0101 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"በማለያየት ላይ...."</item>
     <item msgid="1634960474403853625">"ተለያየ"</item>
     <item msgid="746097431216080650">"አልተሳካም"</item>
+    <item msgid="6367044185730295334">"ታግዷል"</item>
+    <item msgid="503942654197908005">"ለጊዜያዊነት ከደካማ ግኑኝነት በመታቀብ ላይ"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"ከ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> በማለያየት ላይ...."</item>
     <item msgid="197508606402264311">"ተለያየ"</item>
     <item msgid="8578370891960825148">"አልተሳካም"</item>
+    <item msgid="5660739516542454527">"ታግዷል"</item>
+    <item msgid="1805837518286731242">"ለጊዜያዊነት ከደካማ ግኑኝነት በመታቀብ ላይ"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"አዝራር ተጫን"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"የለም"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"ከመዳረሻ ነጥብ ላይ አያይዝ"</item>
-    <item msgid="7364462169350112617">"ከዚህ መሣሪያ ፒን"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"አይለወጤ"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"ተወጋጅ SD ካርድ"</item>
     <item msgid="4498124044785815005">"ስርዓቱ ይወስን"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"ጠፍቷል"</item>
-    <item msgid="4804571292609523335">"ንዘር"</item>
-    <item msgid="595707141547423573">"ድምፀ-ከል አድርግ"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"አጭር"</item>
     <item msgid="2560532955514699713">"መካከለኛ"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"የእነማ ልኬት ለውጥ5x"</item>
     <item msgid="6660750935954853365">"የእነማ ልኬት ለውጥ10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"እነማ ጠፍቷል"</item>
+    <item msgid="1138649021950863198">"የእነማ ልኬት ለውጥ .5x"</item>
+    <item msgid="4394388961370833040">"የእነማ ልኬት ለውጥ 1x"</item>
+    <item msgid="8125427921655194973">"የእነማ ልኬት ለውጥ 1.5x"</item>
+    <item msgid="3334024790739189573">"የእነማ ልኬት ለውጥ 2x"</item>
+    <item msgid="3170120558236848008">"የእነማ ልኬት ለውጥ 5x"</item>
+    <item msgid="1069584980746680398">"የእነማ ልኬት ለውጥ 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"መደበኛ ወሰኖች"</item>
     <item msgid="4071574792028999443">"ምንም የዳራ ሂደቶች የሉም"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 091a9db..0064913 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"አዎ"</string>
     <string name="no" msgid="6731231425810196216">"አይ"</string>
+    <string name="create" msgid="3578857613172647409">"ፍጠር"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ያልታወቀ"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"ገመድ አልባ&amp; አውታረ መረቦች"</string>
     <string name="header_category_device" msgid="5781174212691167553">"መሣሪያ"</string>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ማያው ሲቆለፍ የብሉቱዝ ደዋዩ እንዳይጠቀምበት ተከላከል።"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"የብሉቱዝመሣሪያዎች"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"የመሣሪያ ስም"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"የመሳሪያ ቅንብሮች"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"የመገለጫ ቅንብሮች"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"የመለያ ስም በመጠቀም፣ ምንም ስም አልተዘጋጀም"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"መሣሪያዎችን ቃኝ"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"ጡባዊ እንደገና ሰይም"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"በማገናኘት ላይ..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"ስም አልባ የብሉቱዝ መሣሪያ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"በመፈለግ ላይ"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"ለማጣመር ንካ"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"በአቅራቢያው ምንም የብሉቱዝ መሳሪያዎች አልተገኙም::"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"የብሉቱዝ ማገናኛ ጥየቃ"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"ማጣመሪያ ጥየቃ"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"ከ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ለማጣመር ንካ"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"ከ <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="device_picker" msgid="8398232791303186677">"የብሉቱዝ መሣሪያ መራጭ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"የብሉቱዝ ፈቃድ ጥየቃ"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"መተግበሪያ ብሉቱዝን ማብራት ይፈልጋል:: ፍቀድ?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"በጡባዊህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ጡባዊህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል:: ፍቀድ?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"ወደ \"<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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"እሺ"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"የተየብከው የአስተናጋጅ ስም ትክክል አይደለም።"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"የተየብካቸው ከቁጥር የማይገቡ ዝርዝሮች በትክክል አልተቀረፁም። እባክህ በነጠላ ሰረዝ የተለዩትን ከቁጥር የማይገቡ ጎራ ዝርዝሮችን አስገባ።"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"የወደብ መስኩን ማጠናቀቅ አለብዎ።"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"የወደብ መስኩን ማጠናቀቅ ያስፈልግሃል።"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"የአስተናጋጁ መስክ ባዶ ከሆነ የወደብ መስኩ ባዶ መሆን አለበት።"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"የተየብከው ወደብ ትክክል አይደለም።"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"አሳሹ የHTTP ተተኪ ተጠቅሟል ሆኖም በሌሎች መተግበሪያዎች ላይጠቀም ይችላል።"</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"የUSB  ገመድ ድጋሚ ሲያያዝ ተፅዕኖው ይለወጣል"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"የ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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"የUSB ማከማቻ አልተሰካም።"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"ምንም 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="6691584887397909775">"አሁን የUSB ማከማቻውን ለማስወገድ ደህና ነው"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"አሁን የSD ማከማቻውን ለማስወገድ ሰላም ነው"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB ማከማቻ እንደብዙ ማከማቻ መሣሪያ በማገልገል ላይ ነው።"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD ካርድ እንደብዙ ማከማቻ መሣሪያ በማገልገል ላይ ነው።"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"አሁን የUSB ማከማቻውን ለማስወገድ አስተማመኝ ነው።"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"አሁን የ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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"የUSB ማከማቻ አንብብ -ብቻ ሰክቷል።"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"የSD ካርድ አንባቢ- ብቻ ተሰክቷል።"</string>
     <string name="skip_label" msgid="47510779345218297">"ዝለል"</string>
     <string name="next_label" msgid="4693520878012668114">"ቀጥል"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"ቋንቋ"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"የውሂብ ዝውውር በምትፈቅድበት ጊዜ፤ ላቅ ያለ የዝውውር ክፍያዎች ልትከፍልትችላለህ!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"የውሂብ ዝውውር ፍቀድ?"</string>
     <string name="networks" msgid="6333316876545927039">"የከዋኝ ምርጫ"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"የአውታረ መረብ ከዋኝ ምረጥ"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"ቀን&amp; ሰዓት"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"የቀን ቅርፀት ምረጥ"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"የፊት ማመሳሰልን አሻሽል"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"የህያውነት ማረጋገጫ"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"የአይን ጥቅሻ ያስፈልጋል"</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>
@@ -297,8 +301,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"በተቆለፈ ማያ ላይ ለማሳየት ፅሁፍ አስገባ"</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_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="crypt_keeper_settings_title" msgid="4219233835490520414">"ማመስጠር"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ጡባዊ አመስጥር"</string>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"መለያዎችህን፣ ቅንብሮችህን፣ የወረዱ መተግበሪያዎችህን እና የውሂብ፣ ማህደረ መረጃ እና ሌሎች ፋይሎችን ማመስጠር ትችላለህ። ጡባዊህን አንድ ጊዜ ካመሰጠርክ፣ ጡባዊህን  ፒን ወይም ይለፍ ቃልማስገባት አለብህ። ከፋብሪካ የውሂብ ድጋሚ አስጀምር፣ ውሂብህን በሙሉ ከመሰረዝ በስተቀር ስልክህን አለማመስጠር አትችልም። "\n\n"እስኪጠናቀቅ ጡባዊህ መሰካት አለበት። የማመስጠሩን ሂደት ካቋረጥከው አንዱን ወይም ሁሉንም ውሂብህን ታጣለህ።"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"መለያዎችዎን፣ ቅንብሮችህን፣ የወረዱ መተግበሪያዎችህን እና የውሂብ፣ ማህደረ መረጃ እና ሌሎች ፋይሎች ማመስጠር ትችላለህ። ስልክህን አንድ ጊዜ ካመሰጠርክ፣ ስልኩን ባበራህ ቁጥር የቁጥር ፒን ወይም ይለፍ ቃልማስገባት አለብህ። ከፋብሪካ የውሂብ ድጋሚ አስጀምር፣ ውሂብህን በሙሉ ከመሰረዝ በስተቀር ስልክህን አለማመስጠር አይችሉም። "\n\n" ማመስጠር1 ሰዓት ወይም ከዛ በላይ ይወስዳል። ኃይሉ በተሞላ ባትሪ መጀመር እና ማመስጠሩ እስኪጠናቀቅ ስልክህ መሰካት አለበት። የማመስጠሩን ሂደት ካቋረጥከው አንዱን ወይም ሁሉንም ውሂብህን ታጣለህ።"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ሚዲያ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ። ጡባዊ ተኮህን ምስጠራ አፈታት  አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል፡- የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ጡባዊ ተኮህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት።"\n\n" ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ጡባዊ ተኮህ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ።"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ሚዲያ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ።  ስልክህን ምስጠራ አፈታት አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል። የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ስልክህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት።"\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="2029407131227814893">"እባክህ ባትሪህን ኃይል ሙላ እና እንደገና ሞክር።"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"እባክህ የኃይል መሙያዎን ሰካ እና እንደገና ሞክር።"</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_dialog_need_password_message" msgid="4071395977297369642">"ምስጠራ ከመጀመርህ በፊት የማያ ቆልፍ PIN ወይም ይለፍቃል ማዘጋጀት አለብህ።"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ይመስጠር?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጥከው፤ ውሂብ ታጣለህ።ምስጠራ ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ጡባዊ ተኮው ብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጥከው፤ ውሂብ ታጣለህ።ምስጠራ ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"ማመስጠር"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"እባክህ ጡባዊህ እስኪመሳጠር ድረስ ጠብቅ።<xliff:g id="PERCENT">^1</xliff:g> ተጠናቋል።"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"እባክህ  ስልክህ እስኪመሳጠር ድረስ ጠብቅ። <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="2223340178473871064">"የይለፍቃልህን ተይብ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ምስጠራ ስኬታማ አልነበረም"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በጡባዊዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ጡባዊዎን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብዎ። ጡባዊዎን ዳግም ካስጀመሩ በኋላ ሲያዘጋጁ፣ ወደ Google መለያዎ አስጠብቀው የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ያገኛሉ።"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በስልክዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ስልክዎን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብዎ። ስልክዎን ዳግም ካስጀመሩ በኋላ ሲያዘጋጁ፣ ወደ Google መለያዎ አስጠብቀው የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ያገኛሉ።"</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"የማያ ቆልፍ ምረጥ"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በጡባዊዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ጡባዊህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ጡባዊህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በስልክህ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ስልክህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ስልክህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"የግቤት ስልት ቀይር"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"ማሳያ ቆልፍ ምረጥ"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"ምትኬ ቆላፊ ምረጥ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ማሳያ ተቆልፏል"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ማሳያ ቆልፍን ለውጥ"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"ፊት ክፈት"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"ሥርዓተ ጥለት"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"ፒን"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"የይለፍ ቃል"</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>
@@ -362,44 +367,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"የይለፍ ቃል ከ<xliff:g id="NUMBER">%d</xliff:g> ቁምፊዎች ያነሰ መሆን አለበት።"</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN ከ<xliff:g id="NUMBER">%d</xliff:g> አሀዞች ያነሰ መሆን አለበት።"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN ከ0-9 አሀዞች ብቻ መያዝ አለበት።"</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"የቅርብ ጊዜ ፒን መጠቀም የመሳሪያ አስተዳዳሪ አይፈቅድም።"</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"የይለፍ ቃል ህገ ወጥ ቁምፊ ይዟል።"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"የይለፍ ቃል ቢያንስ አንድ ፊደል መያዝ አለበት።"</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"የይለፍ ቃል ቢያንስ አንድ አሀዝ መያዝ አለበት።"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"የይለፍ ቃል ቢያንስ አንድ ምልክት መያዝ አለበት።"</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"የይለፍ ቃል ቢያንስ 1 ፊደል መያዝ አለበት"</item>
-    <item quantity="other" msgid="7278096339907683541">"የይለፍ ቃል ቢያንስ %d ፊደሎች መያዝ አለበት"</item>
+    <item quantity="one" msgid="3063853802158131458">"የይለፍ ቃል ቢያንስ 1 ፊደል መያዝ አለበት።"</item>
+    <item quantity="other" msgid="8186027808415585970">"የይለፍ ቃል ቢያንስ %d ፊደሎች መያዝ አለበት።"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"የይለፍ ቃል ቢያንስ 1 ትንሽ ፊደል መያዝ አለበት"</item>
-    <item quantity="other" msgid="588499075580432178">"የይለፍ ቃል ቢያንስ %d  ትንሽ ፊደሎች መያዝ አለበት"</item>
+    <item quantity="one" msgid="5583986519662091001">"የይለፍ ቃል ቢያንስ 1 ንዑስ ፊደል መያዝ አለበት።"</item>
+    <item quantity="other" msgid="2693910942679679225">"የይለፍ ቃል ቢያንስ %d ንዑስ ፊደሎች መያዝ አለበት።"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"የይለፍ ቃል ቢያንስ 1 ከፍ ያለ ፊደል መያዝ አለበት"</item>
-    <item quantity="other" msgid="2183090598541826806">"የይለፍ ቃል ቢያንስ %d ከፍ ያሉ ፊደሎች መያዝ አለበት"</item>
+    <item quantity="one" msgid="2611909966725502768">"የይለፍ ቃል ቢያንስ 1 አቢይ ፊደል መያዝ አለበት።"</item>
+    <item quantity="other" msgid="3030801209112209245">"የይለፍ ቃል ቢያንስ %d ከፍ ያሉ ፊደሎች መያዝ አለበት።"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"የይለፍ ቃል ቢያንስ 1 ቁጥር አሀዝ መያዝ አለበት"</item>
-    <item quantity="other" msgid="995673409754935278">"የይለፍ ቃል ቢያንስ %d ቁጥሮች አሀዞች መያዝ አለበት"</item>
+    <item quantity="one" msgid="3820355568839621231">"የይለፍ ቃል ቢያንስ 1 ቁጥር አሀዝ መያዝ አለበት።"</item>
+    <item quantity="other" msgid="4703982391407595924">"የይለፍ ቃል ቢያንስ %d ቁጥር አሀዞች መያዝ አለበት።"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"የይለፍ ቃል ቢያንስ 1 ልዩ ወኪል መያዝ አለበት"</item>
-    <item quantity="other" msgid="3047460862484105274">"የይለፍ ቃል ቢያንስ %d ልዩ ወኪሎች መያዝ አለበት"</item>
+    <item quantity="one" msgid="8456579939292408631">"የይለፍ ቃል ቢያንስ 1 ልዩ ምልክት መያዝ አለበት።"</item>
+    <item quantity="other" msgid="1221290525051187757">"የይለፍ ቃል ቢያንስ %d ልዩ ምልክቶችን መያዝ አለበት።"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"የይለፍ ቃል ቢያንስ 1 ፊደል ያልሆነ ቁምፊ መያዝ አለበት"</item>
-    <item quantity="other" msgid="5574191164708145973">"የይለፍ ቃል ቢያንስ %d ፊደል ያልሆኑ ቁምፊዎች መያዝ አለበት"</item>
+    <item quantity="one" msgid="4594051152085925921">"የይለፍ ቃል ቢያንስ 1 ፊደል ያልሆነ ቁምፊ መያዝ አለበት።"</item>
+    <item quantity="other" msgid="3952508584649046404">"የይለፍ ቃል ቢያንስ %d ፊደል ያልሆኑ ቁምፊዎች መያዝ አለበት።"</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"መሣሪያ አስተዳዳሪ የቅርብ ይለፍቃል መጠቀም አይፈቅዱም"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"የቅርብ ጊዜ የይለፍ ቃል መጠቀም የመሳሪያ አስተዳዳሪ አይፈቅድም።"</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="lock_setup" msgid="1759001157415978959">"ማቀናበር ተጠናቋል"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"ማዋቀር ተጠናቋል።"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"ከ:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ጋር ለማጣመር የመሣሪያውን የሚፈለገውን የይለፍ ቁልፍ ተይብ:"</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_enter_pin_other_device" msgid="4637977124526813470">"ይህን PIN በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"ይህን የይለፍ ቁልፍ በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</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="2796550001376088433">"ከ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ጋር ለማጣመር ላዩ ላይ ተይብበት:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ከዚያም ተመለስ ወይም አስገባ ተጫን::"</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ከ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ትክክለኛ ባልሆነ ፒን ወይም የይለፍቁልፍ ምክንያት ማጣመር አልተቻለም::"</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ከ<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_connecting_error_message" msgid="229861986106185022">"ወደ <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"ስልኩ ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ፍቀድ"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ጡባዊ ቱኮው ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ፍቀድ"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ስልኩ ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ፍቀድ"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"በNFC በኩልየመተግበሪያ ይዘት ለማስተላለፍ ዝግጁ ነው"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ጠፍቷል"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC ስለጠፋ ማግኘት አይቻልም"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"ይህ ባህሪ ሲበራ፣ የመተግበሪያ ይዘት ወደ ሌላ NFC-የሚችል መሳሪያ መሳሪያዎቹን አንድ ላይ አቀራርቦ በመያዝ ማብራት ትችላለህ፡፡ ለምሳሌ፣ የአሳሽ ገጾችን፣ YouTube ቪዲዮዎችን፣ የሰዎች ዕውቂያዎችን፣ እና በተጨማሪ"\n\n" ማብራት ትችላለህ፡፡ መሳሪያዎቹን ብቻ አንድ ላይ አቀራርበህ አምጣቸው (በተለምዶ ጀርባ ለጀርባ) እናም በመቀጠል ማያህን ንካ፡፡ መተግበሪያው ምን መብራት እንዳለበት ራሱ ይወስናል፡፡"</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"የአውታረ መረብ ማግኘት"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"ሌሎች መሣሪያዎች ላይ ያሉ መተግበሪያዎች በዚህ መሣሪያ ላይ ያሉ መተግበሪያዎች እንዲያገኙ ይፈቅድላቸዋል"</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="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_setup_wizard_title" msgid="70277346338812325">"ገመድ አልባ ምረጥ"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ለአውታረመረቦች መቃኘት አይቻልም"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"የአውታረ መረብ ማሳወቂያ"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"ክፍት አውታረመረብ ሲገኝ አሳውቀኝ"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"ደካማ ግንኙነቶች አስወግድ"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"ጥሩ የበየነመረብ ግንኙነት ከሌለው በቀር Wi-Fi አውታረመረብን አትጠቀም"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ደካማ ግንኙነቶችን አስወግድ"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"ጥሩ የበይነመረብ ግንኙነት ካለው በስተቀር የገመድ አልባ አውታረ መረብን አትጠቀም"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"በምትተኛበት ወቅት WiFi እንደበራ ይሁን"</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_wps_pbc" msgid="2668564692207863017">"WPS ግፊት አዘራር"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS ፒን ማስገቢያ"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"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_empty_list_wifi_on" msgid="3354911729026237372">"የWi-Fi አውታረ መረቦችን በመፈለግ ላይ…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"ሌላ አውታረ መረብ…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"ተጨማሪ"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"በራስ ሰር ማወቀር (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"የላቁ አማራጮችን አሳይ"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"ፒን ከመድረሻ ነጥብ ተይብ"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS አዘጋጅ"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"<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_wps_setup_title" msgid="6034518116333042484">"በWi-Fi የተጠበቀ መዋቅር"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS በመጀመር ላይ…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"በራውተርህ ላይ በWi-Fi የሚጠበቀው የማወቀሪያ አዝራርን ተጫን። «WPS» ሊባል ይችላል ወይም ይሄንን ምልክት ያካትታል፦"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"በገመድ አልባ ማዞሪያህ ላይ ፒን <xliff:g id="NUMBER">%1$s</xliff:g>ን አስገባ። ዝግጅቱ እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል።"</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS ተሳክቷል። ከአውታረ መረቡ ጋር በመገናኘት ላይ…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"ከ<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi አውታረ መረብ ጋር ተገናኝቷል"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS አስቀድሞ በሂድት ላይ ነውና እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS አልተሳካም። እባክህ ከጥቂት ደቂቃዎች በኋላ እንደገና ሞክር።"</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"የገመድ አልባው የማዞሪያ ድህንነት ቅንጅት (WEP) አይደገፍም"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"የገመድ አልባው የማዞሪያ ድህንነት ቅንጅት (TKIP) አይደገፍም"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"የማረጋገጥ አለመሳካት። እባክህ እንደገና ሞክር።"</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"ሌላ የWPS ክፍለ ጊዜ ተገኝቷል። እባክህ ከጥቂት ደቂቃዎች በኋላ እንደገና ሞክር።"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"አውታረ መረብ SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ደህንነት"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"የሲግናል ጥንካሬ"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"ተቀምጧል"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"ተሰነክሏል"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"ደካማ የበየነመረብ ግንኙነት አስወግድ"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"በደካማ ግንኙነት የተነሳ አውታረመረቡ እንዳይቀርብ ተደርጓል:: ይህን ባህሪ ከቅንጅቶች &gt; Wi-Fi ማያ ገጽ የላቀ ምናሌ ንጥል ላይ አጥፋው::"</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="3538912605343585226">"ጥበቃ የሚደረግለት አውታረመረብ ማግኘት ይቻላል"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (ጥበቃ የሚደረግለት አውታረመረብ ማግኘት ይቻላል)"</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_failed_connect_message" msgid="8491902558970292871">"ከአውታረ መረቡ ጋር መገናኘት አልተሳካም"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"እርሳ"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"አውታረ መረብ መርሳት አልተሳካም"</string>
     <string name="wifi_save" msgid="3331121567988522826">"አስቀምጥ"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"አውታረ መረብ ማስቀመጥ አልተሳካም"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ይቅር"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"ሌላ WiFi ደህንነቱ የተጠበቀ ክፍለጊዜ እንዳለ በፍለጋ ተደርሶበታል:: በትንሽ ደቂቃ ውስጥ እባክህ እንደገና ሞክር::"</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"መውጫ"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"የአውታረ መረብ ቅድመ ቅጥያ ርዝመት"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi ቀጥታ"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"አቻ-ለ-አቻ ተያያዥነት አዋቅር"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi ቀጥታ"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"መሣሪያ መረጃ"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"በWi-Fi የተጠበቀ መዋቅር"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"ፒን ተይብ"</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_remove_group" msgid="4844634506540667517">"ቡድን አስወግድ"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"ከፍተኛ"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"የሚገኙ መሣሪያች"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"መሣሪያዎችን ፈልግ"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"በመፈለግ ላይ…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"መሣሪያ ዳግም ሰይም"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"አቻ መሳሪያዎች"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"ማገናኘት አልተቻለም።"</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"መሣሪያ ዳግም መሰየም አልተሳካም።"</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"ይላቀቅ?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"ግንኙነቱን ካቋረጥክ፣ ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር ያለህ ግንኙነት ይቋረጣል።"</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"ግንኙነቱን ካቋረጥክ፣ ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> እና <xliff:g id="PEER_COUNT">%2$s</xliff:g> ሌላ መሳሪያዎች ጋር ያለህ ግንኙነት ይቋረጣል።"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ግብዣ ይሰረዝ?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር የመገናኘት ግብዣውን መሰረዝ ትፈልጋለህ?"</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_ap_text" msgid="61237027772641155">"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>
-    <string name="silent_mode_title" msgid="3181479108593217704">"የፀጥታ ሁነታ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"የስልክ ጥሪ ድምፅ"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"ድምፆች"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"የሙዚቃ ማሳመሪያዎች"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"የስልክ ጥሪ ድምፅ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ፀጥ ሲል ንዘር"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"ንዘር እና ጥራ"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"የደውል ቅላጼ ድምጸ ከል አድርግ &amp; ማስታወቅያዎች"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"ሙዚቃ ድምጸ ከል አድርግ &amp; ሌላ ሚዲያ"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"የማሳወቂያ ድምፅ አጥፋ"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"ማንቂያ ደወሎችን ድምጸ ከል አድርግ"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"በሚደወልበት ጊዜ ንዘር"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"ትክል ድምጽን ከማቀናበርህ በፊት ጡባዊህን መትከል አለብህ::"</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"ተሰኪ ድምጽን ከማቀናበርህ በፊት ስልኩን መሰካት አለብህ::"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ተሰኪ ድምጽን ከማቀናበርህ በፊት ጡባዊ ተኮን መሰካት ያስፈልግሃል፡፡"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ተሰኪ ድምጽን ከማቀናበርህ በፊት ስልኩን መሰካት ያስፈልግሃል፡፡"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"ማስገቢያ ድምፅ ትከል"</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="account_settings" msgid="6403589284618783461">"መለያዎች"</string>
     <string name="search_settings" msgid="1910951467596035063">"ፍለጋ"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"የፍለጋ ታሪክእና ቅንብሮችንአደራጅ"</string>
     <string name="display_settings" msgid="7965901687241669598">"አሳይ"</string>
@@ -699,10 +727,10 @@
     <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_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_prl_version" msgid="1007470446618081441">"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>
@@ -808,8 +836,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"የፋብሪካ ውሂብ ዳግም አስጀምር"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"በስልኩ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"በስልኩ ላይ ያለውን ውሂብ ሁሉ አጥፋ"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ይህ ካንተ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:"\n\n<li>"ያንተ Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንጅቶች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል::"</string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ይህ ካንተ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:"\n\n<li>"ያንተ Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንጅቶች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል::"</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ይህ ከአንተ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:"\n\n<li>"የአንተ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንጅቶች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል::"</string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ይህ ከአንተ ጡባዊ "<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="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ "\n\n"ለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
@@ -820,10 +848,10 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በ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="7209547812233487345">"ሁሉም ያንተ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርማጃ መቀልበስ አትችልም!"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"ሁሉም የአንተ  የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርማጃ መቀልበስ አትችልም!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ሁሉንም አጥፋ"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"የራስዎን ቁልፍ መክፈቻ ስርዓተጥለት ይሳሉ"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"የፋብሪካ ውሂብ ዳግም አስጀምር ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"የፋብሪካ ውሂብ ዳግም አስጀምር ለማረጋገጥ የእንተን መክፈቻ ስርዓተ ጥለት መሳል ያስፈልግሃል።"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"የስርዓቱ አገልግሎት አጥራ ስላልተገኘ ዳግም ለማስጀመር ምንም አልተከናወነም።"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ዳግም አቀናብር?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB ማከማቻ አጥፋ"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"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="nosdcard" msgid="2192044794228379224">"የ USB ካርዱን ማከማቻ ለማጥፋት መፈለግህን ለማረጋገጥ የእንተን መክፈቻ ስርዓተ ጥለት መሳል አለብህ።"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"የ SD ካርዱን ለማጥፋት መፈለግህን ለማረጋገጥ የአንተን መክፈቻ ስርዓተ ጥለት መሳል አለብህ።"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"የጥሪ ቅንብሮች"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"የድምፅመልዕክት፣ የጥሪ ማስተላለፊያ፣መስመር ላይ ቆይ፣ የደዋይ ID አዋቅር"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB መሰካት"</string>
@@ -868,9 +896,9 @@
     <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="location_title" msgid="1029961368397484576">"የኔ ሥፍራ"</string>
+    <string name="location_title" msgid="1029961368397484576">"የእኔ  ሥፍራ"</string>
     <string name="location_network_based" msgid="5569673665032992664">"የGoogle ሥፍራ አገልግሎት"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"የተጠጋጋ ሥፍራህን ለመወሰን እንደ Wi-Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦች ያሉትን የውሂብ ምንጮች ትግበራዎች ተጠቀምባቸው።"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"ስም አልባ የአካባቢ ውሂብ ወደ Google እንዲላኩ ፍቀድ። የተፈቀደላቸው መተግበሪያዎች አካባቢህን በግምት እንዲያውቁትም ከአንደ ገመድ አልባ እና የተንቀሳቃሽ ስልክ አውታረ መረቦች ያሉ ምንጮች ውሂብ እንዲጠቀሙ ፍቀድላቸው።"</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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ለእገዛ ምናሌ ተጫን"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"ሲጨርሱ ጣትዎን ይልቀቁ"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"ቢያንስ <xliff:g id="NUMBER">%d</xliff:g> ነጥቦች አያይዝ። እንገደና ሞክር፡"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"ስርዓተ ጥለት ተመዝግቧል!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"ስርዓተ ጥለት ተመዝግቧል።"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"ለማረጋገጥ ስርዓተ ጥለት ድጋሚ ሳል፡"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"አዲሱ የመክፈቻ ስርዓተ ጥለትዎ፡"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"አረጋግጥ"</string>
@@ -937,22 +965,23 @@
     <string name="next_button_label" msgid="8890792540116568321">"ቀጥል"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"ጡባዊዎን በማስጠበቅ ላይ"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"ስልክዎን በማስጠበቅ ላይ"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"የግል ማያ መክፈቻ ስርዓተ ጥለት በመፍጠር ጡባዊህን ካልተፈቀደ ጥቅም ትከላከላለህ። በሚቀጥለው ማያ ላይ በማንኛውም ስርዓተ ነጥቦቹን ለማገናኘት ጣትህን ትጠቀም። ቢያንስ አራት ነጥቦች ማገናኘት አለብህ።"\n\n" ለመጀመር ዝግጁ ነህ? \"ቀጥል\" ንካ።"</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"የግል ማያ መክፈቻ ስርዓተ ጥለት በመፍጠር ጡባዊህን ካልተፈቀደ ጥቅም ትከላከላለህ። በሚቀጥለው ማያ ላይ በማንኛውም ስርዓተ ነጥቦቹን ለማገናኘት ጣትህን ተጠቀም። ቢያንስ አራት ነጥቦች ማገናኘት አለብህ።"\n\n" ለመጀመር ዝግጁ ነህ? \"ቀጥል\" ንካ።"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"የግል የስርዓተ ጥለት ማያ መክፈቻ በመፍጠር ስልክህን ካልተፈቀደ ጥቅም ጠብቅ። በሚቀጥለው ማያ ላይ በማንኛውም መልኩ ቢያንስ አራት ነጥቦች ጣትህን በመጠቀም አገናኝ። "\n\n" ለመጀመር ዝግጁ ነው? \"ቀጥሎ\" የሚለውን ንካ።"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"መተግበሪያዎች አስተዳድር"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"የተጫኑ መተግበራያዎች አስተዳድር እና አስወግድ"</string>
     <string name="applications_settings" msgid="1721442176406964682">"መተግበሪያዎች"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"መተግበሪያዎች አደራጅ፣ በፍጥነት ማስነሻ አቋራጮች አዘጋጅ"</string>
-    <string name="applications_settings_header" msgid="1014813055054356646">"መተግበሪያ ቅንጅቶች"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"መተግበሪያ ቅንብሮች"</string>
     <string name="install_applications" msgid="4872012136210802181">"ያልታወቁ ምንጮች"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"ገበያ ነክ ያልሆኑ መተግበሪያዎችን ለመጫን ፍቀድ።"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"ያንተ ጡባዊ እና የግል ውሂብ ካልታወቁ ምንጮች በሚመጡ መተግበሪያዎች ለጥቃት የተጋለጡ ናቸው:: እነዚህን መተግበሪያዎች በመጠቀምህ ሊከሰት በሚችለው የጡባዊህ ጉዳት ወይም የውሂብ መጥፋት ሙሉ በሙሉ ሃላፊነቱን አንተ ብቻ ለመውሰድ ትስማማለህ::"</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"ያንተ ስልክ እና የግል ውሂብ ካልታወቁ ምንጭ መተግበሪያዎች ለሚደርሱ ጥቃቶች የተጋለጡ ናቸው:: እነዚህን መተግበሪያዎች መጠቀም በመቀጠልህ ለሚደርስ ማናቸውም ጉዳት ሆነ የውሂብ መጥፋት ሃላፊነቱን ሙሉ በሙሉ ለብቻህ እንደምትወስድ ትስማማለህ::"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"ካልታወቁ ምንጮች የሚመጡ መተግበሪያዎች እንዲጫኑ ፍቀድ"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"የአንተ  ጡባዊ እና የግል ውሂብ ካልታወቁ ምንጮች በሚመጡ መተግበሪያዎች ለጥቃት የተጋለጡ ናቸው:: እነዚህን መተግበሪያዎች በመጠቀምህ ሊከሰት በሚችለው የጡባዊህ ጉዳት ወይም የውሂብ መጥፋት ሙሉ በሙሉ ሃላፊነቱን አንተ ብቻ ለመውሰድ ትስማማለህ::"</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"የአንተ  ስልክ እና የግል ውሂብ ካልታወቁ ምንጭ መተግበሪያዎች ለሚደርሱ ጥቃቶች የተጋለጡ ናቸው:: እነዚህን መተግበሪያዎች መጠቀም በመቀጠልህ ለሚደርስ ማናቸውም ጉዳት ሆነ የውሂብ መጥፋት ሃላፊነቱን ሙሉ በሙሉ ለብቻህ እንደምትወስድ ትስማማለህ::"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"የላቁ ቅንብሮች"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"ተጨማሪ የቅንጅቶች አማራጮ ች አንቃ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"የመተግበሪያ መረጃ"</string>
     <string name="storage_label" msgid="8700867073480107253">"ማከማቻ"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"በነባሪ አስነሳ"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"ነባሪዎች"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"የማያ ተኳኋኝነት"</string>
     <string name="permissions_label" msgid="2605296874922726203">"ፍቃዶች"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"መሸጎጫ"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"ውሂብ አጥራ"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"አዘምኖች አትጫን"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"ይህን መተግበሪያ በነባሪ ለሌላ እርምጃዎች እንዲጀምር መርጠኸዋል::"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"ይህ መተግበሪያ ምግብሮችን ፈጥሮ ውሂባቸውን እንዲደርስ ፈቅደሃል።"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"ምንም ነባሪዎች አልተዘጋጁም።"</string>
     <string name="clear_activities" msgid="7408923511535174430">"ነባሪዎችን አጥራ"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"ይህ መተግበሪያ ለአንተ ማያ አልተነደፈ ይሆናል፤ ለአንተ ማያ እንዴት እንደሚስማማ እዚህ መቆጣጠር ትችላለህ።"</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"በመጠን ለይ"</string>
     <string name="show_running_services" msgid="5736278767975544570">"አሂድ አገልግሎቶችን አሳይ"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"የተሸጎጡ ሂደቶችን አሳይ"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"የመተግበሪያዎች ምርጫዎችን ዳግም አስጀምር"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"የመተግበሪያዎች ምርጫዎች ዳግም ይጀመሩ?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"ይሄ የእነዚህን ሁሉ ምርጫዎች ዳግም ያስጀምራል፦"\n\n" "<li>"የተሰናከሉ መተግበሪያዎች"</li>\n" "<li>"የተሰናከሉ የመተግበሪያዎች ማሳወቂያዎች"</li>\n" "<li>"የእርምጃዎች ነባሪ መተግበሪያዎች"</li>\n" "<li>"የመተግበሪያዎች የጀርባ ውሂብ ገደቦች"</li>\n\n" ምንም የመተግበሪያ ውሂብ አታጣም።"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"መተግበሪያዎችን ዳግም አስጀምር"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"ባዶ ቦታ አደራጅ"</string>
     <string name="filter" msgid="2018011724373033887">"አጣራ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"የማጣሪያ አማራጮችን ምረጥ"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ይህ መተግበሪያ የሚከተለውን በጡባዊህ ላይ መድረስ ይችላል፡"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"ይህ መተግበሪያ ስልክህ ላይ የሚከተለውን መድረስ ይችላል፡"</string>
     <string name="computing_size" msgid="1599186977475211186">"በማስላት ላይ..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"የአካታች መጠንን ለማስላት አልተቻለም።"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"የጥቅል መጠንን ለማስላት አልተቻለም።"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"የተጫኑ የማንኛውም ሦስተኛ ወገን መተግበሪያ የሉህም።"</string>
     <string name="version_text" msgid="9189073826278676425">"ሥሪት<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"አንቀሳቅስ"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"ለአዲስ መተግበሪያዎች ተመራጭ መጫኛ ሥፍራዎችን ለውጥ።"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"የውስጠ ግንብ መተግበሪያ አቦዝን?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"ውስጠ-ግንቡ የሆኑ መተግበሪያዎችን ካቦዘንክ ሌሎች መተግበሪያዎች አደብ ሊስቱ ይችላሉ::"</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ማሳወቂያዎችን አጥፋ?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ለዚህ መተግበሪያ ማሳወቂያዎችን አጥፍተህ ከሆነ፣ አስፈላጊ ማንቂያዎችን እና አዘምኖችን ልታጣ ትችላለህ።"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"የማከማቻ ጥቅም"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"በመተግበሪያዎች ጥቅም ላይ የዋለ ማከማቻ እይ"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"አሂድ አገልግሎቶች"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"ይህ ግቤት ስልት የሚትተይበውን ፅሁፍ ሁሉ፣  እንደይለፍ ቃል እና የብድር ካርድ ጨምሮ የግል ውሂብ ምናልባት መሰብሰብ ይችላል። ከትግበራው ይመጣል። <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> ይህን ግቤት ስልትይጠቀም?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"ይህ ሥርዓተ ሆሄ ፈታሽ ሁሉንም የምትተይበውን ጽሑፍ እንደ ይለፍቃል እና የብድር ካርድ ቁጥሮችን ያሉ የግል መረጃዎችን ጨምሮ በሙሉ ሊሰበስብ ይችል ይሆናል:: ከ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> መተግበሪያ ይመጣል:: ይህን ሥርዓተ ሆሄ ፈታሽ ተጠቀም?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"ቅንብሮች"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"ቋንቋ"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"የ<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> ቅንብሮች መክፈት አልተሳካም"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"መዳፊት/ትራክፓድ"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"የጠቋሚ ፍጥነት"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"የጨዋታ መቆጣጠሪያ"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"ነዛሪ ተጠቀም"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"ሲገናኝ ነዛሪ ወደ ጨዋታ መቆጣጠሪያ አዛውር።"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"የቁልፍ ሰሌዳ አቀማመጥ ምረጥ"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"የቁልፍ ሰሌዳ አቀማመጦችን አዋቅር"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"ለመቀየር፣ Control-Spacebar ተጫን"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ነባሪ"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"የቁልፍ ሰሌዳ አቀማመጥ"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"የተጠቃሚ መዝገበ ቃላት"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"የግል መዝገበ ቃላት"</string>
     <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_add_screen_title" msgid="742580720124344291">"ሐረግ"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ተጨማሪ አማራጮች"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"አነስተኛ አማራጮች"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"እሺ"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"ቃል፦"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"አቋራጭ፦"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ቋንቋ፦"</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_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="8165273379942105271">"በተጠቃሚ መዝገበ ቃላት ውስጥ ምንም ቃላቶች የለህም። በምናሌ በኩል ቃል ማከል ትችላለህ።"</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"ሁሉም ቋንቋዎች"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"ለሁሉም ቋንቋዎች"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"ተጨማሪ ቋንቋዎች…"</string>
     <string name="testing" msgid="6584352735303604146">"ሙከራ"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"የጡባዊ መረጃ"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"የስልክ መረጃ"</string>
@@ -1121,7 +1176,7 @@
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"ሁልጊዜ ደብቅ"</string>
     <string name="configure_input_method" msgid="1317429869771850228">"የግቤት ስልቶችን አዘጋጅ"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"ቅንብሮች"</string>
-    <string name="input_method_settings_button" msgid="6778344383871619368">"ቅንጅቶች"</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>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"ለመተግበሪያ ግንባታ አማራጮች አዘጋጅ"</string>
     <string name="enable_adb" msgid="7982306934419797485">"የUSB አራሚ"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB ሲያያዝ የአርም ሁኔታ"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"የመሣሪያ ግንባታ ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"የመሣሪያ መረጃ አይገኝም"</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="7316799925425402244">"የUSB አድስ ለግንባታ አላማ ብቻ የታሰበ ነው። ከኮምፒዩተርህ ወደ መሳሪያህ ውሂብ ለመገልበጥ፣ መሣሪያህ ላይ ያለ ማሳወቂያ መተግበሪያዎችን መጫን፣ እና ማስታወሻ ውሂብ ማንበብ ለመጠቀም ይቻላል።"</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"የግንባታ ቅንጅቶችን ፍቀድ?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"እነዚህ ቅንብሮች  የታሰቡት ለግንባታ አጠቃቀም ብቻ ናቸው። መሳሪያህን እና በሱ ላይ ያሉትን መተግበሪያዎች እንዲበለሹ ወይም በትክክል እንዳይሰሩ ሊያደርጉ ይችላሉ።"</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"የUSB ማከማቻ ጠብቅ"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"መተግበሪያዎች የUSB ማከማቻ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"የUSB ማከማቻ ይጠበቅ?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"የUSB ማከማቻ የተጠበቀ ሲሆን መተግበሪያዎች ከውጫዊ ማከማቻ ውሂብ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው።"\n\n"አንዳንድ መተግበሪያዎች በገንቢዎቻቸው እስኪዘመኑ ድረስ ላይሰሩ ይችላሉ።"</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"የSD ካርድ ጠብቅ"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"መተግበሪያዎች የSD ካርድ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"የSD ካርድ ይጠበቅ?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"የSD ካርድ የተጠበቀ ሲሆን መተግበሪያዎች ከውጫዊ ማከማቻ ውሂብ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው።"\n\n"አንዳንድ መተግበሪያዎች በገንቢዎቻቸው እስኪዘመኑ ድረስ ላይሰሩ ይችላሉ።"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"መሣሪያ ምረጥ"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"ፍርግም ምረጥ"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"አዲስ ምግብር ፍጠር አና መዳረሻ ፍቀድለት?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ምግብሩን ከፈጠርከው በኋላ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> የሚያሳየውን ውሂብ ሁሉ ሊደርስበት ይችላል።"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ምግብሮች እንዲፈጥርና ውሂባቸውን እንዲደርስ ሁልጊዜ ፍቀድ"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"ትልቅ ፅሁፍ"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"የኃይል ማስነሻ አዝራር ጥሪ"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"የይለፍ ቃሎችን ተናገር"</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">"ንካ&amp; አዘግይ ያዝ"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"የድረ ስክሪፕቶች ጫን"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"የድር ተደራሽነት አሻሽል"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ምንም አገልግሎቶች አልተጫኑም"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"የማያ ማንበቢያ ያስፈልጋል?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ማየት ለተሳናቸው እና ዝቅተኛ የማየት አቅም ላላቸው ተጠቃሚዎች የንግግር ግብረ መልስ ያቀርባል፡፡ በነጻ ከ Android Market ልትጭነው ትፈልጋለህ?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"የድረ ስክሪፕቶች ይጫኑ?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"የድረ ይዘታቸውን የበለጠ ተደራሽ የሚያደርግ ከGoogle ላይ የትግበራ ስክሪፕቶች ለመጫን ይፈልጋሉ?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"ይህ ባህሪ መሳሪያህ ለንኪ የሚሰጠውን ምላሽ አሰጣጥ ይለውጣል፡፡ አብራው?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ምንም መግለጫ አልቀረበም።"</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_not_available" msgid="3214000535532434353">"የባትሪ አጠቃቀም ውሂብ የለም።"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1232,7 +1293,7 @@
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"ጊዜ ያለሲግናል"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"በኃይል ማቆም"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"የመተግበሪያ መረጃ"</string>
-    <string name="battery_action_app_settings" msgid="4570481408106287454">"መተግበሪያ ቅንጅቶች"</string>
+    <string name="battery_action_app_settings" msgid="4570481408106287454">"መተግበሪያ ቅንብሮች"</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>
@@ -1268,7 +1329,7 @@
     <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="1237820681016639683">"የፅሁፍ- ወደ- ንግግር ውፅዓት"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ሁልጊዜም የኔን ቅንብሮች ተጠቀም"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ሁልጊዜም የእኔን ቅንብሮች ተጠቀም"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ከስር ያሉ ነባሪ ቅንብሮች የመተግበሪያ  ቅንጅቶችን ያግዳሉ"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"ነባሪ ቅንብሮች"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"ነባሪ አንቀሳቃሽ"</string>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"የመረጥከው አንቀሳቃሽ አይሄድም።"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"አዋቅር"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"ሌላ አንቀሳቃሽ ምረጥ"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"ይህ የንግግር ልምምድ አንቀሳቃሽ የሚነገረውን ፅሁፍ ሁሉ  እንደ ይለፍ ቃል እና የዱቤ ካርድ ቁጥሮች፣ የግል ውሂብ ጨምሮ ለመሰብሰብ ይችል ይሆናል።  ከ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> አንቀሳቃሽ ይመጣል። የዚህን የንግግር ልምምድ አንቀሳቃሽ አጠቃቀም ይንቃ?"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"አዲስ አንቀሳቃሽ ከመጠቀምህ በፊት አንቃ።"</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"የቁልፍ መክፈቻ ስርዓተ ጥለትህን ሳል"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"የአሳማኝ መታውቂያ ጭነትን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትህን መሳል አለብህ።"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ለምስክርነት ማረጋገጫ ማከማቻ የይለፍቃልን ተይብ::"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"የአሁኑ ይለፍ ቃል፡"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"የመረጃው ማከማቻ ጠፍቷል"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"የማስረጃ ማከማቻ መጥፋት አልተቻለም።"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"የመረጃ ማከማቻ ነቅቷል።"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"የማስረጃ ማከማቻ ከመጠቀምህ በፊት የማያ ፒን ወይም ይለፍ ቃል ቆልፍ ማዘጋጀት አለብህ።"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"የማስረጃ ማከማቻ ከመጠቀምህ በፊት የማያ ፒን ወይም ይለፍ ቃል ቆልፍ ማዘጋጀት አለብህ።"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"የአደጋ ጊዜ ድምፅ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"የአደጋጊዜ ጥሪ ሲደረግ ባህሪ አዘጋጅ"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"መጠበቂያ &amp; ዳግም አስጀምር"</string>
@@ -1337,16 +1400,16 @@
     <string name="backup_section_title" msgid="7952232291452882740">"ምትኬ &amp; እነበረበት መልስ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"የግል ውሂብ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ውሂቤን መጠባበቂያ"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"ወደ Google አገልጋዮች የመተግበሪያ ውሂብ ፣ የWi-Fi ይለፍ ቃሎች እና ሌላ ቅንጅቶች ተተኪ አኑር"</string>
+    <string name="backup_data_summary" msgid="9157861529438245957">"ወደ 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="4235615056371993807">"መተግበሪያን ዳግም ስትጭን ምትኬ ቅንጅቶች እና ውሂብ እነበሩበት መልስ"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"መተግበሪያን ዳግም ስትጭን ምትኬ ቅንብሮች  እና ውሂብ እነበሩበት መልስ"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"የዴስክቶፕ መጠባበቂያ ይለፍ ቃል"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"በአሁኑ ጊዜ ሙሉ አካባቢያዊ መጠባበቂያዎች አይጠበቁም።"</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"ሙሉ የአካባቢያዊ መጠባበቂያዎችን ይለፍ ቃል ለመለወጥ ወይም ለማስወገድ ምረጥ"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"ዴስክቶፕ ሙሉ ምትኬዎች በአሁኑ ሰዓት አልተጠበቁም"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ለዴስክቶፕ ሙሉ ምትኬዎች የይለፍ ቃል ለመለወጥ ወይም ለማስወገድ ንካ"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"ያንተን  Wi-Fi ይለፍቃሎችን መጠባበቂያ ማቆም ዕልባቶች ሌሎች ቅንጅቶች  እና መተግበሪያ ውሂብ ብሎም ሁሉም Google አገልጋዮች ቅጂዎች ይሰረዙ?"</string>
+    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"የአንተን  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>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"ይህ አስተዳዳሪ ንቁ እና የሚከተሉትን ክንውኖች ለማካሄድ <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="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"የጥሪ ደውል ቅላጼ እና ንዝረት"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"ስርዓት"</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="3747859666621319757">"ወደ Wi-Fi አውታረመረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> በማገናኘት ላይ..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"አመሳስል አልተሳካም"</string>
+    <string name="sync_active" msgid="8476943765960863040">"አመሳስል የነቃ"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"አመሳስል"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"አሳምር በአሁኑጊዜ ችግር እየገጠመው ነው። ከአፍታ ቆይታ በኋላ ይመለሳል።"</string>
     <string name="add_account_label" msgid="7811707265834013767">"መለያ አክል"</string>
     <string name="background_data" msgid="5779592891375473817">"ዳራ ውሂብ"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"አሳምር በርቷል"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"አሳምር ጠፍቷል"</string>
     <string name="sync_error" msgid="5060969083117872149">"የአሳምር ስህተት"</string>
+    <string name="last_synced" msgid="4242919465367022234">"ለመጨረሻ ጊዜ የተመሳሰለው <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"አሁን በማመሳሰል ላይ…"</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>
@@ -1413,8 +1480,8 @@
     <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="6205903695598000286">"የመተግበሪያ ማመሳሰያ ቅንጅቶች"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">" ወደ Google አመሳስል እንኳን ደህና መጣህ!"</font>\n" ውሂብ ለማመሳሰልየአንተን ዕውቂያዎች፣ ቀጠሮዎች እና ሌሎችም ካለህበት ለመድረስ ለመፍቀድ የGoogle አቀራረብ ።"</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"የመተግበሪያ ማመሳሰያ ቅንብሮች"</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>
@@ -1424,10 +1491,11 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"መለያ አስወግድ?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ይህን መለያ ማስወገድ ሁሉንም መልዕክቶቹን፣ እውቂያዎቹን፣ እና ከጡባዊው ውስጥ ሌላ ውሂብ ይሰርዛል!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ይህን መለያ ማስወገድ ሁሉንም መልዕክቶቹን፣ እውቂያዎቹን፣ እና ከስልኩ ውስጥ ያለ ሌላ ውሂብን ይሰርዛል!"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"ይህ መለያ በአንዳንድ መተግበሪያዎች ያስፈልጋል::  በቅንጅቶች &gt; ላይ  ምትኬ&amp; ዳግም አዘጋጅ ላይ  ወደ ፋብሪካው ነባሪዎች (ሁሉንም ያንተ የግል ውሂብ ይሰርዛል) ጡባዊውን ዳግም በማዘጋጀት ብቻ ልታስወግደው ትችላለህ::"</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"ይህ መለያ በአንዳንድ መተግበሪያዎች ያስፈልጋል::  በቅንጅቶች &gt; ላይ  ምትኬ&amp; ዳግም አዘጋጅ ላይ  ወደ ፋብሪካው ነባሪዎች (ሁሉንም ያንተ የግል ውሂብ ይሰርዛል) ስልኩን ዳግም በማዘጋጀት ብቻ ልታስወግደው ትችላለህ::"</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"ይህ መለያ በአንዳንድ መተግበሪያዎች ያስፈልጋል::  በቅንጅቶች &gt; ላይ  ምትኬ&amp; ዳግም አዘጋጅ ላይ  ወደ ፋብሪካው ነባሪዎች (ሁሉንም የአንተ  የግል ውሂብ ይሰርዛል) ጡባዊውን ዳግም በማዘጋጀት ብቻ ልታስወግደው ትችላለህ::"</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"ይህ መለያ በአንዳንድ መተግበሪያዎች ያስፈልጋል::  በቅንጅቶች &gt; ላይ  ምትኬ&amp; ዳግም አዘጋጅ ላይ  ወደ ፋብሪካው ነባሪዎች (ሁሉንም የአንተ  የግል ውሂብ ይሰርዛል) ስልኩን ዳግም በማዘጋጀት ብቻ ልታስወግደው ትችላለህ::"</string>
     <string name="provider_label" msgid="7724593781904508866">"ምዝገባዎችላይ ተጫን"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g> አስምር"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"በእጅ ማመሳሰል አልተቻለም"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"አመሳስል ለዚህ ንጥል በአሁን ጊዜ ቦዝኗል።ምርጫህን ለመለወጥ፣ ለጊዜው የዳራ ውሂብ እና ራስ ሰር ማመሳሰያ አብራ።"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"የ4G ቅንብሮች"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"የ4G MAC አድራሻ"</string>
     <string name="enter_password" msgid="4131758584074246224">"ማከማቻ ለመፍታት የይለፍ ቃል ተይብ"</string>
     <string name="try_again" msgid="4272075051293936921">"በድጋሚ ሞክር::"</string>
-    <string name="service_busy" msgid="2325014135156127705">"አገልግሎቱ ባተሌ ነው:: እንደገና ሞክር::"</string>
     <string name="delete" msgid="4219243412325163003">"ሰርዝ"</string>
     <string name="misc_files" msgid="6720680815969643497">"ልዩ ልዩ ፋይሎች"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"ሁሉንም ምረጥ"</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="debug_debugging_category" msgid="6781250159513471316">"ስህተት በማስወገድ ላይ"</string>
+    <string name="debug_app" msgid="8349591734751384446">"የስህተት ማስወገጃ መተግበሪያ ምረጥ"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"ምንም የስህተት ማስወገጃ መተግበሪያ አልተዘጋጀም"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"የስህተት ማስወገጃ መተግበሪያ፦ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"መተግበሪያ ምረጥ"</string>
+    <string name="no_application" msgid="2813387563129153880">"ምንም"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"ስህተት ማስወገጃውን ጠብቅ"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"ስህተቱ የተወገደለት መተግበሪያ ከመፈጸሙ በፊት የስህተት ማስወገጃው እስኪያያዝ ድረስ እየጠበቀው ነው"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"ግብዓት"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"ስዕል"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"ቁጥጥር"</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">"የማያ ተደራቢ የአሁኑን የCPU አጠቃቀም  እያሳየ ነው።"</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_screen_updates" msgid="5470814345876056420">"የወለል ዝማኔዎችን አሳይ"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"የመስኮት ወለሎች ሲዘምኑ መላ መስኮቱን አብለጭልጭ"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"የGPU እይታ ዝማኔዎችን አሳይ"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"ከGPU ጋር ሲሳል መስኮቶች ውስጥ እይታዎችን አብለጭልጭ"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"የHW ተደራቢዎችን አሰናክል"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"ለማያ ገጽ ማቀናበሪያ ሁልጊዜ GPU ተጠቀም"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"ፍንጮችን አንቃ"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"የነቁ ፍንጮችን ምረጥ"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"በአሁኑ ጊዜ ምንም ፍንጮች አልነቁም"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"በአሁኑ ጊዜ <xliff:g id="NUM">%1$d</xliff:g> ፍንጮች ነቅተዋል"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"ሁሉም ፍንጮች በአሁኑ ጊዜ ነቅተዋል"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"የአቀማመጥ ገደቦችን አሳይ"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"የቅንጥብ ገደቦች፣ ጠርዞች፣ ወዘተ. አሳይ"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"የCPU አጠቃቀም አሳይ"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"የማያ ተደራቢ የአሁኑን የCPU አጠቃቀም  እያሳየ ነው።"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU ምላሽ መስጠትን አስገድድ"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"2D ሃርድዌር ማፈጠኛ በመተግበሪያዎች ላይ ተጠቀም"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"ለ2-ልኬት መሳል የGPU ስራ አስገድድ"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"የGPU ምላሽ መስጠት መዝግብ"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"ምላሽ ለመስጠት የወሰደው ጊዜ በadb shell dumpsys gfxinfo ለካ"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"የዊንዶው እነማ ልኬት ለውጥ"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"የእነማ ልኬት ለውጥ ሽግግር"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"እነማ አድራጊ ቆይታ መለኪያ"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"መተግበሪያዎች"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"እንቅስቃሴዎችን አትጠብቅ"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ተጠቃሚው እስኪተወው ድረስ እያንዳንዱን እንቅስቃሴ አስወግድ"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"የተንቀሳቃሽ መገናኛ ነጥቦች"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"ውሂብ ራስ-አመሳስል"</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="8621855507876539282">"በዚህ ጊዜ ውስጥ ምንም መተግበሪያዎች ውሂብ ጥቅም ላይ አልዋሉም።"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"ቅድመ ገፅ"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"መደብ"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"ባንተ ጡባዊ ተኮ መሰረት ይሰፈራል:: ያንተ ማጓጓዣ ውሂብ አጠቃቀም ሒሳብ ማስያ ሊለያይ ይችላል::"</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"ባንተ ስልክ መሰረት ይሰፈራል:: ያንተ ማጓጓዣ ውሂብ አጠቃቀም ሒሳብ ማስያ ሊለያይ ይችላል::"</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"የተገደበ"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"የተንቀሳቃሽ ስልክ ውሂብ ይቦዝን?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"የተንቀሳቃሽ ስልክ ውሂብ ወሰን አዘጋጅ"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"የ4G ውሂብ ወሰን አዘጋጅ"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"ተንቀሳቃሽ ስልክ"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"ምንም"</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="8430240158135453271">"መተግበሪያ ቅንጅቶችን እይ"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"በስተጀርባ ውሂብ አግድ?"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"የተንቀሳቃሽ ስልክ ውሂብ አውታረ መረብ ላይ ብቻ የዳራ ውሂብ አቦዝን። Wi-Fi ከተገኘ ያገለግላል።"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"የጀርባ ውሂብ በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ አሰናክል። ከተገኙ የተንቀሳቃሽ ስልክ ያልሆኑ አውታረ መረቦች ስራ ላይ ይውላሉ።"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ለዚህ ትግበራ የዳራ ውሂብ ለመገደብ፣ መጀመሪያ የተንቀሳቃሽ ውሂብ ወሰን አዘጋጅ።"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"በስተጀርባ ውሂብ አግድ?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"ይህ ባህሪ Wi-Fi በማይገኝበት ጊዜ መስራት እንዲያቆም በሚያደርግ የዳራ ውሂብ መተግበሪያ ላይ የተመረኮዘ ሊሆን ይችላል:: "\n\n"የበለጠ ተገቢነት ያላቸው የውሂብ አጠቃቀም ቁጥጥሮች በመተግበሪያው ላይ ካሉ ቅንጅቶች ላይ ማግኘት ትችላለህ::"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ይሄ ባህሪ የተንቀሳቃሽ ስልክ አውታረ መረቦች ብቻ የሚገኙ ከሆኑ በጀርባ ውሂብ ላይ የሚወሰኑ መተግበሪያዎች ስራቸውን እንዲያቆሙ ሊያደርግ ይችላል።"\n\n"በመተግበሪያው ቅንብሮች ውስጥ ተገቢ የሆኑ ተጨማሪ የአጠቃቀም መቆጣጠሪያዎችን ልታገኝ ትችላለህ።"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"የተንቀሳቃሽ ስልክ ውሂብ ወሰን ሲያዘጋጁ ብቻ ነው የዳራ ውሂብ መገደብ የሚቻለው።"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ውሂብ ራስ-አመሳስል ይብራ?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"ድር ላይ በመለያዎችህ ላይ የምታደርጋቸው ማንኛውም ለውጦች በራስ-ሰር ወደ ጡባዊ ቱኮህ ይገለበጣሉ።"\n\n"አንዳንድ መለያዎች ጡባዊ ቱኮህ ላይ የምታደርጋቸው ለውጦች በራስ-ሰር ወደ ድር ላይ መገልበጥም ይችላሉ። የGoogle መለያ እንዲህ ነው የሚሰራው።"\n\n"የትኞቹ አይነት መረጃዎች ከእያንዳንዱ መለያ ጋር ማመሳሰል እንደምትፈልግ ለመምረጥ ወደ ቅንብሮች &gt; መለያዎች ሂድ።"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"ድር ላይ በመለያዎችህ ላይ የምታደርጋቸው ማንኛውም ለውጦች በራስ-ሰር ወደ ስልክህ ይገለበጣሉ።"\n\n"አንዳንድ መለያዎች ስልክ ላይ የምታደርጋቸው ለውጦች በራስ-ሰር ወደ ድር ላይ መገልበጥም ይችላሉ። የGoogle መለያ እንዲህ ነው የሚሰራው።"\n\n"የትኞቹ አይነት መረጃዎች ከእያንዳንዱ መለያ ጋር ማመሳሰል እንደምትፈልግ ለመምረጥ ወደ ቅንብሮች &gt; መለያዎች ሂድ።"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ውሂብ ራስ-አመሳስል ይጥፋ?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"ይሄ የውሂብ እና የባትሪ አጠቃቀም ይቆጥባል፣ ግን የቅርብ ጊዜ መረጃ ለመሰብሰብ እያንዳንዱ መለያ እየመረጥክ ማመሳሰል ይኖርብሃል። እናም ዝማኔዎች ሲኖሩ ምንም ማሳወቂያዎች አይደርሱህም።"</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_warning_editor_title" msgid="3704136912240060339">"የውሂብ አጠቃቀም ማስጠንቀቂያ አዘጋጅ"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"የውሂብ አጠቃቀም ወሰን አዘጋጅ"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"የውሂብ አጠቃቀም መወሰን"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"ያንተ <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተጠቀሰው ገደብ ላይ ሲደረስ ይቦዝናል፡፡ "\n\n"የውሂብ አጠቃቀም ባንተ ጡባዊ ተኮ መሰረት የሚሰፈር እንደመሆኑ፣ ያንተ ማጓጓዣ ለአጠቃቀም በተለየ ሁኔታ፣ ወግ አጥባቂ የሆነ ገደብ መጠቀምህን ከግምት አስገባ፡፡"</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"ያንተ <xliff:g id="NETWORKS">%1$s</xliff:g> ውሂብ ግንኙነት የተጠቀሰው ገደብ ላይ ሲደረስ ይቦዝናል፡፡ "\n\n"የውሂብ አጠቃቀም ባንተ ስልክ መሰረት የሚሰፈር እንደመሆኑ፣ ያንተ ማጓጓዣ ለአጠቃቀም በተለየ ሁኔታ፣ ወግ አጥባቂ የሆነ ገደብ መጠቀምህን ከግምት አስገባ፡፡"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"የተንቀሳቃሽ ስልክ ውሂብ ማገናኛ የተጠቀሰው ገደብ ላይ ሲደረስ ይሰናከላል።"\n\n"የውሂብ አጠቃቀም በጡባዊ ቱኮህ መሰረት የሚሰፈር እንደመሆኑ መጠን እና ድምጸ ተያያዥ ሞደምህ ለአጠቃቀም በተለየ ሁኔታ ሊሰፍር ስለሚችል፣ ቆጠብ ያለ ገደብ መጠቀሙን ግምት ውስጥ አስገባ።"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"የተንቀሳቃሽ ስልክ ውሂብ ማገናኛ የተጠቀሰው ገደብ ላይ ሲደረስ ይሰናከላል።"\n\n"የውሂብ አጠቃቀም በስልክህ መሰረት የሚሰፈር እንደመሆኑ መጠን፣ እና ድምጸ ተያያዥ ሞደምህ ለአጠቃቀም በተለየ ሁኔታ ሊሰፍር ስለሚችል፣ ቆጠብ ያለ ገደብ መጠቀሙን ግምት ውስጥ አስገባ።"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"በስተጀርባ ውሂብ አግድ?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"የተንቀሳቃሽ ውሂብ ዳራን ከገደብከው ወደ Wi-Fi አውታረመረብ ካልተገናኘህ በቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም::"</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: ስል  <xliff:g id="TOTAL">%1$s</xliff:g> ጥቅም ላይ የዋል"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>፦ <xliff:g id="TOTAL">%1$s</xliff:g> ገደማ ጥቅም ላይ ውሏል።"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>፦ <xliff:g id="TOTAL">%1$s</xliff:g> ገደማ ስራ ላይ ውሏል፣ በጡባዊ ቱኮህ በተለካው መሠረት። የድምጸ ተያያዥህ ውሂብ አጠቃቀም ሒሳብ አያያዝ ሊለይ ይችላል።"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>፦ <xliff:g id="TOTAL">%1$s</xliff:g> ገደማ ስራ ላይ ውሏል፣ በስልክህ በተለካው መሠረት። የድምጸ ተያያዥህ ውሂብ አጠቃቀም ሒሳብ አያያዝ ሊለይ ይችላል።"</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"የተንቀሳቃሽ መገናኛ ነጥቦች"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"የተንቀሳቃሽ መገናኛ ነጥቦች የሆኑ የገመድ አልባ አውታረ መረቦችን ምረጥ። መተግበሪያዎች ጀርባ ውስጥ ሲሆኑ እነዚህን አውታረ መረቦች እንዳይጠቀሙ ሊገደቡ ይችላሉ። መተግበሪያዎች እነዚህን አውታረ መረቦች ለትልልቅ ውርዶች ከመጠቀማቸው በፊት ሊያስጠናቅቁም ይችላሉ።"</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"የተንቀሳቃሽ ስልክ አውታረ መረብ"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"የገመድ አልባ አውታረ መረቦች"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"የተንቀሳቃሽ መገናኛ ነጥቦችን ለመምረጥ ገመድ አልባን አንቃ።"</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"የVPN መገለጫ አርትዕ"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"ከ<xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"የVPN መገለጫ አክል"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"መገለጫ አርትዕ"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"መገለጫ ሰርዝ"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"ምንም የአውታረ መረብ ግኑኝነት የለም። እባክህ ቆይተህ እንደገና ሞክር።"</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"የዕውቅና ማረጋገጫ ይጎድላል። እባክህ መገለጫውን አርትዕ።"</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"በ \"ንኪ አስስ\" የሚለውን ካበራህ በኋላ፣ ከጣትህ ስር ምን እንዳለ ለማወቅ መታያ ገጹን መንካት ትችላለህ፡፡ ለምሳሌ፣ አሁን ያለው መታያ ገጽ መተግበሪያ አዶዎችን ይዞ ሊሆን ይችላል፡፡ መታያ ገጹን በመንካት አንደኛቸውን በመንካት እና እዛው አካባቢ ጣትህን በማንሸራተት አግኝ፡፡"</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"ጥሩ። ቢያንስ አንድ አዶ እስኪያገኙ ድረስ በማያው ላይ ጣትዎን ማንሸራተት ይቀጥሉ።"</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"እየነካህ ያለኸውን ለማንቃት፣ ሁለቴ ነካ አድርገው:: የ <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="8764686624055084454">"በዝርዝር በኩል ለመሸብለል፣ በማያው ላይ ሁለት ጣትህን ማንሸራተት ትችላለህ። ለምሳሌ፣ የአሁኑ ማያ ወደላይ እና ወደ ታች የሚሸበልል የመተግበሪያ ስሞች ዝርዝር ይይዛል። መጀመሪያ፣ በዝርዝር ውስጥ ጥቂት አይነቶችን በመለየት አንድ ጣትህን አንሸራት።"</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="3055831259260848004">"ትምህርቱን አጠናቀሃል:: ለመውጣት፣ <xliff:g id="FINISH">%s</xliff:g> አዝራር አግኝና ጠቅ አድርገው::"</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"የፊደል መረጣ ማስተካከያ"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"የፊደል መረሚያ"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"ሙሉ የይለፍቃል መጠባበቂያህን እዚህ አስገባ።"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"ለሙሉ መጠባበቂያ አዲስ የይለፍ ቃል እዚህ አስገባ"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ሙሉ የይለፍቃል ምትኬህን እዚህ ዳግም ተይብ።"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ይቅር"</string>
     <string name="percentage" msgid="5866131581207788624">"+<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ተጨማሪ የስርዓት አዘምኖች"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"ተጠቃሚዎች አና ገደቦች"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"ተጠቃሚዎች"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"ተጠቃሚ አክል"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"ዝርዝሮችን አርትዕ"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"የተጠቃሚ መረጃ"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"ስም"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"የይዘት ገደቦች"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"ፒን ይፈልጋል"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"የይዘት ደረጃ አሰጣጥ"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"የስርዓት መተግበሪያዎች"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"የተጫኑ መተግበሪያዎች"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"አስወግድ"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"ተጠቃሚ አስወግድ"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"ረባሽ ልጅ"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"ተጠቃሚ ይወገድ?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"ከመሳሪያው ላይ ተጠቃሚውን እና ሁሉንም ተያያዥነት ያለው ውሂብ ለማስወገድ መፈለግህን እርግጠኛ ነህ?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"ማሳወቂያዎች አሳይ"</string>
+    <string name="help_label" msgid="1107174367904110532">"እገዛ"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 2546c39..b8fa065 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"جارٍ فصل الاتصال..."</item>
     <item msgid="1634960474403853625">"غير متصل"</item>
     <item msgid="746097431216080650">"غير ناجح"</item>
+    <item msgid="6367044185730295334">"تم حظرها"</item>
+    <item msgid="503942654197908005">"يتم تجنب الاتصال الضعيف مؤقتًا"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"جارٍ قطع الاتصال بـ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"غير متصل"</item>
     <item msgid="8578370891960825148">"غير ناجح"</item>
+    <item msgid="5660739516542454527">"تم حظرها"</item>
+    <item msgid="1805837518286731242">"يتم تجنب الاتصال الضعيف مؤقتًا"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"طبقة النقل الآمنة"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"زر الدفع"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"طبقة النقل الآمنة"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"لا شيء"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"رقم التعريف من نقطة الدخول"</item>
-    <item msgid="7364462169350112617">"رقم التعريف من هذا الجهاز"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"ثابت"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"بطاقة SD قابلة للإزالة"</item>
     <item msgid="4498124044785815005">"ترك القرار للنظام"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"إيقاف"</item>
-    <item msgid="4804571292609523335">"اهتزاز"</item>
-    <item msgid="595707141547423573">"كتم"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"قصيرة"</item>
     <item msgid="2560532955514699713">"متوسطة"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"حجم الرسوم المتحركة 5x"</item>
     <item msgid="6660750935954853365">"حجم الرسوم المتحركة 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"إيقاف الرسوم المتحركة"</item>
+    <item msgid="1138649021950863198">"حجم الرسوم المتحركة ‎.5x"</item>
+    <item msgid="4394388961370833040">"حجم الرسوم المتحركة 1x"</item>
+    <item msgid="8125427921655194973">"حجم الرسوم المتحركة 1.5x"</item>
+    <item msgid="3334024790739189573">"حجم الرسوم المتحركة 2x"</item>
+    <item msgid="3170120558236848008">"حجم الرسوم المتحركة 5x"</item>
+    <item msgid="1069584980746680398">"حجم الرسوم المتحركة 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"الحد القياسي"</item>
     <item msgid="4071574792028999443">"ليست هناك عمليات بالخلفية"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index acf2d4b..5157fab 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"نعم"</string>
     <string name="no" msgid="6731231425810196216">"لا"</string>
+    <string name="create" msgid="3578857613172647409">"إنشاء"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"منع استخدام طالب البلوتوث عندما تكون الشاشة مؤمّنة"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"أجهزة بلوتوث"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"اسم الجهاز"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"إعدادات الجهاز"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"إعدادات الملف الشخصي"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"لم يتم تعيين اسم، استخدام اسم الحساب"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"البحث عن أجهزة"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"إعادة تسمية الجهاز اللوحي"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"جارٍ الاقتران..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"جهاز بلوتوث بدون اسم"</string>
     <string name="progress_scanning" msgid="192587958424295789">"البحث"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"المس للإقران"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"لم يتم العثور على أجهزة بلوتوث بالجوار."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"طلب اقتران البلوتوث"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"طلب اقتران"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"المس للإقران مع <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"المس للإقران مع <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="device_picker" msgid="8398232791303186677">"منتقي جهاز البلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"طلب إذن بلوتوث"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"هل تريد السماح لأي تطبيق يريد تشغيل بلوتوث؟"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"يريد أحد التطبيقات على الجهاز اللوحي جعله قابلاً للاكتشاف بواسطة أجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد السماح بذلك؟"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"المس للاتصال بـ \"<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_acceptance_dialog_text" msgid="6555508756987053866">"يريد %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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"موافق"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"اسم المضيف الذي كتبته غير صالح."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"لم يتم تنسيق قائمة الاستبعاد التي كتبتها بشكل صحيح. اكتب قائمة مفصولة بفواصل للنطاقات المستبعدة."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"يجب عليك إكمال حقل المنفذ."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"يلزمك إكمال حقل المنفذ."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"يجب أن يكون حقل المنفذ فارغًا إذا كان حقل المضيف فارغًا."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"المنفذ الذي كتبته غير صالح."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"يستخدم المتصفح الخادم الوكيل HTTP، ولكنه ربما لا تستخدمه التطبيقات الأخرى."</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"تدخل التغييرات حيز التنفيذ عند إعادة توصيل كابل USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"تدخل التغييرات حيز التنفيذ عند إعادة توصيل كابل 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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"لم يتم تحميل وحدة تخزين USB."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"ليست هناك بطاقة 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="6691584887397909775">"يمكن إزالة وحدة تخزين USB بأمان الآن"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"يمكن الآن إزالة بطاقة SD بأمان"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"يتم استخدام وحدة تخزين USB كجهاز تخزين جماعي."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"بطاقة SD مستخدمة كجهاز تخزين جماعي."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"يمكن إزالة وحدة تخزين USB بأمان الآن."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"يمكن الآن إزالة بطاقة 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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"وحدة تخزين USB التي تم تحميلها للقراءة فقط."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"بطاقة SD تم تحميلها للقراءة فقط."</string>
     <string name="skip_label" msgid="47510779345218297">"تخطٍ"</string>
     <string name="next_label" msgid="4693520878012668114">"التالي"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"اللغة"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"عند السماح بتجوال البيانات، قد تتكلف رسوم تجوال مرتفعة!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"السماح بتجوال البيانات؟"</string>
     <string name="networks" msgid="6333316876545927039">"تحديد المشغل"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"اختيار مشغل شبكة"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"التاريخ والوقت"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"اختيار تنسيق التاريخ"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"تحسين مطابقة الوجه"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"التحقق من مدى الحياة"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"طلب طرفة عين أثناء إلغاء القفل"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها ووسائطها وغير ذلك من الملفات. بعد تشفير جهازك اللوحي، يجب إدخال رقم تعريف شخصي رقمي أو كلمة مرور لفك تشفيره في كل مرة يتم فيها تشغيله: لا يمكنك فك تشفير جهازك اللوحي إلا عن طريق إجراء إعادة الضبط بحسب بيانات المصنع، مما ينتج عنه مسح جميع بياناتك."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء مستخدمًا بطارية مشحونة مع بقاء الجهاز اللوحي متصلاً بالشاحن حتى الانتهاء من عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض البيانات أو جميعها."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها ووسائطها وغير ذلك من الملفات. بعد تشفير هاتفك، يجب إدخال رقم تعريف شخصي رقمي أو كلمة مرور لفك تشفيره في كل مرة يتم فيها تشغيله: لا يمكنك فك تشفير هاتفك إلا من خلال إجراء إعادة الضبط بحسب بيانات المصنع، مما ينتج عنه محو جميع بياناتك."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء مستخدمًا بطارية مشحونة مع بقاء الهاتف متصلاً بالشاحن حتى الانتهاء من عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض البيانات أو جميعها."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. بعد تشفير الجهاز اللوحي، يلزمك إدخال رقم تعريف شخصي رقمي أو كلمة مرور لإلغاء تشفيره عند كل مرة تجري فيها تشغيله: يتعذر عليك إلغاء تشفير جهازك اللوحي إلا عند إجراء إعادة ضبط بحسب بيانات المصنع وهو ما يؤدي إلى محو جميع البيانات."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة والإبقاء على توصيل الجهاز اللوحي بمصدر الكهرباء حتى تنتهي عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض بياناتك أو كلها."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. بعد تشفير الهاتف، يلزمك إدخال رقم تعريف شخصي رقمي أو كلمة مرور لإلغاء تشفيره عند كل مرة تجري فيها تشغيله: يتعذر عليك إلغاء تشفير هاتفك إلا عند إجراء إعادة ضبط بحسب بيانات المصنع وهو ما يؤدي إلى محو جميع البيانات."\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="2029407131227814893">"اشحن البطارية وأعد المحاولة."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"صل الشاحن وأعد المحاولة."</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_dialog_need_password_message" msgid="4071395977297369642">"يجب تعيين رقم تعريف شخصي أو كلمة مرور لتأمين الشاشة قبل أن تتمكن من بدء عملية التشفير."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"التشفير؟"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"لا يمكن التراجع عن عملية التشفير، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الجهاز اللوحي عدة مرات."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"لا يمكن التراجع عن عملية التشفير، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الهاتف عدة مرات."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"التشفير"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"انتظر حتى يتم تشفير الجهاز اللوحي. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"انتظر حتى يتم تشفير هاتفك. اكتمل <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="2223340178473871064">"اكتب كلمة المرور"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"لم يتم التشفير بنجاح"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. "\n\n"لاستئناف استخدام الجهاز اللوحي، يجب إجراء إعادة ضبط المصنع. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. "\n\n"لاستئناف استخدام الهاتف، يجب إجراء إعادة ضبط المصنع. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"تحديد قفل الشاشة"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. "\n\n"لاستئناف استخدام الجهاز اللوحي، يلزمك إجراء إعادة ضبط المصنع. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. "\n\n"لاستئناف استخدام الهاتف، يجب إجراء إعادة ضبط المصنع. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"تبديل أسلوب الإدخال"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"اختيار قفل الشاشة"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"اختر قفلاً للنسخ الاحتياطي"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"تأمين الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغيير تأمين الشاشة"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"تأمين الجهاز بالوجه"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"نقش"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"رقم التعريف الشخصي"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"كلمة المرور"</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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"يجب أن يكون رقم التعريف الشخصي %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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"يجب أن تكون كلمة المرور أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأحرف."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"يجب أن يكون رقم التعريف الشخصي أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأرقام."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"يجب ألا يحتوي رقم التعريف الشخصي سوى على أرقام من 0 إلى 9 فقط."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"لا يسمح مشرف الجهاز باستخدام رقم تعريف شخصي تم استخدامه مؤخرًا."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"تحتوي كلمة المرور على حرف غير مسموح به."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"يجب أن تحتوي كلمة المرور على رقم واحد على الأقل."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"يجب أن تحتوي كلمة المرور على رمز واحد على الأقل."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل"</item>
-    <item quantity="other" msgid="7278096339907683541">"يجب أن تحتوي كلمة المرور على %d من الأحرف على الأقل"</item>
+    <item quantity="one" msgid="3063853802158131458">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل."</item>
+    <item quantity="other" msgid="8186027808415585970">"يجب أن تحتوي كلمة المرور على %d من الأحرف على الأقل."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"يجب أن تحتوي كلمة المرور على حرف واحد صغير على الأقل"</item>
-    <item quantity="other" msgid="588499075580432178">"يجب أن تحتوي كلمة المرور على %d من الأحرف الصغيرة على الأقل"</item>
+    <item quantity="one" msgid="5583986519662091001">"يجب أن تحتوي كلمة المرور على حرف واحد صغير على الأقل."</item>
+    <item quantity="other" msgid="2693910942679679225">"يجب أن تحتوي كلمة المرور على %d من الأحرف الصغيرة على الأقل."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"يجب أن تحتوي كلمة المرور على حرف واحد كبير على الأقل"</item>
-    <item quantity="other" msgid="2183090598541826806">"يجب أن تحتوي كلمة المرور على %d من الأحرف الكبيرة على الأقل"</item>
+    <item quantity="one" msgid="2611909966725502768">"يجب أن تحتوي كلمة المرور على حرف واحد كبير على الأقل."</item>
+    <item quantity="other" msgid="3030801209112209245">"يجب أن تحتوي كلمة المرور على %d من الأحرف الكبيرة على الأقل."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"يجب أن تحتوي كلمة المرور على رقم عددي واحد على الأقل"</item>
-    <item quantity="other" msgid="995673409754935278">"يجب أن تحتوي كلمة المرور على %d من الأرقام العددية"</item>
+    <item quantity="one" msgid="3820355568839621231">"يجب أن تحتوي كلمة المرور على رقم عددي واحد على الأقل."</item>
+    <item quantity="other" msgid="4703982391407595924">"يجب أن تحتوي كلمة المرور على %d من الأرقام العددية."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"يجب أن تحتوي كلمة المرور على رمز خاص واحد على الأقل"</item>
-    <item quantity="other" msgid="3047460862484105274">"يجب أن تحتوي كلمة المرور على %d من الرموز الخاصة على الأقل"</item>
+    <item quantity="one" msgid="8456579939292408631">"يجب أن تحتوي كلمة المرور على رمز خاص واحد على الأقل."</item>
+    <item quantity="other" msgid="1221290525051187757">"يجب أن تحتوي كلمة المرور على %d من الرموز الخاصة على الأقل."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل ليس من الأحرف الأبجدية"</item>
-    <item quantity="other" msgid="5574191164708145973">"يجب أن تحتوي كلمة المرور على %d من الرموز على الأقل التي ليست أحرف"</item>
+    <item quantity="one" msgid="4594051152085925921">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل ليس من الأحرف الأبجدية."</item>
+    <item quantity="other" msgid="3952508584649046404">"يجب أن تحتوي كلمة المرور على %d من الرموز على الأقل التي ليست أحرفًا."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"لا يسمح مشرف الجهاز باستخدام كلمة مرور مؤخرة"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"لا يسمح مشرف الجهاز باستخدام كلمة مرور تم استخدامها مؤخرًا."</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="lock_setup" msgid="1759001157415978959">"اكتمل الإعداد"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"اكتملت عملية الإعداد."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"للإقران مع:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>اكتب مفتاح المرور المطلوب للجهاز:"</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_enter_pin_other_device" msgid="4637977124526813470">"قد يلزم أيضًا كتابة رقم التعريف الشخصي هذا على الجهاز الآخر."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"قد يلزم أيضًا كتابة مفتاح المرور هذا على الجهاز الآخر."</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="2796550001376088433">"للإقران مع:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>اكتب عليه:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ثم اضغط على Return أو Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"تعذر الإقران مع <xliff:g id="DEVICE_NAME">%1$s</xliff:g> نظرًا لوجود رقم تعريف شخصي أو مفتاح مرور غير صحيح."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"لا يمكن الاتصال بـ <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_connecting_error_message" msgid="229861986106185022">"تعذر الاتصال بـ <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"السماح بتبادل البيانات عندما يلمس الهاتف جهازًا آخر"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"السماح بتبادل البيانات عندما يلمس الهاتف جهازًا آخر"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"مستعد لنقل محتوى التطبيق عبر NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"إيقاف"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"غير متوفر بسبب إيقاف تشغيل NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"عندما يتم تشغيل هذه الميزة، يمكنك إرسال محتوى التطبيق إلى جهاز به اتصال NFC عن طريق الإمساك بالجهازين بالقرب من بعضهما. ويمكنك على سبيل المثال إرسال صفحات المتصفح ومقاطع فيديو YouTube وجهات اتصال الأشخاص، والمزيد. "\n" "\n"ما عليك سوى الجمع بين الجهازين (من الخلف عادة) ولمس الشاشة. وسيحدد التطبيق ما يتم إرساله."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"اكتشاف خدمة الشبكة"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"السماح للتطبيقات على الأجهزة الأخرى باكتشاف التطبيقات على هذا الجهاز"</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="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_setup_wizard_title" msgid="70277346338812325">"تحديد Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"لا يمكن فحص الشبكات"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"رسالة تنبيه بالشبكات"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"تنبيهي عند توفر شبكة مفتوحة"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"تجنب الاتصالات الضعيفة"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"عدم استخدام شبكات Wi-Fi ما لم يكن لها اتصال إنترنت لائق"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"تجنب الاتصالات الضعيفة"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"عدم استخدام شبكات Wi-Fi ما لم يكن لها اتصال إنترنت جيد"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"الاحتفاظ بـ 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_wps_pbc" msgid="2668564692207863017">"زر دفع WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"إدخال رقم تعريف شخصي في WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"اتصال 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_empty_list_wifi_on" msgid="3354911729026237372">"جارٍ البحث عن شبكات Wi-Fi..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"شبكة أخرى..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"المزيد"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"الإعداد التلقائي (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"عرض الخيارات المتقدمة"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"اكتب رقم التعريف الشخصي من نقطة الدخول"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"إعداد WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"اكتب رقم التعريف الشخصي <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_wps_setup_title" msgid="6034518116333042484">"إعداد Wi-Fi المحمي"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"جارٍ بدء WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"اضغط على زر الإعداد المحمي لشبكة Wi-Fi على الموجه. قد يكون اسمه \"WPS\" أو قد يحتوي على الرمز التالي:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"أدخل رقم التعريف الشخصي <xliff:g id="NUMBER">%1$s</xliff:g> في جهاز توجيه Wi-Fi. يمكن أن يستغرق إكمال الإعداد فترة قد تصل إلى دقيقتين."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"نجحت عملية WPS. جارٍ الاتصال بالشبكة…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"عملية WPS قيد التقدم فعلاً ويمكن أن يستغرق اكتمالها فترة قد تصل إلى دقيقتين"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"أخفقت عملية WPS. يرجى إعادة المحاولة خلال بضع دقائق."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"إعداد أمان جهاز التوجيه اللاسلكي (WEP) ليس متوافقًا"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"إعداد أمان جهاز التوجيه اللاسلكي (TKIP) ليس متوافقًا"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"أخفقت المصادقة. الرجاء إعادة المحاولة."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"تم اكتشاف جلسة WPS أخرى، الرجاء إعادة المحاولة خلال بضع دقائق."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID للشبكة"</string>
     <string name="wifi_security" msgid="6603611185592956936">"الأمان"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"قوة الإشارة"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"تم الحفظ"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"معطلة"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"تم تجنب اتصال الإنترنت الضعيف"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"تم تجاهل الشبكة بسبب سوء الاتصال. يمكنك إيقاف هذا السلوك من خلال شاشة الإعدادات &gt; Wi-Fi، عنصر قائمة \"إعدادات متقدمة\"."</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="3538912605343585226">"شبكة محمية متاحة"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (الشبكة المحمية متاحة)"</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_failed_connect_message" msgid="8491902558970292871">"أخفق التوصيل بالشبكة"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"حذف"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"أخفق حذف الشبكة"</string>
     <string name="wifi_save" msgid="3331121567988522826">"حفظ"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"أخفق حفظ الشبكة"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"إلغاء"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"تم اكتشاف جلسة WiFi محمية أخرى. أعد المحاولة في غضون بضع دقائق."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"نظام أسماء النطاقات 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"البوابة"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"طول بادئة الشبكة"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"اتصال Wi-Fi مباشر"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"إعداد اتصال نظير إلى نظير"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"اتصال Wi-Fi مباشر"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"معلومات الجهاز"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"إعداد Wi-Fi المحمي"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"اكتب رقم التعريف الشخصي"</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_remove_group" msgid="4844634506540667517">"إزالة مجموعة"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"متقدمة"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"الأجهزة المتاحة"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"البحث عن أجهزة"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"جارٍ البحث…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"إعادة تسمية الجهاز"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"أجهزة النظراء"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"تعذر الاتصال."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"تعذرت إعادة تسمية الجهاز."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"هل تريد قطع الاتصال؟"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"في حالة قطع الاتصال، سيتم إنهاء اتصالك بـ <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"في حالة قطع الاتصال، سيتم إنهاء اتصالك بـ <xliff:g id="PEER_NAME">%1$s</xliff:g> و<xliff:g id="PEER_COUNT">%2$s</xliff:g> من الأجهزة الأخرى."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"هل تريد إلغاء الدعوة؟"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"هل تريد إلغاء الدعوة للاتصال بـ <xliff:g id="PEER_NAME">%1$s</xliff:g>؟"</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_ap_text" msgid="61237027772641155">"إعداد نقطة اتصال 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="display_settings_title" msgid="1708697328627382561">"عرض"</string>
     <string name="sound_settings" msgid="5534671337768745343">"الصوت"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"وضع صامت"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"نغمة رنين الهاتف"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"مستويات الصوت"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"تأثيرات موسيقية"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"مستوى صوت الرنين"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"اهتزاز عند تشغيل الوضع صامت"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"الاهتزاز والرنين"</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>
@@ -614,23 +637,28 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"كتم صوت نغمة الرنين والإشعارات"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"كتم صوت الموسيقى والوسائط الأخرى"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"كتم صوت الإشعارات"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"كتم صوت التنبيهات"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"اهتزاز عند الرنين"</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_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="9015625921245904495">"يجب إرساء الجهاز اللوحي قبل إعداد إعدادات الإرساء الصوتية."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"يجب إرساء الهاتف قبل إعداد إعدادات الإرساء الصوتية."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"يلزمك إرساء الجهاز اللوحي قبل تهيئة إعدادات الإرساء الصوتية."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"يلزمك إرساء الهاتف قبل تهيئة إعدادات الإرساء الصوتية."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"صوت إدراج الإرساء"</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="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"عدم تشغيل صوت عند إدراج أو إزالة الهاتف من الإرساء"</string>
+    <string name="account_settings" msgid="6403589284618783461">"الحسابات"</string>
     <string name="search_settings" msgid="1910951467596035063">"بحث"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"إدارة إعدادات البحث والسجل"</string>
     <string name="display_settings" msgid="7965901687241669598">"الشاشة"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"إصدار 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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"هل تريد مسح جميع المعلومات الشخصية والتطبيقات التي تم تنزيلها؟ لا يمكنك عكس هذا الإجراء!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"مسح كل شيء"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ارسم نقش إلغاء التأمين"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"يجب رسم نقش إلغاء التأمين لتأكيد إعادة ضبط بيانات المصنع."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"يلزمك رسم نقش إلغاء التأمين لتأكيد إعادة الضبط بحسب بيانات المصنع."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"لم يتم تنفيذ إعادة التعيين نظرًا لعدم توفر خدمة System Clear."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"هل تريد إعادة الضبط؟"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"محو وحدة تخزين USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"هل تريد محو بطاقة 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="nosdcard" msgid="2192044794228379224">"يلزمك رسم نقش إلغاء التأمين للتأكيد على أنك تريد محو وحدة تخزين USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"يلزمك رسم نقش إلغاء التأمين للتأكيد على أنك تريد محو وحدة بطاقة 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="6688416425801386511">"ربط USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"شبكات الجوال"</string>
     <string name="location_title" msgid="1029961368397484576">"موقعي"</string>
     <string name="location_network_based" msgid="5569673665032992664">"خدمة الموقع من Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"السماح للتطبيقات باستخدام بيانات من مصادر مثل شبكة Wi-Fi وشبكات الجوال لتحديد موقعك التقريبي"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"السماح بإرسال بيانات موقع مجهولة المصدر إلى Google. والسماح أيضًا للتطبيقات المسموح بها باستخدام البيانات من موارد مثل شبكات 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"اضغط على \"القائمة\" للمساعدة."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"تحرير الإصبع عند الانتهاء."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"صل <xliff:g id="NUMBER">%d</xliff:g> من النقاط على الأقل. حاول مرة أخرى:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"تم تسجيل النقش!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"تم تسجيل النقش."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"رسم النقش مرة أخرى للتأكيد:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"نقش إلغاء تأمينك الجديد:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"تأكيد"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"التالي"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"تأمين الجهاز اللوحي"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"تأمين الهاتف"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"يمكنك حماية الجهاز اللوحي من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط بأي ترتيب في الشاشة التالية. يجب توصيل أربع نقاط على الأقل."\n\n"هل أنت مستعد للبدء؟ المس \"التالي\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"يمكنك حماية الجهاز اللوحي من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط بأي ترتيب في الشاشة التالية. يلزمك توصيل أربع نقاط على الأقل."\n\n"هل أنت مستعد للبدء؟ المس \"التالي\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"يمكنك حماية الهاتف من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط لتوصيل أربع نقاط على الأقل بأي ترتيب في الشاشة التالية. "\n\n"هل أنت مستعد للبدء؟ المس \"التالي\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"إدارة التطبيقات"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"إدارة التطبيقات المثبتة وإزالتها"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"إدارة التطبيقات، إعداد اختصارات التشغيل السريع"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"إعدادات التطبيق"</string>
     <string name="install_applications" msgid="4872012136210802181">"مصادر غير معروفة"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"السماح بتثبيت تطبيقات بخلاف تطبيقات Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"السماح بتثبيت التطبيقات من مصادر غير معروفة"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"تكون بيانات جهازك اللوحي وبياناتك الشخصية أكثر عرضة للهجوم من خلال التطبيقات مجهولة المصادر. أنت توافق على أنك المسؤول الوحيد عن أي ضرر لجهازك اللوحي أو أي فقدان للبيانات ينتج عن استخدام هذه التطبيقات."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"تكون بيانات هاتفك وبياناتك الشخصية أكثر عرضة للهجوم من خلال التطبيقات مجهولة المصادر. أنت توافق على أنك المسؤول الوحيد عن أي ضرر لهاتفك أو أي فقدان للبيانات ينتج عن استخدام هذه التطبيقات."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"الإعدادات المتقدمة"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"معلومات التطبيق"</string>
     <string name="storage_label" msgid="8700867073480107253">"التخزين"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"تشغيل بشكل افتراضي"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"الإعدادات الافتراضية"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"توافق الشاشة"</string>
     <string name="permissions_label" msgid="2605296874922726203">"الأذونات"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"ذاكرة التخزين المؤقت"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"محو البيانات"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"إزالة التحديثات"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"لقد اخترت تشغيل هذا التطبيق بشكل افتراضي لبعض الإجراءات."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"لقد اخترت السماح لهذا التطبيق بإنشاء الأدوات والوصول إلى بياناتها."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"لم يتم تعيين إعدادات افتراضية."</string>
     <string name="clear_activities" msgid="7408923511535174430">"محو الإعدادات الافتراضية"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"ربما لم يتم تصميم هذا التطبيق ليلائم شاشتك، يمكنك التحكم في كيفية ضبطه ليلائم شاشتك هنا."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"تصنيف بحسب الحجم"</string>
     <string name="show_running_services" msgid="5736278767975544570">"عرض الخدمات المشغلة"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"عرض العمليات المخزنة مؤقتًا"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"إعادة تعيين تفضيلات التطبيقات"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"هل تريد إعادة تعيين تفضيلات التطبيقات؟"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"سيؤدي هذا إلى إعادة تعيين جميع تفضيلات:"\n\n" "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات الافتراضية للإجراءات"</li>\n" "<li>"قيود بيانات الخلفية للتطبيقات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"إعادة تعيين التطبيقات"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"إدارة المساحة"</string>
     <string name="filter" msgid="2018011724373033887">"تصفية"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"اختر خيارات التصفية"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"يمكن لهذا التطبيق الدخول إلى ما يلي على الجهاز اللوحي:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"يمكن لهذا التطبيق الدخول إلى ما يلي على هاتفك:"</string>
     <string name="computing_size" msgid="1599186977475211186">"جارٍ الحساب..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"يتعذر حساب حجم الحزمة"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"يتعذر حساب حجم الحزمة."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"ليست لديك أية تطبيقات لجهات خارجية مثبتة."</string>
     <string name="version_text" msgid="9189073826278676425">"الإصدار <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"نقل"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"تغيير موقع التثبيت المفضل للتطبيقات الجديدة"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"هل تريد تعطيل التطبيق المضمن؟"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"إذا تم تعطيل التطبيق المضمن، فقد تعمل التطبيقات الأخرى بشكل غير صحيح."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"هل تريد إيقاف الإشعارات؟"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"إذا كنت قد أجريت إيقافًا للإشعارات حول هذا التطبيق، فقد تفوتك تنبيهات وتحديثات مهمة."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"استخدام وحدة التخزين"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"عرض سعة التخزين المستخدمة بواسطة التطبيقات"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"الخدمات قيد التشغيل"</string>
@@ -1043,7 +1079,7 @@
     <!-- 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="service_foreground_processes" msgid="7583975676795574276">"مستخدَم: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory" msgid="6609961111091483458">"ذاكرة الوصول العشوائي"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"يمكن أن يكون أسلوب الإدخال هذا قادرًا على جمع كل النصوص التي تكتبها، بما في ذلك البيانات الشخصية مثل كلمات المرور وأرقام بطاقات الائتمان. يتم الحصول على هذا الأسلوب من التطبيق <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. هل تريد استخدام أسلوب الإدخال هذا؟"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"يمكن أن يكون المدقق الإملائي هذا قادرًا على جمع كل النص الذي كتبته، بما في ذلك البيانات الشخصية مثل كلمات المرور وأرقام بطاقات الائتمان. يتم إحضار ذلك من التطبيق <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. هل تريد استخدام هذا المدقق الإملائي؟"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"الإعدادات"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"اللغة"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"أخفق فتح الإعدادات لـ <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"الماوس/لوحة اللمس"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"سرعة المؤشر"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"وحدة التحكم في الألعاب"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"استخدام الاهتزاز"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"إعادة توجيه الاهتزاز إلى وحدة التحكم في الألعاب عند الاتصال."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"اختيار تخطيط لوحة مفاتيح"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"إعداد تخطيطات لوحة المفاتيح"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"للتبديل، اضغط على ctrl-مسافة"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"افتراضي"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"تخطيطات لوحة المفاتيح"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"قاموس المستخدم"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"قاموس شخصي"</string>
     <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_add_screen_title" msgid="742580720124344291">"عبارة"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"خيارات أكثر"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"خيارات أقل"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"موافق"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"الكلمة:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"الاختصار:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"اللغة:"</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="8165273379942105271">"ليست لديك أية كلمات في قاموس المستخدم. يمكنك إضافة كلمة من خلال لمس الزر \"إضافة\" (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"جميع اللغات"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"لجميع اللغات"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"مزيد من اللغات..."</string>
     <string name="testing" msgid="6584352735303604146">"الاختبار"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"معلومات الجهاز اللوحي"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"معلومات الهاتف"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"تعيين خيارات تطوير التطبيق"</string>
     <string name="enable_adb" msgid="7982306934419797485">"تصحيح أخطاء USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"وضع تصحيح الأخطاء عند توصيل USB"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"معرف جهاز التطوير"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"معلومات الجهاز غير متاحة"</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="7316799925425402244">"تم تصميم تصحيح أخطاء USB لأغراض التطوير فقط. يمكن استخدامه لنسخ البيانات بين الكمبيوتر والجهاز، وتثبيت التطبيقات على جهازك بدون تنبيه، وقراءة بيانات السجل."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"هل تريد السماح لإعدادات التطوير؟"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"هذه الإعدادات مخصصة لاستخدام التطوير فقط. قد يتسبب هذا في حدوث أعطال أو خلل في أداء الجهاز والتطبيقات المثبتة عليه."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"حماية وحدة تخزين USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"يجب على التطبيقات طلب الإذن لقراءة وحدة تخزين USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"هل تريد حماية وحدة تخزين USB؟"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"إذا كانت وحدة تخزين USB محمية، يجب على التطبيقات طلب إذن لقراءة البيانات من وحدة التخزين الخارجية."\n\n"ربما لن تعمل بعض التطبيقات إلى أن يحدثها مطورو برامجها."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"حماية بطاقة SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"يجب على التطبيقات طلب الإذن لقراءة بطاقة SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"هل تريد حماية بطاقة SD؟"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"إذا كانت بطاقة SD محمية، يجب على التطبيقات طلب إذن لقراءة البيانات من وحدة التخزين الخارجية."\n\n"ربما لن تعمل بعض التطبيقات إلى أن يحدثها مطورو برامجها."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"اختيار أداة"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"اختيار أداة"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"هل تريد إنشاء الأداة والسماح بالوصول؟"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"بعد إنشاء الأداة، بإمكان <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> الوصول إلى كل البيانات التي تعرضها هذه الأداة."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"السماح دومًا لـ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> بإنشاء الأدوات والوصول إلى بياناتها"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"نص كبير"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"زر التشغيل ينهي الاتصال"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"نطق كلمات المرور"</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="3264723681038625967">"تثبيت النصوص البرمجية من الويب"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"تحسين إمكانية الدخول إلى الويب"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"لم يتم تثبيت أية خدمات"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"هل تحتاج إلى قارئ شاشة؟"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"يقدم TalkBack تعليقات منطوقة لمساعدة المستخدمين من المكفوفين وضعاف البصر. هل تريد تثبيته مجانًا من Android Market؟"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"هل تريد تثبيت النصوص البرمجية من الويب؟"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"هل تريد تثبيت نصوص برمجية من Google بواسطة التطبيقات لتسهيل الدخول إلى محتواها على الويب؟"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"تعمل هذه الميزة على تغيير الطريقة التي يستجيب بها الجهاز إلى اللمس. هل تريد تشغيلها؟"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"لم يتم تقديم أي وصف."</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_not_available" msgid="3214000535532434353">"بيانات استخدام البطارية غير متاحة."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1226,7 +1287,7 @@
     <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_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>
@@ -1273,19 +1334,19 @@
     <string name="tts_default_settings_section" msgid="5787915620218907443">"الإعدادات الافتراضية"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"المحرك الافتراضي"</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_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_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_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" msgid="3305141107104670703">"لا يمكن تشغيل المحرك الذي اخترته."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"تهيئة"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"اختيار محرك آخر"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"ربما يمكن لمحرك اصطناع الحديث جمع كل النص التي سيتم نطقه، بما في ذلك البيانات الشخصية مثل كلمات المرور وأرقام بطاقة الائتمان. يتم إحضار ذلك من المحرك <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. هل تريد تمكين استخدام محرك اصطناع الحديث هذا؟"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"تمكين محرك جديد قبل الاستخدام."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"ارسم نقش إلغاء القفل"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"يجب عليك رسم نقش إلغاء القفل لتأكيد تثبيت بيانات الاعتماد."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"اكتب كلمة المرور لوحدة تخزين بيانات الاعتماد."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"كلمة المرور الحالية:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"تم مسح تخزين بيانات الاعتماد."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"تعذر محو وحدة تخزين بيانات الاعتماد."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"تم تمكين تخزين بيانات الاعتماد."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"يجب تعيين رقم تعريف شخصي لتأمين الشاشة أو كلمة مرور حتى تتمكن من استخدام وحدة تخزين بيانات الاعتماد."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"يلزمك تعيين رقم تعريف شخصي لتأمين الشاشة أو كلمة مرور حتى تتمكن من استخدام وحدة تخزين بيانات الاعتماد."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"نغمة الطوارئ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"تعيين السلوك عند إجراء اتصال بالطوارئ"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"نسخ احتياطي وإعادة تعيين"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"استرداد تلقائي"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"استعادة الإعدادات والبيانات التي تم نسخها احتياطيًا عند تثبيت أحد التطبيقات"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"كلمة مرور احتياطية للكمبيوتر"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"النسخ الاحتياطية الكاملة لسطح المكتب غير محمية في الوقت الحالي."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"تحديد لتغيير كلمة مرور النسخ الاحتياطية الكاملة لسطح المكتب أو إزالتها"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"النسخ الاحتياطية الكاملة لسطح المكتب غير محمية في الوقت الحالي"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"المس لتغيير كلمة مرور النسخ الاحتياطية الكاملة لسطح المكتب أو إزالتها"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"هل تريد إيقاف النسخ الاحتياطي لكلمات مرور Wi-Fi، والإشارات المرجعية والإعدادات الأخرى وبيانات التطبيق ومحو كل النسخ على خوادم Google؟"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"إعدادات إدارة الجهاز"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"هذا المشرف نشط ويسمح للتطبيق <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">"نغمة الرنين والتنبيهات"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"التنبيهات"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"النظام"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"نغمة الرنين والاهتزاز عند الاتصال"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"النظام"</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="3747859666621319757">"جارٍ الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"أخفقت المزامنة"</string>
+    <string name="sync_active" msgid="8476943765960863040">"المزامنة نشطة"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"مزامنة"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"تواجه المزامنة حاليًا بعض المشاكل. وسوف تكون متاحة خلال وقت قصير."</string>
     <string name="add_account_label" msgid="7811707265834013767">"إضافة حساب"</string>
     <string name="background_data" msgid="5779592891375473817">"بيانات الخلفية"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"المزامنة قيد التشغيل"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"المزامنة متوقفة"</string>
     <string name="sync_error" msgid="5060969083117872149">"خطأ في المزامنة"</string>
+    <string name="last_synced" msgid="4242919465367022234">"تاريخ آخر مزامنة: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"تجري المزامنة الآن..."</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"مرحبًا بك في مزامنة Google!"</font>" "\n"وهي الطريقة التي تتبعها Google لمزامنة البيانات للسماح بالدخول إلى جهات الاتصال والمواعيد والمزيد من أي مكان تتواجد فيه."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"إعدادات مزامنة التطبيق"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"البيانات والمزامنة"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"تغيير كلمة المرور"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"هذا الحساب مطلوب من قِبل بعض التطبيقات. ولا يمكنك إزالته إلا من خلال إجراء إعادة ضبط الجهاز اللوحي بحسب إعدادات المصنع الافتراضية (والتي تعمل على حذف جميع بياناتك الشخصية) في الإعدادات &gt; النسخ الاحتياطي وإعادة الضبط."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"هذا الحساب مطلوب من قِبل بعض التطبيقات. ولا يمكنك إزالته إلا من خلال إجراء إعادة ضبط الهاتف بحسب إعدادات المصنع الافتراضية (والتي تعمل على حذف جميع بياناتك الشخصية) في الإعدادات &gt; النسخ الاحتياطي وإعادة الضبط."</string>
     <string name="provider_label" msgid="7724593781904508866">"اشتراكات يعرضها الناشر"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"مزامنة <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"لا يمكن المزامنة يدويًا"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"مزامنة هذا العنصر معطّلة في الوقت الحالي. لتغيير هذا الإعداد، شغّل بشكل مؤقت بيانات الخلفية والمزامنة التلقائية."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"إعدادات 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"عنوان 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"اكتب كلمة المرور لتشفير وحدة التخزين"</string>
     <string name="try_again" msgid="4272075051293936921">"أعد المحاولة."</string>
-    <string name="service_busy" msgid="2325014135156127705">"الخدمة مشغولة. أعد المحاولة."</string>
     <string name="delete" msgid="4219243412325163003">"حذف"</string>
     <string name="misc_files" msgid="6720680815969643497">"ملفات متنوعة"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"تحديد الكل"</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="debug_debugging_category" msgid="6781250159513471316">"تصحيح الأخطاء"</string>
+    <string name="debug_app" msgid="8349591734751384446">"تحديد التطبيق لتصحيحه"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"لم يتم تعيين تطبيق لتصحيحه"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"تطبيق التصحيح: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"تحديد تطبيق"</string>
+    <string name="no_application" msgid="2813387563129153880">"لا شيء"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"انتظار برنامج التصحيح"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"ينتظر التطبيق قيد التصحيح انضمام برنامج التصحيح قبل التنفيذ"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"الإدخال"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"رسم"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"المراقبة"</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_screen_updates" msgid="5470814345876056420">"عرض تحديثات السطح"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"وميض أسطح النوافذ بالكامل عندما يتم تحديثها"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"إظهار تحديثات عرض GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"وميض العروض داخل النوافذ عندما يتم الرسم باستخدام وحدة معالجة الرسومات"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"تعطيل تراكبات الأجهزة"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"استخدام وحدة معالجة الرسومات دائمًا لتركيب الشاشة"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"تمكين الآثار"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"تحديد الآثار الممكنة"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"ليست هناك آثار ممكنة حاليًا"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"تم تمكين <xliff:g id="NUM">%1$d</xliff:g> من الآثار حاليًا"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"تم تمكين جميع الآثار حاليًا"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"عرض حدود المخطط"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"عرض حدود وهوامش المقطع وما إلى ذلك."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"عرض استخدام CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"عرض تراكب الشاشة لاستخدام CPU الحالي"</string>
-    <string name="force_hw_ui" msgid="6426383462520888732">"فرض عرض وحدة معالجة الرسومات"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"استخدام تسارع الأجهزة ثنائي الأبعاد في التطبيقات"</string>
+    <string name="force_hw_ui" msgid="6426383462520888732">"فرض عرض رسومات GPU"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"فرض استخدام وحدة معالجة الرسومات للرسم ثنائي الأبعاد"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"رسم مخطط لعرض GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"قياس وقت العرض بـ adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"حجم الرسوم المتحركة للنافذة"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"حجم الرسوم المتحركة للنقل"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"طول مدة الرسوم المتحركة"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"التطبيقات"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"عدم الاحتفاظ بالأنشطة"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"مسح كل نشاط فور مغادرة المستخدم له"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"نقاط اتصال الجوال"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"مزامنة البيانات تلقائيًا"</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="8621855507876539282">"لم يستخدم أي تطبيق البيانات خلال هذه الفترة."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"المقدمة"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"الخلفية"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"يتم حسابه بواسطة الجهاز اللوحي. وقد يختلف حساب استخدام بيانات مشغل شبكة الجوال."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"يتم حسابه بواسطة الهاتف. وقد يختلف حساب استخدام بيانات مشغل شبكة الجوال."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"مقيَّد"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"هل تريد تعطيل بيانات الجوال؟"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"تعيين حد لبيانات الجوال"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"تعيين حد بيانات لـ 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"الجوال"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"لا شيء"</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="8430240158135453271">"عرض إعدادات التطبيق"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"تقييد بيانات الخلفية"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"تعطيل بيانات الخلفية في شبكة بيانات الجوال فقط. سيتم استخدام شبكة Wi-Fi إن كانت متاحة."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"تعطيل بيانات الخلفية في شبكات الجوال فقط. سيتم استخدام شبكة بخلاف شبكة الجوال إن كانت متاحة."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"لتقييد بيانات الخلفية لهذا التطبيق، فعين أولاً حدًا لبيانات الجوال."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"هل تريد تقييد بيانات الخلفية؟"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"قد تتسبب هذه الميزة في إيقاف تطبيق يعتمد على بيانات الخلفية عندما لا تكون شبكة Wi-Fi متاحة."\n\n"يمكن العثور على المزيد من البيانات المناسبة عن عناصر التحكم في الاستخدام في الإعدادات المتاحة من داخل التطبيق."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"قد تتسبب هذه الميزة في توقف تطبيق يعتمد على بيانات الخلفية عن العمل عند توفر شبكات جوال فقط."\n\n"يمكنك العثور على المزيد من عناصر التحكم المناسبة في استخدام البيانات من خلال الإعدادات المتوفرة داخل التطبيق."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"تقييد بيانات الخلفية ممكن فقط إذا عينت حدًا لبيانات الجوال."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"تشغيل مزامنة البيانات تلقائيًا؟"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"سيتم نسخ أية تغييرات تجريها على حساباتك على الويب تلقائيًا إلى جهازك اللوحي."\n\n"ويمكن أن تنسخ بعض الحسابات أيضًا اية تغييرات تجريها على الجهاز اللوحي تلقائيًا إلى الويب. يعمل حساب Google بهذه الطريقة."\n\n"لاختيار أنواع المعلومات المراد مزامنتها داخل كل حساب، انتقل إلى الإعدادات &gt; الحسابات."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"سيتم نسخ أية تغييرات تجريها على حساباتك على الويب تلقائيًا إلى هاتفك."\n\n"ويمكن أن تنسخ بعض الحسابات أيضًا اية تغييرات تجريها على الهاتف تلقائيًا إلى الويب. يعمل حساب Google بهذه الطريقة."\n\n"لاختيار أنواع المعلومات المراد مزامنتها داخل كل حساب، انتقل إلى الإعدادات &gt; الحسابات."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"إيقاف مزامنة البيانات تلقائيًا؟"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"سيؤدي هذا إلى الحفاظ على استخدام البيانات والبطارية، ولكنك ستحتاج إلى مزامنة كل حساب يدويًا لجمع المعلومات الحديثة. ولن تتلقى إشعارات عند حدوث التحديثات."</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_warning_editor_title" msgid="3704136912240060339">"تعيين تحذير استخدام البيانات"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"تعيين حد استخدام البيانات"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"وضع حد لاستخدام البيانات"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"سيتم تعطيل اتصال بيانات <xliff:g id="NETWORKS">%1$s</xliff:g> عند الوصول إلى الحد المحدد."\n\n"نظرًا لأنه يتم حساب استخدام البيانات بواسطة الجهاز اللوحي، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"سيتم تعطيل اتصال بيانات <xliff:g id="NETWORKS">%1$s</xliff:g> عند الوصول إلى الحد المحدد."\n\n"نظرًا لأنه يتم حساب استخدام البيانات بواسطة الهاتف، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"سيتم تعطيل اتصال بيانات الجوال عند الوصول إلى الحد المحدد."\n\n"نظرًا لأنه يتم حساب استخدام البيانات بواسطة جهازك اللوحي، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"سيتم تعطيل اتصال بيانات الجوال عند الوصول إلى الحد المحدد."\n\n"نظرًا لأنه يتم حساب استخدام البيانات بواسطة الهاتف، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"هل تريد تقييد بيانات الخلفية؟"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"في حال تقييد بيانات الجوال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام حوالي <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا، وفقًا لحساب الجهاز اللوحي. قد يختلف حساب استخدام البيانات لدى مشغل شبكة الجوال."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا، وفقًا لحساب الهاتف. قد يختلف حساب استخدام البيانات لدى مشغل شبكة الجوال."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"نقاط اتصال الجوال"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"حدد شبكات Wi-Fi التي تعد نقاط اتصال جوال. يمكن تقييد استخدام التطبيقات لهذه الشبكات عندما تكون في الخلفية. كما يمكن أن تحصل على تنبيه من التطبيقات قبل استخدام هذه الشبكات مع عمليات التنزيل الكبيرة."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبكات الجوال"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"شبكات Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"لتحديد نقاط اتصال جوال، شغِّل Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"تعديل ملف شخصي لشبكة ظاهرية خاصة (VPN)"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"الاتصال بـ <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"إضافة ملف شخصي لشبكة ظاهرية خاصة (VPN)"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"تعديل الملف الشخصي"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"حذف الملف الشخصي"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"ليس هناك اتصال بالشبكة. الرجاء إعادة المحاولة لاحقًا."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"الشهادة مفقودة. الرجاء تعديل الملف الشخصي."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"بعد تشغيل \"الاستكشاف من خلال اللمس\"، يمكنك لمس الشاشة للتعرف على ما يوجد تحت إصبعك. على سبيل المثال، تحتوي الشاشة الحالية على رموز تطبيقات. اعثر على أحدها من خلال لمس الشاشة وتمرير إصبعك حولها."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"جيد، استمر في تمرير إصبعك عبر الشاشة حتى تعثر على رمز آخر على الأقل."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"لتنشيط عنصر تلمسه، انقر عليه. مرر إصبعك حتى تعثر على رمز <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="8764686624055084454">"للتمرير عبر قائمة، يمكنك تمرير إصبعين عبر الشاشة. على سبيل المثال، تشتمل الشاشة الحالية على قائمة بأسماء التطبيقات التي يمكن تمريرها إلى أعلى وإلى أسفل. أولاً، حاول تعريف عناصر قليلة في القائمة من خلال تمرير إصبع واحد عبرها."</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="3055831259260848004">"لقد أكملت البرنامج التعليمي. للخروج، ابحث عن الزر <xliff:g id="FINISH">%s</xliff:g> والمسه."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"تصحيح الإملاء"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"المدقق الإملائي"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"اكتب كلمة المرور الحالية للنسخة الاحتياطية الكاملة هنا"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"اكتب كلمة مرور جديدة للنسخ الاحتياطية الكاملة هنا"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"أعد كتابة كلمة المرور الجديدة للنسخة الاحتياطية الكاملة هنا"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"إلغاء"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"تحديثات إضافية للنظام"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"المستخدمون والقيود"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"المستخدمون"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"إضافة مستخدم"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"تعديل التفاصيل"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"معلومات المستخدم"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"الاسم"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"قيود المحتوى"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"رقم التعريف الشخصي مطلوب"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"تقييم المحتوى"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"تطبيقات النظام"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"التطبيقات المثبتة"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"إلغاء"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"إزالة مستخدم"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"طفل مزعج"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"إزالة المستخدم؟"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"هل تريد بالتأكيد إزالة المستخدم وجميع البيانات المرتبطة به من الجهاز؟"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"إظهار الإشعارات"</string>
+    <string name="help_label" msgid="1107174367904110532">"مساعدة"</string>
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 8c5742a..eb58bcd 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Адлучэнне..."</item>
     <item msgid="1634960474403853625">"Адключана"</item>
     <item msgid="746097431216080650">"Няўдала"</item>
+    <item msgid="6367044185730295334">"Заблакiравана"</item>
+    <item msgid="503942654197908005">"Дрэнная сувязь часова пазбегнута"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Адключэнне ад сеткі <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"Адключана"</item>
     <item msgid="8578370891960825148">"Няўдала"</item>
+    <item msgid="5660739516542454527">"Заблакiравана"</item>
+    <item msgid="1805837518286731242">"Дрэнная сувязь часова пазбегнута"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Націсніце кнопку"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Няма"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN-код для кропкі доступу"</item>
-    <item msgid="7364462169350112617">"PIN-код для гэтай прылады"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Статычны"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Зменная SD-карта"</item>
     <item msgid="4498124044785815005">"Няхай вырашыць сістэма"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Адключана"</item>
-    <item msgid="4804571292609523335">"Вібрацыя"</item>
-    <item msgid="595707141547423573">"Выключыць гук"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кароткі"</item>
     <item msgid="2560532955514699713">"Сярэдні"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Маштаб анімацыі 5x"</item>
     <item msgid="6660750935954853365">"Маштаб анімацыі 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Анімацыя выключана"</item>
+    <item msgid="1138649021950863198">"Маштаб анімацыі 0.5x"</item>
+    <item msgid="4394388961370833040">"Маштаб анімацыі 1x"</item>
+    <item msgid="8125427921655194973">"Маштаб анімацыі 1.5x"</item>
+    <item msgid="3334024790739189573">"Маштаб анімацыі 2x"</item>
+    <item msgid="3170120558236848008">"Маштаб анімацыі 5x"</item>
+    <item msgid="1069584980746680398">"Маштаб анімацыі 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартны ліміт"</item>
     <item msgid="4071574792028999443">"Няма фонавых працэсаў"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index df0bbe1..00d5be4 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Так"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
+    <string name="create" msgid="3578857613172647409">"Стварыць"</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>
@@ -111,6 +112,8 @@
     <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_device_details" msgid="4594773497930028085">"Налады прылады"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Налады профілю"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Імя не заданае, выкарыстоўваецца імя ўліковага запісу"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Шукаць прылады"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Перайменаваць планшэт"</string>
@@ -131,13 +134,12 @@
     <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="5655704645616731277">"Краніце, каб злучыць"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Прылады 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="1931617700075106801">"Дакранiцеся, каб падлучыцца да прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Дакранiцеся, каб падлучыцца да прылады <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="device_picker" msgid="8398232791303186677">"Выбiрае Bluetooth-прыладу"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запыт дазволу Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Прыкладанне спрабуе ўключыць Bluetooth. Дазволіць?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Прыкладанне на планшэце хоча зрабіць яго бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Дазволіць?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Націсніце, каб падключыцца да прылады \"<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_acceptance_dialog_text" msgid="6555508756987053866">"%1$s спрабуе атрымаць доступ да вашых кантактаў і гісторыі выклікаў. Дазволіць доступ тэлефоннай кнiзе %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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ОК"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Вы ўвялі несапраўднае імя вузла."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Спіс выключэнняў, які вы ўвялі, мае няправільны фармат. Увядзіце спіс выключаных даменаў праз коску."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Неабходна запоўніць поле порта."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Трэба запоўніць поле порта."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поле парта павінна быць пустым, калі поле хоста пустое."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Несапраўдны ўведзены порт."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі HTTP выкарыстоўваецца браўзэрам, але ён не можа выкарыстоўвацца іншымі прыкладаннямi"</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"Змены ўступяць у сілу, калі USB-кабель будзе зноў падлучаны"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Змены ўступяць у сілу, калі 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_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-назапашвальнiк не ўсталяваны"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Няма карты памяці SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB-назапашв. не падключаны."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Няма SD-карты."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Даступныя байты:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-назапашвальнiк выкарыстоўваецца ў якасці накапляльнай прылады"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-карта выкарыстоўваецца ў якасці накапляльніку"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Можна бяспеч. зняць USB-назап."</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Зараз можна бяспечна выдалiць SD-карту"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"У як. ун. назап. вык. USB-наз."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"У якасцi унiверсальнага назапашвальнiка выкарыстоўваецца SD-карта."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Можна бяспеч. выдал. USB-наз."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Зараз можна бяспечна выдалiць 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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB-наз. толькі для чытання."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD-карта падключана толькі для чытання."</string>
     <string name="skip_label" msgid="47510779345218297">"Прапусціць"</string>
     <string name="next_label" msgid="4693520878012668114">"Далей"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Мова"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Злучацца са службамi перадачы дадзеных ў роўмінгу"</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="roaming_warning" msgid="7625933694709170887">"Калі вы дазваляеце перадачу дадзеных у роўмінгу, з вас можа спаганяцца плата."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Дазволіць перадачу дадзеных у роўмінгу?"</string>
     <string name="networks" msgid="6333316876545927039">"Выбар аператара"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Выбраць аператара сеткі"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата і час"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"Выберыце фармат даты"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Паляпшэнне супастаўлення твараў"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Праверка сапраўднасцi"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Патрабаваць міргнуць вачамі пры разблакiроўцы"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля шыфроўкі планшэта неабходна ўвесці лічбавы PIN-код або пароль, каб расшыфроўваць планшэт пры кожным уключэнні. Вы можаце расшыфраваць планшэт, толькі выканаўшы скід налад дадзеных, выдаляючы ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну або больш. Пачынаць шыфраванне трэба з зараджанай батарэяй і не адключаць планшэт да завяршэння шыфравання. Калі працэс шыфравання перапынецца, вы страціце ўсё або некаторыя з вашых дадзеных."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля шыфроўкі тэлефона неабходна ўвесці лічбавы PIN-код або пароль, каб расшыфроўваць тэлефон пры кожным уключэнні. Вы можаце расшыфраваць тэлефон, толькі выканаўшы скід налад дадзеных, выдаляючы ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну або больш. Пачынаць шыфраванне трэба з зараджаным акумулятярам і не адключаць тэлефон да завяршэння шыфравання. Калі працэс шыфравання перапынiцца, вы страціце ўсе або некаторыя дадзеныя."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля зашыфроўкі планшэта кожны раз пры ўключэнні трэба будзе ўводзіць лічбавы PIN-код ці пароль для яго расшыфроўкі. Вы не зможаце расшыфраваць планшэт, акрамя як скінуўшы налады дадзеных, пасля чаго выдаляцца ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну ці больш. Трэба пачынаць з зараджаным акумулятарам і трымаць планшэт падлучаным да завяршэння шыфравання. Калі перапыніць працэс шыфравання, будуць страчаны ўсе або некаторыя вашы дадзеныя."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля зашыфроўкі тэлефона кожны раз пры ўключэнні трэба будзе ўводзіць лічбавы 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="2029407131227814893">"Неабходна зарадзіць акумулятар і паўтарыць спробу."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Падключыце зарадную прыладу і паспрабуйце яшчэ раз."</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_dialog_need_password_message" msgid="4071395977297369642">"Перш чым пачаць шыфраванне, трэба ўсталяваць PIN-код або пароль блакавання экрана."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Зашыфраваць?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Шыфраванне планшэта – незваротная аперацыя, у выпадку яе перарывання вы страціце дадзеныя. Шыфраванне займае гадзіну ці больш, за гэты час планшэт будзе некалькі разоў перазапушчаны."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Шыфраванне тэлефона – незваротная аперацыя, у выпадку яе перарывання вы страціце дадзеныя. Шыфраванне займае гадзіну ці больш, за гэты час тэлефон будзе некалькі разоў перазапушчаны."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шыфраванне"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Пачакайце, пакуль ваш планшэт зашыфруецца. Завершана <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Пачакайце, пакуль на вашым тэлефоне ўсталёўваецца абарона. Завершана <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="2223340178473871064">"Увядзіце пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шыфраванне няўдалае"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Шыфраванне было перапынена і не можа завяршыцца. У выніку дадзеныя на вашым планшэце больш не даступныя."\n\n"Каб выкарыстоўваць планшэт далей, неабходна выканаць скід налад. Пры наладзе планшэта пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Шыфраванне было перапынена і не можа завяршыцца. У выніку дадзеныя на вашым тэлефоне больш недаступныя."\n\n"Каб выкарыстоўваць тэлефон далей, неабходна выканаць скід налад. Пры наладзе тэлефона пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Выберыце блакаванне экрана"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шыфраванне было перапынена і не можа быць завершана. У выніку гэтага дадзеныя на вашым планшэце больш не даступныя."\n\n"Каб выкарыстоўваць планшэт далей, неабходна выканаць скід налад. Пры наладзе планшэта пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваны ў ваш уліковы запіс Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шыфраванне перапынена і не можа быць завершана. У выніку дадзеныя на вашым тэлефоне больш не даступныя."\n\n"Каб выкарыстоўваць тэлефон далей, неабходна выканаць скід налад. Пры наладзе тэлефона пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Пераключэнне рэжыму ўводу"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Выберыце спосаб блак. экрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Блакав. рэз. капіяв."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блакоўка экрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змена блакавання экрана"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Фэйскантроль"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Ключ"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-код"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Пароль"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Выключыць блакаванне экрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Выдаліць графiчны ключ"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Выдаліць PIN-код разблакавання"</string>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Мiнiмальная колькасць знакаў 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="5487426077939378487">"Пароль мусіць мець не менш за <xliff:g id="NUMBER">%d</xliff:g> знакаў"</string>
-    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN-код павiнны мець менш за <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">"Адміністратар прылады забараняе выкарыстоўваць апошнi 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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Максiмальная колькасць знакаў, якую можа змяшчаць пароль: <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-код павiнен змяшчаць менш за пэўную колькасць лiчбаў (<xliff:g id="NUMBER">%d</xliff:g>)."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN-код павінен змяшчаць толькі лічбы 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Адміністратар прылады не дазваляе выкарыстоўваць апошні PIN-код."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Пароль змяшчае недапушчальны знак."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Пароль павінен змяшчаць хаця б адну літару."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Пароль павінен змяшчаць не менш за адну лічбу."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Пароль павінен утрымліваць хаця б адзін сімвал."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"Пароль павінен змяшчаць не менш за 1 літару"</item>
-    <item quantity="other" msgid="7278096339907683541">"Пароль павінен утрымліваць не меней за пэўную колькасць лiтар: %d"</item>
+    <item quantity="one" msgid="3063853802158131458">"Пароль павінен змяшчаць не менш за 1 літару."</item>
+    <item quantity="other" msgid="8186027808415585970">"Мiнiмальная колькасць лiтар, якую павiнен змяшчаць пароль: %d."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"Пароль павінен змяшчаць не менш за 1 малую літару"</item>
-    <item quantity="other" msgid="588499075580432178">"Пароль павінен змяшчаць малыя літары. Не менш за %d"</item>
+    <item quantity="one" msgid="5583986519662091001">"Пароль павінен змяшчаць не менш за 1 малую літару."</item>
+    <item quantity="other" msgid="2693910942679679225">"Пароль павінен змяшчаць малыя літары (не менш за %d)."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"Пароль павінен змяшчаць не менш за 1 вялікую літару"</item>
-    <item quantity="other" msgid="2183090598541826806">"Пароль павінен змяшчаць вялікія літары. Не менш за %d"</item>
+    <item quantity="one" msgid="2611909966725502768">"Пароль павінен змяшчаць не менш за 1 вялікую літару."</item>
+    <item quantity="other" msgid="3030801209112209245">"Пароль павінен змяшчаць вялікія літары (не менш за %d)."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"Пароль павінен змяшчаць не менш за 1 лічбу"</item>
-    <item quantity="other" msgid="995673409754935278">"Пароль павінен утрымліваць не менш за %d ліч."</item>
+    <item quantity="one" msgid="3820355568839621231">"Пароль павінен змяшчаць не менш за 1 лічбу."</item>
+    <item quantity="other" msgid="4703982391407595924">"Пароль павінен змяшчаць лiчбы (не менш за %d)."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"Пароль павінен змяшчаць не менш за 1 спецыяльны сімвал"</item>
-    <item quantity="other" msgid="3047460862484105274">"Пароль павінен змяшчаць спецыяльныя сімвалы. Не менш за %d"</item>
+    <item quantity="one" msgid="8456579939292408631">"Пароль павінен змяшчаць не менш за 1 спецыяльны сiмвал."</item>
+    <item quantity="other" msgid="1221290525051187757">"Пароль павінен змяшчаць спецыяльныя сімвалы (не менш за %d)."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"Пароль павінен утрымліваць хаця б 1 сімвал, які не з\'яўляецца літарай"</item>
-    <item quantity="other" msgid="5574191164708145973">"Пароль павінен змяшчаць не менш за пэўную колькасць сiмвалаў (%d ), якія не з\'яўляюцца літарамі"</item>
+    <item quantity="one" msgid="4594051152085925921">"Пароль павінен змяшчаць хаця б 1 сімвал, які не з\'яўляецца літарай."</item>
+    <item quantity="other" msgid="3952508584649046404">"Пароль павінен змяшчаць не менш за пэўную колькасць знакаў (%d), якія не з\'яўляюцца літарамі."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Адміністратар прылады забараняе выкарыстоўваць апошнi пароль"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Адміністратар прылады не дазваляе выкарыстоўваць апошні пароль."</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="lock_setup" msgid="1759001157415978959">"Усталяванне завершана"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Усталяванне скончана."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Увядзiце патрэбны пароль, каб падлучыцца да прылады <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>:"</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_enter_pin_other_device" msgid="4637977124526813470">"Вам таксама можа спатрэбіцца ўвесці гэты PIN-код на іншай прыладзе."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Вам таксама можа спатрэбіцца ўвесці гэты ключ доступу на іншай прыладзе."</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>Падключыцца да гэтай прылады?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Каб падключыцца да прылады <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, увядзiце <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, затым нацiснiце \"Назад\" або Enter"</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Не атрымалася спалучыцца з прыладай <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, таму што PIN-код або пароль няправiльныя."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Не магу размаўляць з прыладай <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_connecting_error_message" msgid="229861986106185022">"Немагчыма падключыцца да прылады <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Дазволіць абмен дадзенымі, калі тэлефон закранае іншыя прылады"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дазволіць абмен дадзенымі, калі планшэт дакранаецца да іншай прылады"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дазволіць абмен дадзенымі, калі тэлефон закранае іншыя прылады"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Гатовы перадаваць змесцiва прыкладанняў з дапамогай прылад NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Адключана"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недаступна, таму што NFC выключаная"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Калі гэтая функцыя ўключаная, вы можаце перадаваць змесціва прыкладання на іншыя сумяшчальныя з NFC прылады, утрымліваючы прылады блізка адна да адной. Напрыклад, вы можаце перадаваць старонкi з браўзэра, відэа з YouTube, кантакты і многае іншае."\n\n"Толькі злучыце прылады (звычайна заднімі бакамі) і дакраніцеся да экрана. Прыкладанне вызначыць, якая прылада падлучаецца."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Выяўленне сеткавых службаў"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Дазволіць прыкладанням з іншых прылад знаходзіць прыкладанні на гэтай прыладзе"</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="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">"Усталяванне бесправадных кропак доступу і кіраванне iмi"</string>
+    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Вылучыце Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не атрымлiваецца выканаць сканаванне для сетак"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Апавяшчэнне сеткі"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Паведаміць мне, калі будзе даступная адкрытая сетка"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Дрэнныя злучэнні пазбегнутыя"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Не выкарыстоўваць сетку Wi-Fi, пакуль не будзе якаснага падлучэння да Інтэрнэту"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Пазбягаць дрэнных злучэнняў"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Не выкарыстоўваць сетку Wi-Fi, пакуль не будзе якаснага падлучэння да Інтэрнэта"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Захоўваць 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_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Увод PIN-кода WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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">"Каб праглядзець даступныя сеткi, уключыце Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Пошук сетка Wi-Fi..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Іншая сетка..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Дадатковая інфармацыя"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Аўтаматычная ўсталёўка (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Паказаць дадатковыя параметры"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"Увядзіце PIN-код да кропкі доступу"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Усталяванне WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Увядзіце 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_wps_setup_title" msgid="6034518116333042484">"Абароненая ўсталёўка Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запускаецца WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Націсніце кнопку Wi-Fi Protected Setup на маршрутызатары. Яна можа называцца \"WPS\" ці ўтрымліваць гэты знак:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Увядзіце PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> для маршрутызатара Wi-Fi. Усталёўка можа заняць да дзвюх хвілін."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Атрымалася ўключыць WPS. Падключэнне да сеткі..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS ужо запушчаны, гэта можа заняць да дзвюх хвілін"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Не атрымалася ўсталяваць WPS. Паўтарыце спробу праз некалькі хвілін."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Налады бяспекі бесправаднога маршрутызатара (WEP) не падтрымліваюцца"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Налады бяспекі бесправаднога маршрутызатара (TKIP) не падтрымліваюцца"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Памылка аўтэнтыфікацыі. Паўтарыце спробу."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Iншыя сеансы WPS не знойдзены. Паўтарыце спробу праз некалькі хвілін."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Ідэнтыфікатар SSID сеткі"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Бяспека"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Магутнасць сігнала"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Захавана"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Адключаная"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Пазбегнута дрэннае злучэнне"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Сеткi ўдалося пазбегнуць з-за дрэннай сувязі. Выключыце гэты рэжым, перайшоўшы ў налады (раздзел \"Экран Wi-Fi\", \"Пашыраныя налады\")."</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="3538912605343585226">"Даступны абароненыя сеткi"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (даступна абароненая сетка)"</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_failed_connect_message" msgid="8491902558970292871">"Не атрымалася падключыцца да сеткі"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Забыць"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Не атрымалася iгнараваць сетку"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Захаваць"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не атрымалася захаваць сетку"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Адмяніць"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Абароненыя сеансы Wi-Fi не выяўлены. Паўтарыце спробу праз некалькі хвілін."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Даўжыня прэфікса сеткі"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Усталяваць пірынгавае злучэнне"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Інфармацыя пра прыладу"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Абароненае ўсталяванне Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Увядзiце 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_remove_group" msgid="4844634506540667517">"Выдаліць групу"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Пашыраныя налады"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Даступныя прылады"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Пошук прылад"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Пошук..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Пераназваць прыладу"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Піры"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Не атрымалася падключыцца."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Не атрымалася перайменаваць прыладу."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Адключыцца?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Калі вы адключыцеся, перапынiцца ваша падключэнне да прылады <xliff:g id="PEER_NAME">%1$s</xliff:g> і іншых."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Калі вы адключыцеся, падключэнне да прылады <xliff:g id="PEER_NAME">%1$s</xliff:g> і іншых (<xliff:g id="PEER_COUNT">%2$s</xliff:g>) не перапынiцца."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Адмяніць запрашэнне?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы жадаеце адмяніць запрашэнне на падлучэнне да прылады <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_ap_text" msgid="61237027772641155">"Налада кропкi доступу 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="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Гук"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Бязгучны рэжым"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодыя тэлефона"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Гучнасць"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Музычныя эфекты"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Гучнасць званка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вібрацыя ў бязгучным рэжыме"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Вібрацыя і выклік"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Заглушыць рынгтоны і апавяшчэнні"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Заглушыць музыку і іншыя мультымедыйныя файлы"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Заглушыць паведамленні"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Заглушыць сігналы"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вібрацыя падчас выкліка"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"Перад усталяваннем док-станцыi вы павінны падключыць планшэт."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Перад усталяваннем док-станцыi вы павінны падключыць тэлефон."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Перш чым наладжваць аўдыё, трэба падключыць планшэт да док-станцыi."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Перш чым наладжваць аўдыё, трэба падключыць тэлефон да док-станцыi."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Гук пры ўсталяваннi ў док-станцыю"</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="account_settings" msgid="6403589284618783461">"Уліковыя запiсы"</string>
     <string name="search_settings" msgid="1910951467596035063">"Пошук"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Кіраваць наладамі і гісторыяй пошуку"</string>
     <string name="display_settings" msgid="7965901687241669598">"Паказаць"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"Версiя 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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Выдалiць ўсю вашу асабістую інфармацыю і спампаваныя прыкладанні? Дзеянне нельза адмянiць."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Выдаліць усе"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Выканайце мадэль разблакоўкі"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Вы павінны паўтарыць вашую мадэль разблакоўкі, каб пацвердзіць скід налад дадзеных."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Каб пацвердзіць скід да заводскіх налад, трэба намаляваць графiчны ключ разблакоўкі."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Скід не выкананы, таму што не прадастаўляецца паслуга ачысткі сістэмы."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Скінуць?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ачысціць USB-назапашвальнiк"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ачысціць 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-назапашвальнiка."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Вы павінны паўтарыць вашую мадэль разблакоўкі, каб пацвердзіць, што жадаеце ачысцiць SD-карту."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Каб пацвердзіць выдаленне дадзеных з USB-назапашвальнiка, трэба паўторна ўвесцi графiчны ключ разблакоўкі."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Каб пацвердзіць свой намер ачысцiць SD-карту, трэба намаляваць графiчны ключ разблакоўкі."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Налады выклікаў"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Выбраць галасавую пошту, перанакіраванне выклікаў, чаканне выклікаў, аўтаматычны вызначальнiк нумару"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-мадэм"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Мабільныя сеткі"</string>
     <string name="location_title" msgid="1029961368397484576">"Маё месцазнаходжанне"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Служба вызн. месцазнах. Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Дазваляе прыкладанням выкарыстоўваць дадзеныя з такіх крыніц, як Wi-Fi і мабільныя сеткі, каб вызначыць ваша прыблізнае месцазнаходжанне"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Дазволіць адпраўляць ананiмныя дадзеныя ў Google. Таксама дазваляе пэўным прыкладанням выкарыстоўваць дадзеныя з такіх крыніц, як 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Націсніце \"Меню\", каб атрымаць даведку."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Адпусціце палец, калі скончыце."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Злучыце па меншай меры <xliff:g id="NUMBER">%d</xliff:g> кропак. Паспрабуйце яшчэ раз:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Камбінацыя запісана!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Шаблон запісаны."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Каб пацвердзiць, выканайце камбінацыю яшчэ раз:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Вашая новая камбінацыя разблакоўкі:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Пацвердзіць"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Далей"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Абарона планшэта"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Абарона тэлефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Абараніце свой планшэт ад несанкцыянаванага выкарыстання, стварыўшы персанальную камбінацыю разблакоўкі экрана. Пальцам злучыце кропкі на наступным экране ў любым парадку. Вы павінны злучыць як мінімум чатыры кропкі."\n\n"Гатовы? Нацiснiце \"Далей\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Абараніце свой планшэт ад несанкцыянаванага выкарыстання, стварыўшы персанальную камбінацыю разблакоўкі экрана. Пальцам злучыце кропкі на наступным экране ў любым парадку. Вы павінны злучыць як мінімум чатыры кропкі."\n\n"Гатовы? Нацiснiце \"Далей\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Абараніце свой тэлефон ад несанкцыянаванага выкарыстання, стварыўшы персанальную камбінацыю разблакоўкі экрана. На наступным экране злучыце ў любым парадку не менш за чатыры кропкi. "\n" "\n" Гатовы пачаць? Націсніце \"Далей\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Кіраванне прыкладаннямі"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Кіраванне ўсталяванымi прыкладаннямi і iх выдаленне"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Кіраванне прыкладаннямі, налады шляхоў хуткага доступу"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Налады прыкладання"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невядомыя крыніцы"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Дазволіць усталяванне прыкладанняў, атрыманых не з Маркета"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Дазволіць усталёўку прыкладанняў з невядомых крыніц"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Планшэт і асабістыя дадзеныя больш уразлівыя да нападаў прыкладанняў з невядомых крыніц. Вы згаджаецеся, што нясеце поўную адказнасць за любыя пашкоджанні планшэта ці страту дадзеных, якія могуць паўстаць у працэсе выкарыстання гэтых прыкладанняў."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Тэлефон і асабістыя дадзеныя больш уразлівыя для нападаў прыкладанняў з невядомых крыніц. Вы згаджаецеся, што нясеце поўную адказнасць за любыя пашкоджанні тэлефона ці страты дадзеных, якія могуць паўстаць у працэсе выкарыстання гэтых прыкладанняў."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Пашыраныя налады"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Звесткі пра прыкладанне"</string>
     <string name="storage_label" msgid="8700867073480107253">"Захоўванне"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Запуск па змаўчанні"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Па змаўчанні"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Сумяшчальнасць экрана"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Дазволы"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кэш"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ачысціць дадзеныя"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Выдаліць абнаўленні"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Вы выбралi гэта прыкладанне для запуску па змаўчаннi, каб выконваць некаторыя дзеяннi"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Вы выбралі дазваляць гэтаму прыкладанню ствараць віджэты і атрымліваць доступ да іх дадзеных."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Параметры па змаўчанні не ўсталяваныя"</string>
     <string name="clear_activities" msgid="7408923511535174430">"Скінуць налады па змаўчанні"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Магчыма, гэта прыкладанне не разлічана для вашага экрана. Наладзьце яго."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Сартаваць па памеры"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Паказаць запушчаныя службы"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Паказаць кэшаваныя працэсы"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Скід налад прыкладання"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Скінуць налады прыкладання?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Гэта дазволіць скінуць усе налады для:"\n\n<li>"адключаных прыкладанняў"</li>\n<li>"адключаных паведамленняў прыкладанняў"</li>\n<li>"прыкладанняў па змаўчанні для дзеянняў"</li>\n<li>"абмежаванняў фонавых дадзеных для прыкладанняў"</li>\n\n"Вы не страціце дадзеныя прыкладанняў."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Скід прыкладанняў"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Кіраванне вольным месцам"</string>
     <string name="filter" msgid="2018011724373033887">"Фільтр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Выберыце параметры фільтра"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Гэта прыкладанне можа атрымаць на планшэце доступ да наступных дадзеных:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Гэта прыкладанне можа атрымаць на тэлефоне доступ да наступных дадзеных:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Вылічэнне..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"Не атрымалася вылічыць памер пакета"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"Не атрымалася вызначыць памер пакета."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"У вас няма ўсталяваных прыкладанняў ад іншых пастаўшчыкоў."</string>
     <string name="version_text" msgid="9189073826278676425">"версія <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Перамясціць"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Змяніць пераважнае месца ўсталявання новых прыкладанняў"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Адключыць убудаванае прыкладанне?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Пасля адключэння ўбудаванага прыкладання іншыя прыкладанні могуць дрэнна працаваць."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Адключыць апавяшчэнні?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Калі адключыць паведамлення для гэтага прыкладання, вы можаце прапусціць важныя сігналы і абнаўленні."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Выкарыстанне сховішча"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Паглядзець месца, якое выкарыстоўваюць прыкладанні"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Запушчаныя службы"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Гэты метад уводу можа збіраць увесь тэкст, які ўводзіцца, у тым лiку такiя персанальныя дадзеныя, як паролі і нумары крэдытных карт. Ён выкарыстоўваецца прыкладаннем <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Выкарыстоўваць гэты метад уводу?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Гэты iнструмент праверкi арфаграфіі можа збiраць увесь ўводзімы тэкст, у тым ліку асабістыя дадзеныя, такія як паролі і нумары крэдытных карт. Яно паходзіць ад прыкладання <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Выкарыстоўваць гэты iнструмент?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Налады"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Мова"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Не атрымалася адкрыць параметры <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Мыш/трэкпад"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Хуткасць указальніка"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Прылада кiравання гульнёй"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Выкарыстанне вібратара"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Перанакіраванне вібратара для прылады кiравання гульнёй пры падключэннi."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Выбар раскладкі клавіятуры"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Наладка раскладкі клавіятуры"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Каб перакл., націсніце Ctrl-Space"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Па змаўчанні"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Раскладкі клавіятуры"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Карыстальніцкі слоўнік"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Асабісты слоўнік"</string>
     <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_add_screen_title" msgid="742580720124344291">"Фраза"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Дад. параметры"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Асн. параметры"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"ОК"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Слова:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Шлях хуткага доступу:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Мова:"</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="8165273379942105271">"У вашым карыстальніцкім слоўніку няма ніводнага слова. Вы можаце дадаваць словы, дакранаючыся да кнопкі \"+\" у пункце меню \"Дадаць\"."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Усе мовы"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Для ўсіх моў"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Іншыя мовы..."</string>
     <string name="testing" msgid="6584352735303604146">"Праверка"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Інфармацыя аб планшэце"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Інфармацыя пра тэлефон"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Налада параметраў для распрацоўкі прыкладанняў"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Адладка USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Рэжым адладкі, калі USB падключаны"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Ідэнтыф. нумар прылады распрацоўкі"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Інфармацыя аб прыладзе недаступная"</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="7316799925425402244">"Адладка USB прызначана толькі для мэтаў распрацоўкі. Яна можа выкарыстоўвацца, каб капіяваць дадзеныя паміж кампутарам і прыладай, усталёўваць прыкладанні на прыладзе без папярэдняга апавяшчэння і чытаць дадзеныя дзённiка."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Дазволiць налады распрацоўшчыка?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Гэтыя налады прызначаны толькi для распрацоўшыкаў. Яны могуць выклікаць збоi прылад i ўсталяваных на iх прыкладанняў, а таксама перашкаджаць iх працы."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Абараніць USB-назапашвальнік"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Прыкладанні павінны запытваць дазвол на чытанне USB-назапашвальніка"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Абараніць USB-назапашвальнік?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Калі USB-назапашвальнік абаронены, прыкладанні павінны запытваць дазвол на чытанне дадзеных са знешняй памяці."\n\n"Некаторыя прыкладанні могуць не працаваць, пакуль не будуць абноўлены распрацоўшчыкамі."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Абараніць SD-карту"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Прыкладанні павінны запытваць дазвол на чытанне SD-карты"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Абараніць SD-карту?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Калі SD-карта абаронена, прыкладанні павінны запытваць дазвол на чытанне дадзеных са знешняй памяці."\n\n"Некаторыя прыкладанні могуць не працаваць, пакуль не будуць абноўлены распрацоўшчыкамі."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Выберыце гаджэт"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Выберыце віджэт"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Стварыць віджэт і дазволіць доступ?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Пасля стварэння віджэту <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> зможа атрымаць доступ да ўсіх дадзеных, якія ён адлюстроўвае."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Заўсёды дазваляць <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ствараць віджэты і атрымліваць доступ да іх дадзеных"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Вялікі шрыфт"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Нац. на кнопку сілкавання зав. выклік"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Прамовіць паролі"</string>
-    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Прагледзець праз дакрананне"</string>
-    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Калі ўключана функцыя Explore by Touch, вы можаце пачуць або ўбачыць апісанне таго, што пад вашым пальцам."\n\n"Гэтая функцыя прызначаная для карыстальнікаў з дрэнным зрокам."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Дакраніцеся і затрымайце"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Усталяваць вэб-скрыпты"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Павышэнне даступнасці вэб-сайтаў"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма ўсталяваных службаў"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Патрэбная праграма для чытання з экрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Прыкладанне TalkBack забяспечвае вусную зваротную сувязь, каб дапамагаць сляпым карыстальнікам і карыстальнікам з дрэнным зрокам. Усталяваць яго бясплатна з Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Усталяваць вэб-скрыпты?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Жадаеце, каб прыкладанні ўсталявалі скрыпты ад Google, якія зробяць іх змесціва ў Iнтэрнэце больш даступным?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Гэтая функцыя змяняе спосаб, якім прылада рэагуе на дакрананні. Уключыць?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма апісання."</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_not_available" msgid="3214000535532434353">"Адсутнiчаюць дадзеныя пра выкарыстанне акумулятара."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"Модуль, якi вы выбралi, не запускаецца."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Наладзіць"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Выбраць іншы модуль"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Гэты модуль сінтэзу гаворкі можа збіраць увесь тэкст, які будзе прамоўлены, у тым ліку асабістыя дадзеныя, напрыклад паролі і нумары крэдытных карт. Ён адносіцца да модуля <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Уключыць гэты модуль сінтэзу гаворкі?"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"Падключыце новы модуль."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Намалюйце графiчны ключ разблакоўкі"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Каб пацвердзіць усталёўку ўлiковых дадзеных, намалюйце графiчны ключ разблакоўкі."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Увядзіце пароль для сховішча ўліковых дадзеных."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Бягучы пароль:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Захаваныя ўліковыя дадзеныя сціраюцца."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Нельга ачысціць сховішча ўліковых дадзеных."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Сховішча ўлік. дадз. уключанае."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Перш чым вы можаце выкарыстоўваць сховішча ўліковых дадзеных, усталюйце PIN-код для блакавання экрана або пароль."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Перш чым выкарыстоўваць сховішча ўліковых дадзеных, усталюйце PIN-код для блакавання экрана або пароль."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Надзвычайны гук"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаць паводзіны на выпадак экстранага выкліку"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Рэзервовае капіраванне і скідванне"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Аўтаматычнае аднаўленне"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Пры пераўсталяваннi прыкладання аднавіць рэзервовую копію налад і дадзеных"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для рэзервовага капіявання працоўнага стала"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Поўнае рэзервовае капіяванне працоўнага стала зараз не абароненае."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Выберыце, каб змяніць або выдаліць пароль для поўнага рэзервовага капіявання працоўнага стала"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Поўнае рэзервовае капіраванне рабочага стала зараз не абаронена"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Выберыце, каб змяніць або выдаліць пароль для поўнага рэзервовага капіравання рабочага стала"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Спыніць рэзервовае капіяванне пароляў ад Wi-Fi, закладак, іншых налад і дадзеных, а таксама выдаліць усе копіі на серверах Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Налады адміністравання прылады"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Гэты адміністратар з\'яўляецца актыўным і дазваляе прыкладанню <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">"Мелодыі і апавяшчэнні"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Апавяшчэнні"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Сістэма"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Мелодыя выкліка і вібрацыя"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"Сістэма"</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="3747859666621319757">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Збой сінхранізацыі"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Сінхранізацыя актывавана"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Сінхранiзаваць"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"У цяперашні час ёсць праблемы сінхранізацыi. Яна хутка адновіцца."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Дадаць уліковы запіс"</string>
     <string name="background_data" msgid="5779592891375473817">"Зыходныя дадзеныя"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Сінхранізацыя ўкл."</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Сінхранізацыя адкл."</string>
     <string name="sync_error" msgid="5060969083117872149">"Памылка сінхр."</string>
+    <string name="last_synced" msgid="4242919465367022234">"Апошняя сiнхранiзацыя: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Сінхранiзаваць зараз"</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>
@@ -1413,7 +1480,7 @@
     <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">"Вiтаем у сінхранізацыі Google!"</font>\n"Падчас сінхранізацыі Google дазваляе атрымліваць доступ да кантактаў, сустрэч і многага іншага з любога месца."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Вітаем у службе сінхранізацыі Google!"</font>" "\n"Падчас сінхранізацыі дадзеных Google дазваляе атрымліваць у любым месцы доступ да кантактаў, сустрэч і многага іншага."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Параметры сiнхранiзацыi прыкладання"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Сынхранізацыя дадзеных"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Змяніць пароль"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Некаторыя прыкладаннi патрабуюць выкарыстання гэтага ўліковага запісу. Яго можна выдаліць, толькi скінуўшы планшэт да заводскіх налад (будуць выдалены ўсе асабiстыя дадзеныя) у раздзеле \"Налады\" &gt; \"Рэзервовае капіяванне і скід\"."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Некаторыя прыкладаннi патрабуюць выкарыстання гэтага ўліковага запісу. Яго можна выдаліць, толькi скінуўшы тэлефон да заводскіх налад (будуць выдалены ўсе асабiстыя дадзеныя) у раздзеле \"Налады\" &gt; \"Рэзервовае капіяванне і скід\"."</string>
     <string name="provider_label" msgid="7724593781904508866">"Прымусовыя падпіскі"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"Сінхранізаваць <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Немагчыма сінхранізаваць уручную"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Сінхранізацыя для гэтага элемента зараз адключаная. Каб змяніць налады, часова дазвольце абмен дадзенымі ў фонавым рэжыме і аўтаматычную сінхранізацыю."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Налады 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-адрас"</string>
     <string name="enter_password" msgid="4131758584074246224">"Увядзіце пароль для расшыфроўкі сховiшча"</string>
     <string name="try_again" msgid="4272075051293936921">"Паспрабуйце яшчэ."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Служба занята. Паспрабуйце яшчэ раз."</string>
     <string name="delete" msgid="4219243412325163003">"Выдаліць"</string>
     <string name="misc_files" msgid="6720680815969643497">"Розныя файлы"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"Выбраць усё"</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="debug_debugging_category" msgid="6781250159513471316">"Адладка"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Выберыце прыкладанне для адладкi"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Няма прыкладанняў для адладкi"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Адладка прыкладання: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Выберыце прыкладанне"</string>
+    <string name="no_application" msgid="2813387563129153880">"Нічога"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Пачакайце адладчык"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Адладжанае прыкладанне чакае далучэння да iнструмента для адладкi перад працай"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Увод"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Чарцёж"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Маніторынг"</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_screen_updates" msgid="5470814345876056420">"Паказ. абнаўл. паверхні"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Мігаць ўсёй паверхней акна пры абнаўленні"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Паказ. абн. выгляду GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Мігнуць вакном пры чарчэнні з дапамогай GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Адкл. апаратн. накладання"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Заўсёды выкарыстоўваць GPU для экраннай кампаноўкі"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Уключыць сляды"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Вылучыць укл. сляды"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Зараз ніякія сляды не ўключаны"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Зараз уключана наступная колькасць слядоў: <xliff:g id="NUM">%1$d</xliff:g>"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Зараз усе сляды ўключаны"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Паказаць межы размяшчэння"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Паказаць межы кліпу, палі і г. д."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Паказаць выкарыстанне ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад на экран з бягучым выкарыстаннем працэсара"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Прымусовае адлюстраванне GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Выкарыстанне апаратнага паскарэння 2D ў прыкладаннях"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Прымусовае выкарыстанне GPU для 2-мерных чарцяжоў"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Апрацоўка профілю GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Вымерыць час рэндэрынгу ў абалонцы adb dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Маштаб анімацыі акна"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Маштаб перадачы анімацыі"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Шкала працягласці анiматара"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Прыкладаннi"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не трымаць дзеянні"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Знішч. кож.дзеянне, як толькі карыст.пакідае яго"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Мабільныя гарачыя кропкі"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Аўтаматычная сiнхранiзацыя дадзеных"</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="8621855507876539282">"Зараз ніякія прыкладаннi не выкарыстоўваюць дадзеныя."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"У асноўным рэжыме"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Фонавы рэжым"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Вызначаецца планшэтам. Спагнанне платы за перадачу дадзеных у вашага аператара можа адрознiвацца."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Вызначаецца тэлефонам. Спагнанне платы за перадачу дадзеных у вашага аператара можа адрознiвацца."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"абмежавана"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Адключыць мабільную перадачу дадзеных?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Усталяваць ліміт маб. дадзеных"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Усталяваць ліміт дадзеных 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Маб. вер."</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Няма"</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="8430240158135453271">"Паглядзець налады прыкладання"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Абмежаваць фонавыя дадзеныя"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Адключыць перадачу фонавых дадзеных толькі па мабільнай сетцы. Пры наяўнасці будзе выкарыстоўвацца Wi-Fi."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Адключыць фонавыя дадзеныя ў мабільных сетках. Пры наяўнасці будуць выкарыстоўвацца немабільныя сеткі."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Каб абмежаваць зыходныя дадзеныя для гэтага прыкладання, спачатку ўсталюйце ліміт мабільных дадзеных."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Абмежаваць зыходныя дадзеныя?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Гэта функцыя можа спынiць прыкладанне, якое залежыць ад зыходных дадзеных, калі Wi-Fi адсутнічае."\n\n"Больш адпаведныя сродкі кіравання выкарыстаннем дадзеных можна знайсці ў наладах прыкладання."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Гэта функцыя можа перашкаджаць працы прыкладанняў, якiя залежаць ад фонавых дадзеных, толькi калі даступныя мабільныя сеткі."\n\n"Вы можаце знайсці больш адпаведнае прымяненне дадзеным у наладах прыкладання."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Абмежаваць зыходныя дадзеныя можна толькі тады, калі вы ўсталявалі ліміт мабільных дадзеных."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Уключыць аўтасінхр. дадзеных?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваны ў памяць планшэта."\n\n"Некаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены ў тэлефоне, якія вы робіце на вэб-сайце. Уліковы запіс Google працуе наступным чынам."\n\n"Каб выбраць, якія віды інфармацыі сінхранiзаваць у кожным уліковым запісе, перайдзіце ў меню: Налады &gt; Уліковыя запісы."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваныя ў памяць тэлефона."\n\n"Некаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены ў тэлефоне, якія вы робіце на вэб-сайце. Уліковы запіс Google працуе наступным чынам."\n\n"Каб выбраць, якія віды інфармацыі сінхранiзаваць у кожным уліковым запісе, перайдзіце ў меню: Налады &gt; Уліковыя запісы."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Адключыць аўтасінхр. дадзеных?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Гэта дасць магчымасць захаваць трафік і акумулятар, але вам трэба будзе сінхранiзаваць кожны ўліковы запіс уручную, каб збіраць свежую інфармацыю. І вы не будзеце атрымліваць апавяшчэнні, калі з\'явяцца абнаўленні."</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_warning_editor_title" msgid="3704136912240060339">"Усталяваць папярэджанне аб выкарыстанні дадзеных"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Усталяваць ліміт выкарыстання дадзеных"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Абмежаванне выкарыстання дадзеных"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Ваша падключэнне для перадачы дадзеных <xliff:g id="NETWORKS">%1$s</xliff:g> будзе завершана пасля дасягнення пэўнага лiмiту."\n\n"Паколькi выкарыстанне дадзеных вызначаецца вашым планшэтам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Ваша падключэнне для перадачы дадзеных <xliff:g id="NETWORKS">%1$s</xliff:g> будзе завершана пасля дасягнення пэўнага лiмiту."\n\n"Паколькi выкарыстанне дадзеных вызначаецца вашым тэлефонам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Ваша падключэнне для перадачы дадзеных будзе завершана пасля дасягнення пэўнага лiмiту."\n\n"Паколькi выкарыстанне дадзеных вызначаецца вашым планшэтам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Ваша падключэнне для перадачы дадзеных "\n" будзе завершана пасля дасягнення пэўнага лiмiту."\n"{2/}Паколькi выкарыстанне дадзеных вызначаецца вашым тэлефонам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Абмежаваць зыходныя дадзеныя?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Калі абмежаваць фонавую перадачу мабiльных дадзеных, некаторыя прыкладанні і службы не будуць працаваць пры падключэннi да сеткі Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: выкарыстоўваецца прыкладна <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: выкарыстоўваецца прыкладна <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g> : выкарыстоўваецца прыкладна <xliff:g id="TOTAL">%1$s</xliff:g>, як вызначана на планшэце. Плата за выкарыстанне дадзеных у вашага аператара можа адрознiвацца."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g> : выкарыстоўваецца прыкладна <xliff:g id="TOTAL">%1$s</xliff:g>, як вызначана на тэлефоне. Плата за выкарыстанне дадзеных у вашага аператара можа адрознiвацца."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Мабільныя гарачыя кропкі"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Выберыце сеткі Wi-Fi, якія з\'яўляюцца мабільнымі гарачымі кропкамі. Можна забараніць прыкладанням выкарыстоўваць гэтыя сеткі ў фонавым рэжыме. Прыкладанні таксама могуць папярэджваць, перш чым выкарыстоўваць гэтыя сеткі для вялікіх спамповак."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мабільныя сеткі"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Сеткі Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Каб выбраць мабільныя гарачыя кропкі, уключыце Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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">"Падлучыцца да сеткi <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Рэдагаваць профіль VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Падключэнне да профiлю <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Дадаць профіль VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Рэдагаваць профiль"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Выдаліць профіль"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Падключэнне да сеткi адсутнічае. Паўтарыце спробу пазней."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Сертыфікат адсутнічае. Адрэдагуйце профіль."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"Пасля ўключэння функцыі \"Даследаваць, дакрануўшыся\" вы можаце дакрануцца да экрана, каб даведацца, што знаходзiцца пад вашым пальцам. Напрыклад, бягучы экран змяшчае значкі прыкладанняў. Знайдзіце адно з іх, дакрануўшыся да экрана і перасунуўшы палец навокал."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Добра. Трымайце палец па экране, пакуль не знойдзеце хаця б яшчэ адзін значок."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Каб актываваць тое, да чаго вы дакранаецеся, дакраніцеся да яго. Правядзіце пальцам, пакуль не знойдзеце значок для прыкладання <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="8764686624055084454">"Для прагортвання спіса вы можаце рухаць два пальцы па экране. Напрыклад, бягучы экран змяшчае спіс імёнаў прыкладанняў, якія можна пракручваць уверх ці ўніз. Па-першае, паспрабаваць выявіць некалькі элементаў у спісе, ссунуўшы адзін палец вакол іх."</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="3055831259260848004">"Вы скончылі ўрок. Каб выйсці, націсніце кнопку <xliff:g id="FINISH">%s</xliff:g>."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Карэкцыя арфаграфіі"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Праверка правапiсу"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Увядзіце тут свой бягучы пароль поўнага рэзервовага капіявання"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Тут увядзіце новы пароль для поўнага рэзервовага капіравання"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Увядзіце тут новы пароль для поўнага рэзервовага капіявання"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Адмена"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дадатк. абнаўл. сістэмы"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Карыстальнікі і абмежаванні"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Карыстальнікі"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Дадаць карыстальніка"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Рэдагаваць інфармацыю"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Інфармацыя карыстальніка"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Імя"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Абмежаванні змесціва"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Запытваць PIN-код"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Рэйтынг змесціва"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Сістэмныя прыкладанні"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Усталяваныя прыкладанні"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Скасаваць"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Выдаліць карыстальніка"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Надакучлівае дзіця"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Выдаліць карыстальніка?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Вы ўпэўнены, што хочаце выдаліць з прылады карыстальніка і ўсе звязаныя з iм дадзеныя?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Паказваць паведамленні"</string>
+    <string name="help_label" msgid="1107174367904110532">"Даведка"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 8a66cbc..4c8cc1c 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Изключва се..."</item>
     <item msgid="1634960474403853625">"Изкл."</item>
     <item msgid="746097431216080650">"Неуспешно"</item>
+    <item msgid="6367044185730295334">"Блокирано"</item>
+    <item msgid="503942654197908005">"Временно се избягва лоша връзка"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Изключва се от <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"Изкл."</item>
     <item msgid="8578370891960825148">"Неуспешно"</item>
+    <item msgid="5660739516542454527">"Блокирано"</item>
+    <item msgid="1805837518286731242">"Временно се избягва лоша връзка"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"ПАРОЛА"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Бутон"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"ПАРОЛА"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Няма"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"ПИН от точката за достъп"</item>
-    <item msgid="7364462169350112617">"ПИН от това у-во"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Статични"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"SD карта, която може да се премахва"</item>
     <item msgid="4498124044785815005">"Нека системата да реши"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Изключено"</item>
-    <item msgid="4804571292609523335">"Вибриране"</item>
-    <item msgid="595707141547423573">"Без звук"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
     <item msgid="2560532955514699713">"Средно"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Скала на анимацията 5x"</item>
     <item msgid="6660750935954853365">"Скала на анимацията 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Анимацията е изключена"</item>
+    <item msgid="1138649021950863198">"Скала на анимацията .5x"</item>
+    <item msgid="4394388961370833040">"Скала на анимацията 1x"</item>
+    <item msgid="8125427921655194973">"Скала на анимацията 1.5x"</item>
+    <item msgid="3334024790739189573">"Скала на анимацията 2x"</item>
+    <item msgid="3170120558236848008">"Скала на анимацията 5x"</item>
+    <item msgid="1069584980746680398">"Скала на анимацията 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартно ограничение"</item>
     <item msgid="4071574792028999443">"Няма процеси на заден план"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f256fe1..82a2f97 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">" Да"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
+    <string name="create" msgid="3578857613172647409">"Създаване"</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>
@@ -111,6 +112,8 @@
     <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_device_details" msgid="4594773497930028085">"Настройки на устройството"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Настройки на потребителския профил"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Няма зададено име, използва се името на профила"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Сканиране за устройства"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Преименуване на таблета"</string>
@@ -131,13 +134,12 @@
     <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="5655704645616731277">"Докосн. за сдвояване"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"В района няма намерени у-ва с 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="1931617700075106801">"Докоснете за сдвояване със: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Докоснете за сдвояване със: <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="device_picker" msgid="8398232791303186677">"Инструмент за избор на устройство с Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Заявка за разрешение на Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Приложение иска да включи Bluetooth. Ще разрешите ли това?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Приложение на таблета ви иска да го направи откриваем от други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Ще разрешите ли това?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Докоснете, за да се свържете с/ъс „<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_acceptance_dialog_text" msgid="6555508756987053866">"От %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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Въведеното от вас име на хост е невалидно."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Въведеният от вас списък за изключване не е правилно форматиран. Въведете списък с изключените домейни, разделени със запетаи."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Трябва да попълните полето за порт."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Трябва да попълните полето за порт."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Полето за порт трябва да е празно, ако полето за хост е."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Въведеният от вас порт е невалиден."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP прокси сървърът се използва от браузъра, но не и от други приложения."</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"Промените влизат в сила, когато USB кабелът се свърже отново"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Промените влизат в сила, когато 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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB хранилището не е свързано."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Няма 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="6691584887397909775">"Безоп. е да премахнe USB хран."</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Сега е безопасно да премахнете SD картата"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB хран. се използва за масово съхр."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD картата се използва като устройство за масово съхранение."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Извадете USB хранилището сега."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Сега е безопасно да премахнете 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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB хран. е свърз. само за четене."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD картата е свързана само за четене."</string>
     <string name="skip_label" msgid="47510779345218297">"Пропускане"</string>
     <string name="next_label" msgid="4693520878012668114">"Напред"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Език"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"Разрешаването на роуминг на данни може да доведе до висока такса за роуминг!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Да се разреши ли роуминг на данни?"</string>
     <string name="networks" msgid="6333316876545927039">"Избор на оператора"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Избиране на мрежов оператор"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата и час"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"Избор на формат на датата"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Подобряване на лицевотосъответствие"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Проверка за жизненост"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Да изисква премигване"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за таблета си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да обърнете процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и таблетът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за телефона си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да обърнете процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и телефонът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за таблета си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да отмените процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и таблетът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за телефона си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да отмените процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\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="2029407131227814893">"Заредете батерията си и опитайте отново."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Включете зарядното си устройство и опитайте отново."</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_dialog_need_password_message" msgid="4071395977297369642">"Трябва да зададете ПИН код или парола за заключване на екрана, преди да можете да започнете шифроването."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Да се шифрова ли?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Операцията по шифроването е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време таблетът ще се рестартира няколко пъти."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Операцията по шифроването е необратима и ако я прекъснете, ще загубите данни. Процесът отнема най-малко един час и през това време телефонът ще се рестартира няколко пъти."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифроване"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Изчакайте, докато таблетът ви се шифрова. Завършено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Изчакайте, докато телефонът ви се шифрова. Завършено: <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="2223340178473871064">"Въведете паролата си"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифроването не бе успешно"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на таблета ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на телефона ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Заключване на екрана"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на таблета ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на телефона ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Превключване на метода на въвеждане"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Закл. на екрана: Избор"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Резервно заключване"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Заключване на екрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промяна на заключването"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Отключване с лице"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Фигура"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"ПИН"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Парола"</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>
@@ -362,44 +367,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Паролата трябва да е по-малко от <xliff:g id="NUMBER">%d</xliff:g> знака."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"ПИН кодът трябва да е по-малко от <xliff:g id="NUMBER">%d</xliff:g> цифри.Ако прекъснете връзката"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"ПИН кодът трябва да съдържа само цифри от 0 до 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Администраторът на устройството не разрешава използването на скорошен ПИН."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Паролата съдържа непозволен знак."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Паролата трябва да съдържа поне една буква."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Паролата трябва да съдържа поне една цифра."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Паролата трябва да съдържа поне един символ."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"Паролата трябва да съдържа поне 1 буква"</item>
-    <item quantity="other" msgid="7278096339907683541">"Паролата трябва да съдържа поне %d букви"</item>
+    <item quantity="one" msgid="3063853802158131458">"Паролата трябва да съдържа поне 1 буква."</item>
+    <item quantity="other" msgid="8186027808415585970">"Паролата трябва да съдържа поне %d букви."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"Паролата трябва да съдържа поне 1 малка буква"</item>
-    <item quantity="other" msgid="588499075580432178">"Паролата трябва да съдържа поне %d малки букви"</item>
+    <item quantity="one" msgid="5583986519662091001">"Паролата трябва да съдържа поне 1 малка буква."</item>
+    <item quantity="other" msgid="2693910942679679225">"Паролата трябва да съдържа поне %d малки букви."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"Паролата трябва да съдържа поне 1 главна буква"</item>
-    <item quantity="other" msgid="2183090598541826806">"Паролата трябва да съдържа поне %d главни букви"</item>
+    <item quantity="one" msgid="2611909966725502768">"Паролата трябва да съдържа поне 1 главна буква."</item>
+    <item quantity="other" msgid="3030801209112209245">"Паролата трябва да съдържа поне %d главни букви."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"Паролата трябва да съдържа поне 1 цифра"</item>
-    <item quantity="other" msgid="995673409754935278">"Паролата трябва да съдържа поне %d цифри"</item>
+    <item quantity="one" msgid="3820355568839621231">"Паролата трябва да съдържа поне 1 цифра."</item>
+    <item quantity="other" msgid="4703982391407595924">"Паролата трябва да съдържа поне %d цифри."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"Паролата трябва да съдържа поне 1 специален символ"</item>
-    <item quantity="other" msgid="3047460862484105274">"Паролата трябва да съдържа поне %d специални символа"</item>
+    <item quantity="one" msgid="8456579939292408631">"Паролата трябва да съдържа поне 1 специален символ."</item>
+    <item quantity="other" msgid="1221290525051187757">"Паролата трябва да съдържа поне %d специални символа."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"Паролата трябва да съдържа поне 1 небуквен знак"</item>
-    <item quantity="other" msgid="5574191164708145973">"Паролата трябва да съдържа поне %d небуквени знака"</item>
+    <item quantity="one" msgid="4594051152085925921">"Паролата трябва да съдържа поне 1 небуквен знак."</item>
+    <item quantity="other" msgid="3952508584649046404">"Паролата трябва да съдържа поне %d небуквени знака."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Администраторът на устройството не разрешава използването на скорошна парола"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Администраторът на устройството не разрешава използването на скорошна парола."</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="lock_setup" msgid="1759001157415978959">"Настройката завърши"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Настройката завърши."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"За сдвояване със: <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Въведете необходимия код за достъп на устройството:"</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_enter_pin_other_device" msgid="4637977124526813470">"Възможно е също така да се наложи да въведете този ПИН на другото устройство."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Възможно е също така да се наложи да въведете този код за достъп на другото устройство."</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="2796550001376088433">"За сдвояване със: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Въведете: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, след това натиснете „Return“ или „Enter“."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Не можа да се сдвои с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g> поради неправилен ПИН или код за достъп."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Не може да се свърже с/ъс <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_connecting_error_message" msgid="229861986106185022">"Не можа да се установи връзка със: <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Разрешаване на обмен на данни, когато телефонът докосва друго устройство"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Разрешаване на обмен на данни, когато таблетът докосва друго устройство"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Разрешаване на обмен на данни, когато телефонът докосва друго устройство"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"В готовност за предаване на съдържание на приложения чрез КБП"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Изключено"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Не е налице, защото КБП е изключена"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Когато тази функция е включена, можете да излъчвате съдържание от приложенията до друго устройство с поддръжка за КБП, като държите устройствата близо едно до друго. Например можете да излъчвате страници от Браузър, видеоклипове от YouTube, контакти от Хора и др."\n\n"Трябва само да поставите устройствата едно до друго (обикновено задните им страни), след което да докоснете екрана си. Приложението определя какво се излъчва."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Откриване на услугата за мрежа"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Разрешаване на приложенията от други устройства да намират приложения на това устройство"</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="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_setup_wizard_title" msgid="70277346338812325">"Избиране на Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не може да се сканира за мрежи"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Известие за мрежа"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Известие при налична отворена мрежа"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Да се избягват лоши връзки"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Да не се използва Wi-Fi мрежа, освен ако няма добра връзка с интернет"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Да се избягват лоши връзки"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Да не се използва Wi-Fi мрежа, освен ако няма добра връзка с интернет"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"С включен 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_wps_pbc" msgid="2668564692207863017">"Бутон за WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Въвеждане на WPS ПИН"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Търсят се Wi-Fi мрежи…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Още"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Авт. настройка (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показване на разширените опции"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"Въведете ПИН код от точката за достъп"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Настройка на WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Въведете ПИН кода <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_wps_setup_title" msgid="6034518116333042484">"Защитена настройка на Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS се стартира…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Натиснете бутона за защитена настройка на Wi-Fi на маршрутизатора си. Той може да е с името „WPS“ или да съдържа този символ:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Въведете ПИН кода <xliff:g id="NUMBER">%1$s</xliff:g> на маршрутизатора си за Wi-Fi. Завършването на настройката може да отнеме до две минути."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS стартира успешно. Установява се връзка с мрежата…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Установена е връзка с Wi-Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Настройката на WPS вече е в ход и завършването й може да отнеме до две минути"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Стартирането на WPS не бе успешно. Моля, опитайте отново след няколко минути."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Защитната настройка (WEP) на безжичния маршрутизатор не се поддържа"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Защитната настройка (TKIP) на безжичния маршрутизатор не се поддържа"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Неуспешно удостоверяване. Моля, опитайте отново."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Бе открита друга сесия с WPS. Моля, опитайте отново след няколко минути."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID на мрежа"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Сигурност"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Сила на сигнала"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Запазено"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Деактивирани"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Избегната е лоша връзка с интернет"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Мрежата бе избегната поради лоша връзка. Изключете този режим на работа от „Настройки“ &gt; „Екран за Wi-Fi“, елемента от менюто „Разширени“."</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="3538912605343585226">"Налице е защитена мрежа"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (налице е защитена мрежа)"</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_failed_connect_message" msgid="8491902558970292871">"Свързването с мрежата не бе успешно"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Забравяне"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Забравянето на мрежата не бе успешно"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Запазване"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Запазването на мрежата не бе успешно"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отказ"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Бе открита друга защитена сесия с Wi-Fi. Опитайте след няколко минути."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Дължина на мрежов префикс"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Настройка на свързването на устройства"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Информация за устройството"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Защитена настройка на Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Въведете ПИН"</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_remove_group" msgid="4844634506540667517">"Премахване на група"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Разширени"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Налични устройства"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Търсене на устройства"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Търси се…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Преименуване на устройството"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Съответни устройства"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Не можа да се свърже."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Преименуването на устройството не бе успешно."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Да се изключи ли?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Ако прекъснете връзката,  ще се прекрати и установената със:  <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ако прекъснете връзката, ще се прекрати и установената със:  <xliff:g id="PEER_NAME">%1$s</xliff:g> и още  <xliff:g id="PEER_COUNT">%2$s</xliff:g> устройства."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Да се анулира ли поканата?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Искате ли да анулирате поканата за свързване с/ъс <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_ap_text" msgid="61237027772641155">"Настройка на точката за достъп до 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="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Тих режим"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Сила на звука"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Музикални ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Сила на звука при звънене"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрира при тих режим"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Да вибрира и звъни"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Спиране на мелодията и известията"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Спиране на музиката и другата мултимедия"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Спиране на известията"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Спиране на алармите"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Да вибрира при звънене"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"Трябва да свържете таблета си с докинг станция, преди да настроите аудиото за нея."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Трябва да свържете телефона си с докинг станция, преди да настроите аудиото за нея."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Трябва да свържете таблета си с докинг станция, преди да настроите звука за нея."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Трябва да свържете телефона си с докинг станция, преди да настроите звука за нея."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Със звук при поставяне на докинг станция"</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="account_settings" msgid="6403589284618783461">"Профили"</string>
     <string name="search_settings" msgid="1910951467596035063">"Търсене"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Управление на настройки и история на търсене"</string>
     <string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"Версия на списъка с предпочитания за роуминг"</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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Да се изтрие ли цялата ви лична информация и всички изтеглени приложения? Не можете да отмените това действие!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Изтриване на всичко"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Начертайте фигурата си за отключване"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Трябва да начертаете фигурата си за отключване, за да потвърдите възстановяването на фабричните настройки."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Трябва да начертаете фигурата си за отключване, за да потвърдите възстановяването на фабричните настройки."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Не се състоя рестартиране, защото услугата за изчистване на системата не се предлага."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Да се зададе ли повторно?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Изтриване на USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Да се изтрие ли 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="nosdcard" msgid="2192044794228379224">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете USB хранилището."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Трябва да начертаете фигурата си за отключване, за да потвърдите, че искате да изтриете 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="6688416425801386511">"Тетъринг през USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Мобилни мрежи"</string>
     <string name="location_title" msgid="1029961368397484576">"Моето местоположение"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Услуга на Google за местопол."</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Приложенията да използват данни от източници като Wi-Fi и мобилни мрежи, за да определят приблизителното ми местоположение"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Разрешаване на изпращането на анонимни данни за местоп. до Google. Приложенията с разрешение да използват данни от изт. като 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Натиснете „Меню“ за помощ"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Махнете пръста си, когато сте готови"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Свържете поне <xliff:g id="NUMBER">%d</xliff:g> точки. Опитайте отново:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Фигурата е записана"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Фигурата е записана."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Начертайте фигурата отново за потвърждение:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Новата ви фигура за отключване:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Потвърждаване"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Напред"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Подсигуряване на таблета ви"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Защитаване на телефона ви"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Защитете таблета си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Плъзнете пръст, за да свържете в произволен ред точките на следващия екран. Трябва да свържете поне четири точки. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Защитете таблета си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Плъзнете пръст, за да свържете в произволен ред точките на следващия екран. Трябва да свържете поне четири точки. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Защитете телефона си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Плъзнете пръст, за да свържете в произволен ред поне 4 точки на следващия екран. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управление на приложенията"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление и премахване на инсталирани приложения"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Управление на приложения, задаване на преки пътища за бързо стартиране"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Настройки за приложения"</string>
     <string name="install_applications" msgid="4872012136210802181">"Неизвестни източници"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Разрешаване на инсталирането на приложения не от Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Разрешаване на инсталирането на приложения от неизвестни източници"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Таблетът и личните ви данни са по-уязвими на атака от приложения от неизвестни източници. Приемате, че носите цялата отговорност в случай на повреда на таблета или при загуба на данни вследствие използването на такива приложения."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Данните на телефона ви и личната ви информация са по-уязвими на атака от приложения от неизвестни източници. Приемате, че носите цялата отговорност в случай на повреда на телефона или при загуба на данни вследствие използването на такива приложения."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Разширени настройки"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Информация за приложението"</string>
     <string name="storage_label" msgid="8700867073480107253">"Хранилище"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Стартиране по подразбиране"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Настройки по подразбиране"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Съвместимост на екрана"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Разрешения"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кеш"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Изчистване на данни"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Деинсталиране на актуализации"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Избрахте да стартирате това приложение по подразбиране за някои действия."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Избрахте да разрешите на това приложение да създава приспособления и да осъществява достъп до данните им."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Не са зададени стандартни."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Изчистване на стандартни"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Възможно е това приложение да не е създадено за екрана ви. Можете да контролирате оттук как то се настройва към него."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Сортиране по размер"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Изпълнявани услуги"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Кеширани процеси"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Нулиране"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Да се нулират предпоч.?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Това ще нулира всички предпочитания за:"\n\n" "<li>"деактивираните приложения;"</li>\n" "<li>"известията за деактивирани приложения;"</li>\n" "<li>"стандартните приложения за действия;"</li>\n" "<li>"ограниченията на данните на заден план за приложенията."</li>\n\n" Няма да загубите данни от приложенията."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Нулиране на приложенията"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управление на място"</string>
     <string name="filter" msgid="2018011724373033887">"Филтриране"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Избор на филтриращи опции"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Това приложение има достъп до следното в таблета ви:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Това приложение има достъп до следното от телефона ви:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Изчислява се..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"Размерът на пакета не може да се изчисли."</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"Размерът на пакета не можа да бъде изчислен."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Нямате никакви инсталирани приложения на трети страни."</string>
     <string name="version_text" msgid="9189073826278676425">"версия <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Преместване"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Промяна на предпочитаното място за инсталиране на нови приложения"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Да се деакт. ли вград. прил.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ако деактивирате вградено приложение, е възможно други да не функционират правилно."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Да се изключат ли известията?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ако изключите известията за това приложение, може да пропуснете важни сигнали и актуализации."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Употреба на хранилището"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Преглед на хранилището, използвано от приложения"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Течащи услуги:"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Този метод за въвеждане може да събира целия въведен от вас текст, включително лични данни като пароли и номера на кредитни карти. Той произлиза от приложението <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Искате ли да го използвате?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Тази програма за проверка на правописа може да събира целия въвеждан от вас текст, включително лични данни, като пароли и номера на кредитни карти. Тя произлиза от приложението <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Искате ли да я активирате?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Настройки"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Език"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Отварянето на настройките за <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> не бе успешно"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Мишка/тракпад"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Скорост на курсора"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Контролер за игри"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Използване на у-вото за вибрация"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Пренасочване на устройството за вибрация към контролера за игри, когато е свързан."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Избор на клавиатурна подредба"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Настройка на клавиатурните подредби"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"За превключване натиснете „Ctrl“-интервал"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"По подразбиране"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Клавиатурни подредби"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Потребителски речник"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Личен речник"</string>
     <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_add_screen_title" msgid="742580720124344291">"Фраза"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Още опции"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"По-малко опции"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Дума:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Пряк път:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Език:"</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="8165273379942105271">"Нямате думи в потребителския речник. Добавете, като докоснете бутона за добавяне (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Всички езици"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"За всички езици"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Още езици..."</string>
     <string name="testing" msgid="6584352735303604146">"Тестване"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информация за таблета"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информация за телефон"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Задаване на опции за програмиране на приложения"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отстраняване на грешки през USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим за отстраняване на грешки, когато е свързано USB"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Идент. № на устройството за разработка"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Няма налична информация за устройството"</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="7316799925425402244">"Отстраняването на грешки през USB е предназначено само за програмни цели. Използвайте го за копиране на данни между компютъра и устройството си, за инсталиране на приложения на устройството си без известяване и за четене на регистрационни данни."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Да се разрешат ли настройките за програмиране?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Тези настройки са предназначени само за програмиране. Те могат да доведат до прекъсване на работата или неправилно функциониране на устройството ви и приложенията в него."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Да се защити USB хранилището"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Прилож. трябва да поискат разрешение за четене на USB хран."</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Да се защити ли USB хранилището?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Когато USB паметта е защитена, приложенията трябва да поискат разрешение за четене на данни от външното хранилище."\n\n"Някои от тях може да не работят, докато не бъдат актуализирани от съответните програмисти."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Да се защити SD картата"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Прилож. трябва да поискат разрешение за четене на SD картата"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Да се защити ли SD картата?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Когато SD картата е защитена, приложенията трябва да поискат разрешение за четене на данни от външното хранилище."\n\n"Някои от тях може да не работят, докато не бъдат актуализирани от съответните програмисти."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Избор на притурка"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Избор на приспособление"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Да се създаде ли приспособлението и да се разреши ли достъп?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"След като създадете приспособлението, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> има достъп до всички показвани от него данни."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Да се разреши на <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> винаги да създава приспособления и да осъществява достъп до данните им"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Голям текст"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Край на обажд.: Бутон за захранване"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Изговаряне на паролите"</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="3264723681038625967">"Инсталиране на уеб скриптове"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Достъпност в мрежата: Подобряване"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма инсталирани услуги"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Трябва ли ви екранен четец?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack осигурява устна обратна връзка, за да помогне на потребители с увредено и намалено зрение. Искате ли да го инсталирате безплатно от Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Да се инсталират ли уеб скриптовете?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Искате ли приложенията да инсталират скриптове от Google, които правят съдържанието им в мрежата по-достъпно?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Тази функция променя начина, по който устройството ви реагира при допир. Да се включи ли?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма описание."</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_not_available" msgid="3214000535532434353">"Няма данни за употр. на батерията."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"Избраната от вас машина не може да стартира."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигуриране"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Избор на друга машина"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Тази машина за синтезиране на реч може да събира всички изговорено от вас, включително лични данни като пароли и номера на кредитни карти. Тя произлиза от машината <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Искате ли да я активирате?"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"Активирайте преди ползване."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Начертайте фигурата си за отключване"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Трябва да начертаете фигурата си за отключване, за да потвърдите инсталирането на идентификационни данни."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Въведете паролата за хранилището за идентификационни данни."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текуща парола:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Хранилище с данни: изтрито."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Хран. за идент. данни не можа да бъде изтрито."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилището за идентификационни данни е активирано."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Трябва да зададете ПИН код или парола за заключен екран, преди да можете да използвате хранилището за идентификационни данни."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Трябва да зададете ПИН код или парола за заключен екран, преди да можете да използвате хранилището за идентификационни данни."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за спешност"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаване на поведение при спешно обаждане"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Резервни копия и нулиране"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Автоматично възстановяване"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При повторно инсталиране на приложение да се възстановят настройките и данните от резервното копие"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Наст. комп.: Парола"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Понастоящем пълните резервни копия за настолен компютър не са защитени."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Изберете, за да промените или премахнете паролата за пълни резервни копия на настолния компютър"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Понастоящем пълните резервни копия за настолен компютър не са защитени"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Докоснете, за да промените или премахнете паролата за пълни резервни копия на настолния компютър"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Да се спре ли създаването на резервни копия на вашите пароли за Wi-Fi, отметки, други настройки и данните за приложенията ви и да се изтрият всички копия от сървърите на Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Административни настройки на устройство"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Този администратор е активен и разрешава на приложението <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">"Мелодия и известия"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Известия"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Система"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Мелодия на обаждане и вибриране"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"Система"</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="3747859666621319757">"Свързвате се с Wi-Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Синхронизирането не бе успешно"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Синхронизирането е активно"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Синхронизиране"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Синхронизирането понастоящем среща проблеми. Ще продължи скоро."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Добавяне на профил"</string>
     <string name="background_data" msgid="5779592891375473817">"Данни на заден план"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Синхр. е ВКЛЮЧЕНО"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Синхр. е ИЗКЛЮЧЕНО"</string>
     <string name="sync_error" msgid="5060969083117872149">"Грешка при синхр."</string>
+    <string name="last_synced" msgid="4242919465367022234">"Последно синхронизиране: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Синхронизира се сега…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Добре дошли в Google Синхронизиране!"</font>\n"Подходът на Google към синхронизирането на данни, за да ви осигурим достъп до контактите ви, срещите ви и много други неща, където и да сте."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Настройки за синхронизиране на приложения"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Данни и синхронизиране"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Промяна на паролата"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Този профил се изисква от някои приложения. Можете да го премахнете само като възстановите таблета до фабричните настройки (което изтрива всичките ви лични данни) от „Настройки“ &gt; „Резервни копия и възстановяване“."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Този профил се изисква от някои приложения. Можете да го премахнете само като възстановите телефона до фабричните настройки (което изтрива всичките ви лични данни) от „Настройки“ &gt; „Резервни копия и възстановяване“."</string>
     <string name="provider_label" msgid="7724593781904508866">"Прокарване на абонаменти"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"Синхронизиране на <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Не може да се синхронизира ръчно"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизирането за този елемент понастоящем е деактивирано. За да промените настройката, временно включете данните на заден план и автоматичното синхронизиране."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Настройки на 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"MAC адрес за 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Въведете паролата, за да разшифровате хранилището"</string>
     <string name="try_again" msgid="4272075051293936921">"Опитайте отново."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Услугата е заета. Опитайте отново."</string>
     <string name="delete" msgid="4219243412325163003">"Изтриване"</string>
     <string name="misc_files" msgid="6720680815969643497">"Разни файлове"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"Избиране на всички"</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="debug_debugging_category" msgid="6781250159513471316">"Отстраняване на грешки"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Изберете приложение с грешки за отстраняване"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Няма зададено приложение с грешки за отстраняване"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Отстраняване на грешки в приложението: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Избиране на приложение"</string>
+    <string name="no_application" msgid="2813387563129153880">"Нищо"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Изчакване на инструмента за отстраняване на грешки"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Прил. изчаква инстр. за отстраняване на грешки да се прикачи преди изпълнение"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Въвеждане"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Начертаване"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Наблюдение"</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_screen_updates" msgid="5470814345876056420">"Актуал. на повърхн: Показв."</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Примигв. на целите повърхности на прозорците при актуализирането им"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Показване на актуализациите на изгледа от GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Примигв. на изгледи в прозорците при начертаване с GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Хардуерни наслагвания: Деактив."</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Винаги да се използва GPU за изграждане на екрана"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Трасирания: Активиране"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Избиране на акт. трасирания"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Понастоящем няма активирани трасирания"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Понастоящем са активирани <xliff:g id="NUM">%1$d</xliff:g> трасирания"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Понастоящем всички трасирания са активирани"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Граници на оформлението"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Показв. на границите на изрязване, полетата и др."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Употреба на процесора"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наслагване на екрана показва употр. на процесора"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Принудително изобразяване"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"С двуизмерно хардуерно ускорение в приложенията"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Принуд. използв. на GPU за двуизмерно начертаване"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Профилиране на GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Измерване на времето за изобр. в adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Скала на аним.: Прозорец"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Скала на анимация: Преход"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Скала за Animator"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Приложения"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Без съхран. на дейностите"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Унищож. на всяка дейност при напускане от потребител"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Мобилни точки за достъп"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Автоматично синхронизиране на данни"</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="8621855507876539282">"Приложенията не са ползвали данни в този период."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"На преден план"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"На заден план"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Измерва се от таблета. Операторът може да отчита използваните данни различно."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Измерва се от телефона. Операторът може да отчита използваните данни различно."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"ограничено"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Да се деактивират ли мобилните данни?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Лимит на мобилни данни: Задаване"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Задаване на лимит на 4G данните"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Мобилни"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Нищо"</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="8430240158135453271">"Настройки на прилож.: Преглед"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"По-малко данни на заден план"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Деактивиране на данните на заден план само за мобилна мрежа. Ще се използва Wi-Fi, ако е налице."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Деактив. на данните на заден план за моб. мрежи. Ще се използват немобилни, ако са налице."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"За по-малко данни на заден план за прилож. намалете мобилните."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Да се ограничат ли данните на заден план?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Тази функция може да доведе до спиране на работата на приложение, което зависи от данните на заден план, когато Wi-Fi не е налице."\n\n"Можете да намерите по-подходящи контроли за използването им в наличните в приложението настройки."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Тази функция може да доведе до спиране на работата на приложение, което зависи от данните на заден план, когато са налице само мобилни мрежи."\n\n"Можете да намерите по-подходящи контроли за използването на данните в наличните в приложението настройки."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ограничаването на данните на заден план е възможно само когато сте задали ограничение на мобилните данни."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Да се вкл. ли авт. синхр. на данни?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Всички промени, които правите в профилите си в мрежата, ще бъдат копирани автоматично в таблета ви."\n\n"Някои профили могат също да копират автоматично в мрежата извършените от вас промени в таблета. Профилът в Google работи по този начин."\n\n"За да изберете какви видове информация да се синхронизира във всеки профил, отворете „Настройки“ &gt; „Профили“."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Всички промени, които правите в профилите си в мрежата, ще бъдат копирани автоматично в телефона ви."\n\n"Някои профили могат също да копират автоматично в мрежата извършените от вас промени в телефона. Профилът в Google работи по този начин."\n\n"За да изберете какви видове информация да се синхронизира във всеки профил, отворете „Настройки“ &gt; „Профили“."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Да се изкл. ли авт. синхр. на данни?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Това ще спести използването на данни и батерия, но ще трябва да синхронизирате ръчно всеки профил, за да събирате скорошна информация. Няма да получавате и известия, когато има актуализации."</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_warning_editor_title" msgid="3704136912240060339">"Задаване на предупреждение за ползване на данни"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Задаване на ограничение за ползване на данни"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ограничаване на използването на данни"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Връзката ви за данни за <xliff:g id="NETWORKS">%1$s</xliff:g> ще бъде деактивирана при достигане на посочения лимит."\n\n" Тъй като използването им се измерва от таблета ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Връзката ви за данни за <xliff:g id="NETWORKS">%1$s</xliff:g> ще бъде деактивирана при достигане на посочения лимит."\n\n" Тъй като използването им се измерва от телефона ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобилната ви връзка за данни ще бъде деактивирана при достигане на посочения лимит."\n\n"Тъй като използването им се измерва от таблета ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобилната ви връзка за данни ще бъде деактивирана при достигане на посочения лимит."\n\n"Тъй като използването им се измерва от телефона ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Да се ограничат ли данните на заден план?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi-Fi мрежа."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: използвани около <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: използвани около <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: използвани около <xliff:g id="TOTAL">%1$s</xliff:g> по измерване от таблета. Операторът може да отчита данните различно."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: използвани около <xliff:g id="TOTAL">%1$s</xliff:g> по измерване от телефона. Операторът може да отчита данните различно."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Мобилни точки за достъп"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Изберете Wi-Fi мрежите, които са мобилни точки за достъп. Приложенията могат да бъдат ограничени от ползването им, когато са на заден план. Възможно е също да предупреждават, преди да използват тези мрежи за големи изтегляния."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилни мрежи"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi мрежи"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"За да изберете мобилни точки за достъп, включете Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Потребителски профил за VPN: Редактиране"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Свързване със: <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Потребителски профил за VPN: Добавяне"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Редактиране на потребителския профил"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Изтриване на потребителския профил"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Няма връзка с мрежата. Моля, опитайте отново по-късно."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Липсва сертификат. Моля, редактирайте потребителския профил."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"След като включите изследването чрез докосване, можете да докосвате екрана, за да разберете какво има под пръста ви. Например текущият екран съдържа икони на приложения. Намерете една от тях, като докоснете екрана и плъзнете пръста си наоколо."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Добре! Продължете да плъзгате пръста си по екрана, докато намерите поне още една икона."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"За да активирате нещо, което докосвате, го натиснете. Плъзнете пръста си, докато намерите иконата на <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="8764686624055084454">"За превъртане на списък можете да плъзнете два пръста по екрана. Например текущият екран съдържа списък с имена на приложения, които можете да превъртате нагоре или надолу. Първо опитайте да идентифицирате няколко елемента от списъка, като плъзнете пръста си наоколо."</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="3055831259260848004">"Завършихте урока. За изход намерете и докоснете бутона „<xliff:g id="FINISH">%s</xliff:g>“."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Проверка на правописа"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Програма за правописна проверка"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Въведете текущата си парола за пълно резервно копие тук"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Въведете нова парола за пълни резервни копия тук"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Въведете отново новата си парола за пълно резервно копие тук"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Отказ"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Допълнителни системни актуализации"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Потребители и ограничения"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Потребители"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Потребител: Добавяне"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Подробности: Редактиране"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Потребителска информация"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Име"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Ограничения за съдържанието"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Изисква се ПИН"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Класиф. на съдържанието"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Системни приложения"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Инсталирани приложения"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Отхвърляне"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Потребител: Премахв."</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Досадно дете"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Да се премахне ли?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Наистина ли искате да премахнете потребителя и всички свързани данни от устройството?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Известия: Показване"</string>
+    <string name="help_label" msgid="1107174367904110532">"Помощ"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index e091d16..f8366f8 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"S\'està desconnectant..."</item>
     <item msgid="1634960474403853625">"Desconnectada"</item>
     <item msgid="746097431216080650">"Incorrecte"</item>
+    <item msgid="6367044185730295334">"Bloquejada"</item>
+    <item msgid="503942654197908005">"S\'està evitant temporalment una connexió feble"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"S\'està desconnectant de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Desconnectada"</item>
     <item msgid="8578370891960825148">"Incorrecte"</item>
+    <item msgid="5660739516542454527">"Bloquejada"</item>
+    <item msgid="1805837518286731242">"S\'està evitant temporalment una connexió feble"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Botó per prémer"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Cap"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN des del punt d\'accés"</item>
-    <item msgid="7364462169350112617">"PIN des del dispositiu"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Estàtic"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Targeta SD extraïble"</item>
     <item msgid="4498124044785815005">"Deixa que ho decideixi el sistema"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Desactivat"</item>
-    <item msgid="4804571292609523335">"Vibra"</item>
-    <item msgid="595707141547423573">"Silencia"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curt"</item>
     <item msgid="2560532955514699713">"Mitjana"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animació a escala 5x"</item>
     <item msgid="6660750935954853365">"Animació a escala 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animació desactivada"</item>
+    <item msgid="1138649021950863198">"Animació a escala 0,5x"</item>
+    <item msgid="4394388961370833040">"Animació a escala 1x"</item>
+    <item msgid="8125427921655194973">"Animació a escala 1,5x"</item>
+    <item msgid="3334024790739189573">"Animació a escala 2x"</item>
+    <item msgid="3170120558236848008">"Animació a escala 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 04a8e00..bd31ab6 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
+    <string name="create" msgid="3578857613172647409">"Crea"</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>
@@ -105,12 +106,14 @@
     <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 sincronitzats"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Fes que el dispositiu es pugui detectar"</string>
-    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps d\'espera de la visibilitat"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps d\'espera de la visib."</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>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositius Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nom del dispositiu"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Configuració del dispositiu"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Configuració del perfil"</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_rename_device" product="tablet" msgid="787970073150631155">"Canvia el nom de la tauleta"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"S\'està sincronitzant..."</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="5655704645616731277">"Toca per aparellar"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No s\'ha trobat cap dispositiu Bluetooth a prop."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Sol·licitud de sincronització de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sol·licitud de sincronització"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"Toca per aparellar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toca per sincronitzar 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="device_picker" msgid="8398232791303186677">"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="5279027758886569301">"Una aplicació vol activar el Bluetooth. Vols permetre-ho?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Una aplicació de la teva tauleta vol permetre que altres dispositius amb Bluetooth puguin descobrir la teva tauleta durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols permetre-ho?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"D\'acord"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"El nom d\'amfitrió que has escrit no és vàlid."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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_port" msgid="5539106187558215246">"Has 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="2671425042711054494">"El port que has escrit no és vàlid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utilitza un servidor intermediari HTTP, però pot ser que la resta d\'aplicacions no."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Defineix"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Incorrecte"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Correcte"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Els canvis s\'aplicaran quan es torni a connectar el cable USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Els canvis s\'aplicaran quan es torni a connectar el cable USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activa l\'emmagatzematge massiu USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total de bytes:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Emmag. USB no instal·lat"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"No hi ha cap targeta SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Emmagatzematge USB no instal."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"No hi ha cap targeta SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponibles:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Emmag. USB com a massiu"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La targeta SD s\'està utilitzant com a dispositiu d\'emmagatzematge massiu"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"No és segur retirar l\'emmagatzematge USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Ara es pot extreure la targeta SD amb seguretat"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Emm. USB com dis. d\'emm. mass."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"La targeta SD s\'està utilitzant com a dispositiu d\'emmagatzematge massiu."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Ara és segur retirar l\'emmagatzematge USB"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Ara es pot extreure la targeta SD amb seguretat."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Emmag. USB retirat durant ús."</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La targeta SD s\'ha extret mentre s\'utilitzava."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes utilitzats:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Cercant fitxers a USB..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"S\'estan cercant mitjans 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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Emm. USB inst., només lectura"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Targeta SD instal·lada 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="5349877711342869319">"Idioma"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Connecta\'t als serveis de dades en itinerància"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Heu perdut la connectivitat de dades perquè heu abandonat la xarxa local amb la itinerància de dades desactivada."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activa-la"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Voleu permetre la itinerància de dades? Els costos poden ser molt alts."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Atenció"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Si permets la itinerància de dades, els costos poden ser elevats."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Vols permetre la itinerància de dades?"</string>
     <string name="networks" msgid="6333316876545927039">"Selecció d\'operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Selecciona un operador de xarxa"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data i hora"</string>
@@ -283,12 +285,14 @@
     <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>
     <string name="date_time_set_date" msgid="7021491668550232105">"Defineix la data"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Selecció del format de data"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Tria el 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="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Millora la coincidència facial"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Comprovació de moviment"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Cal parpellejar"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"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="3504519024884099702">"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_desc" product="tablet" msgid="3839235202103924154">"Pots encriptar els teus comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. 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 tret que duguis a terme un restabliment de les dades de fàbrica, la qual cosa esborraria totes les teves dades."\n\n"L\'encriptació triga una hora o més. Cal que iniciïs el procés amb la bateria carregada i que mantinguis la tauleta connectada fins que no s\'hagi completat l\'encriptació. Si interromps el procés d\'encriptació, perdràs totes les dades o bé una part."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pots encriptar els teus comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptis el telèfon, necessitaràs un PIN numèric o contrasenya per desencriptar-lo cada vegada que l\'encenguis: no podràs desencriptar el telèfon tret que duguis a terme un restabliment de les dades de fàbrica, cosa que n\'esborrarà totes les dades."\n\n"L\'encriptació triga una hora o més. Cal que iniciïs el procés amb la bateria carregada i que mantinguis el telèfon connectat fins que no s\'hagi completat l\'encriptació. Si interromps el procés d\'encriptació, perdràs totes les dades o bé una part."</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="2029407131227814893">"Carrega la bateria i torna-ho a provar."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"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="5100339496381875522">"Vols encriptar?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"L\'operació d\'encriptació és irreversible i, si l\'interromps, perdràs 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="5682944380460921880">"L\'operació d\'encriptació és irreversible i, si l\'interromps, perdràs 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="6689952371032099350">"Espera mentre s\'encripta la tauleta. <xliff:g id="PERCENT">^1</xliff:g>% complet."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"Escriu 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="6891198717505120682">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades de la tauleta. "\n\n"Per reprendre l\'ús de la tauleta, cal que duguis a terme un restabliment de fàbrica. Quan configuris la tauleta després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu Compte de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades del telèfon. "\n\n"Per reprendre l\'ús del telèfon, cal que duguis a terme un restabliment de fàbrica. Quan configuris el telèfon després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu Compte de Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Selecc. bloq. pantalla"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades de la tauleta. "\n\n"Per reprendre l\'ús de la tauleta, cal que duguis a terme un restabliment de fàbrica. Quan configuris la tauleta després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades del telèfon. "\n\n"Per reprendre l\'ús del telèfon, cal que duguis a terme un restabliment de fàbrica. Quan configuris el telèfon després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Canvia el mètode d\'introducció"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Tria bloq. de pantalla"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Tria bloq. còpia seg."</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Desbloqueig facial"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Patró"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN ha de tenir almenys %d caràcters"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contrasenya ha de tenir menys de <xliff:g id="NUMBER">%d</xliff:g> caràcters."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"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="1079053457942945709">"El PIN només pot contenir els dígits del 0 al 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"L\'administrador del dispositiu no permet l\'ús d\'un PIN recent."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"La contrasenya conté un caràcter no vàlid."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"La contrasenya ha de contenir almenys una lletra."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"La contrasenya ha de contenir almenys un dígit."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"La contrasenya ha de contenir com a mínim una lletra."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"La contrasenya ha de contenir com a mínim una lletra en minúscules."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"La contrasenya ha de contenir com a mínim 1 lletra en majúscules."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"La contrasenya ha de contenir com a mínim un dígit numèric."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"La contrasenya ha de contenir com a mínim un símbol especial."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"La contrasenya ha de contenir com a mínim un caràcter que no sigui una lletra."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"L\'administrador del dispositiu no permet l\'ús d\'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="lock_setup" msgid="1759001157415978959">"Configuració completa"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"S\'ha completat la configuració."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administració 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>
@@ -410,22 +415,22 @@
     <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 de sincronització de Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Per enllaçar amb:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escriu el PIN que el dispositiu sol·licita:"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Per aparellar amb:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escriu la contrasenya que requereix el dispositiu:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Per sincronitzar amb:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escriu la contrasenya que requereix el 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="2796550001376088433">"Per aparellar amb:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escriu-hi:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> i, a continuació, prem la tecla de retorn."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Emparella"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Pot ser que també hagis d\'introduir aquest PIN a l\'altre dispositiu."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Pot ser que també hagis d\'introduir aquesta contrasenya a l\'altre dispositiu."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Per sincronitzar  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">"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 sincronitzar  amb aquest dispositiu?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Per sincronitzar amb:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escriu-hi:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> i, a continuació, prem la tecla de retorn."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sincronitza"</string>
     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel·la"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No s\'ha pogut aparellar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No s\'ha pogut aparellar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g> a causa d\'un PIN o d\'una contrasenya incorrecta."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No s\'ha pogut sincronitzar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No s\'ha pogut sincronitzar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, perquè el PIN o la contrasenya són incorrectes."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"No es pot comunicar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Sincronització rebutjada 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_connecting_error_message" msgid="229861986106185022">"No s\'ha pogut connectar amb <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>
@@ -434,7 +439,7 @@
     <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_pair_connect" msgid="7611522504813927727">"Sincronitza i connecta"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Dessincronitza"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desconnecta i dessincronitza"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcions…"</string>
@@ -478,19 +483,23 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per a música i contingut 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="5237208142892767592">"Permet l\'intercanvi de dades quan el telèfon toqui un altre dispositiu"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permet l\'intercanvi de dades quan el telèfon toqui un altre dispositiu"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permet l\'intercanvi de dades quan el telèfon toqui un altre dispositiu"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Preparat per transmetre el contingut de l\'aplicació mitjançant NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivada"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible perquè NFC està desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Quan aquesta funció està activada, pots transferir contingut d\'aplicacions a un altre dispositiu habilitat per a NFC si els col·loques l\'un a prop de l\'altre. Per exemple, pots transferir pàgines del navegador, vídeos de YouTube, contactes de persones i molt més."\n\n"Col·loca els dispositius a prop (generalment, l\'un d\'esquena a l\'altre) i, a continuació, toca la pantalla. L\'aplicació determina què es transfereix."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detectabilitat del servei de xarxa"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permet que les aplicacions d\'altres dispositius descobreixin les aplicacions d\'aquest"</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="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_setup_wizard_title" msgid="70277346338812325">"Selecciona la Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"No es poden cercar xarxes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificació de xarxa"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notifica\'m quan hi hagi una xarxa oberta disponible"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"S\'ha evitat una mala connexió"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"No facis servir una xarxa Wi-Fi tret que tingui una bona connexió a Internet"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Només connexions bones"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"No facis servir una xarxa Wi-Fi tret que tingui una bona connexió a Internet"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Mantén la Wi-Fi durant el repòs"</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_wps_pbc" msgid="2668564692207863017">"Botó de pulsació de WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introducció de PIN de WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi directe"</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">"Esborra 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_empty_list_wifi_on" msgid="3354911729026237372">"S\'estan cercant xarxes Wi-Fi..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Una altra xarxa…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Més"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automàtica (WPS)"</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="8242979682530043184">"Escriu el PIN del punt d\'accés"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Configuració WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Escriu 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_wps_setup_title" msgid="6034518116333042484">"Configuració protegida de Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"S\'està iniciant WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Prem el botó Configuració protegida de Wi-Fi de l\'encaminador. Pot ser que s\'anomeni \"WPS\" o que contingui aquest símbol:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Introdueix el PIN <xliff:g id="NUMBER">%1$s</xliff:g> a l\'encaminador Wi-Fi. La configuració pot trigar fins a dos minuts a completar-se."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"La configuració de WPS s\'ha dut a terme correctament. S\'està connectant a la xarxa..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Connectat a la xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configuració de WPS ja s\'està executant i pot trigar fins a dos minuts a completar-se"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"S\'ha produït un error en iniciar WPS. Torna-ho a provar d\'aquí a una estona."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"La configuració de seguretat de l\'encaminador sense fils (WEP) no és compatible"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuració de seguretat de l\'encaminador sense fils (TKIP) no és compatible"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Error d\'autenticació. Torna-ho a provar."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"S\'ha detectat una altra sessió de WPS. Torna-ho a provar d\'aquí a una estona."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Desat"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desactivada"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"S\'ha evitat una mala connexió a Internet"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"S\'ha evitat la xarxa perquè la connexió no era bona. Per desactivar això, vés a la pantalla Configuració &gt; Wi-Fi, a l\'element del menú Avançat."</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_wps_available_first_item" msgid="3538912605343585226">"Hi ha una xarxa protegida disponible"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (hi ha una xarxa protegida disponible)"</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_failed_connect_message" msgid="8491902558970292871">"No s\'ha pogut connectar a la xarxa"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Oblida"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"No s\'ha pogut oblidar la xarxa"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Desa"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"No s\'ha pogut desar la xarxa"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancel·la"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"S\'ha detectat una altra sessió protegida de Wi-Fi. Torna-ho a provar d\'aquí a uns quants minuts."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Passarel·la"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefix de xarxa"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi directe"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Configura la connectivitat d\'igual a igual"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informació del dispositiu"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Configuració protegida de Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Escriu 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_remove_group" msgid="4844634506540667517">"Suprimeix el grup"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avançada"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Dispositius disponibles"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Cerca dispositius"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"S\'està cercant..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Canvia el nom del dispositiu"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Dispositius homòlegs"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"No s\'ha pogut connectar."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"S\'ha produït un error en canviar el nom del dispositiu."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Vols desconnectar?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Si et desconnectes, finalitzarà la teva connexió amb <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Si et desconnectes, finalitzarà la teva connexió amb <xliff:g id="PEER_NAME">%1$s</xliff:g> i amb <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispositius més."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vols cancel·lar la invitació?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vols cancel·lar la invitació per connectar amb <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Configura el punt de connexió Wi-fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configura la zona 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="display_settings_title" msgid="1708697328627382561">"Visualització"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Mode silenciós"</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="4296957391257836961">"Volums"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectes musicals"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra quan estigui en silenci"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibra i sona"</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="incoming_call_volume_title" msgid="8073714801365904099">"To"</string>
@@ -605,7 +628,7 @@
     <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="8533399267725365088">"Tons en tocar el teclat per marcar"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"So en marcar el número"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Silencia els tons i les notificacions"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Silencia la música i altres fitxers multimèdia"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Silencia les notificacions"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Silencia les alarmes"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibra quan soni"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Has de connectar la tauleta abans de configurar l\'àudio de connexió."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Has de connectar el telèfon abans de configurar l\'àudio de connexió."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Has de connectar la tauleta abans de configurar l\'àudio de connexió."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Has de connectar el telèfon abans de configurar l\'àudio de connexió."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"So d\'inserció del connector"</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="account_settings" msgid="6403589284618783461">"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="7965901687241669598">"Visualització"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"El meu número de telèfon"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Versió de PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vols 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="2234954758550554549">"Has de dibuixar el teu patró de desbloqueig per confirmar un restabliment de dades de fàbrica."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Has de dibuixar el teu patró de desbloqueig per confirmar el restabliment de dades de fàbrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No s\'ha restablert perquè el servei d\'esborrament del sistema no està disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vols restablir?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Esborra l\'emmagatzematge USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vols esborrar la targeta SD i suprimir tots els fitxers que hi ha emmagatzemats? Aquesta acció no es pot desfer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Esborra-ho tot"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dibuixeu el perfil de desbloqueig"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar l\'emmagatzematge USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar l\'emmagatzematge USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"Connexió compart. per USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Xarxes mòbils"</string>
     <string name="location_title" msgid="1029961368397484576">"La meva ubicació"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Servei d\'ubicació de Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Permet que les aplicacions utilitzin dades de fonts com ara Wi-Fi i xarxes de telefonia mòbil per determinar la teva ubicació aproximada"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Permet que s\'enviïn dades d\'ubicació anònimes a Google. Permet també que les aplicacions que tinguin permís facin servir dades d\'orígens com ara les xarxes de Wi-Fi i mòbils per determinar la ubicació aproximada."</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>
@@ -915,12 +943,12 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premeu Menú per obtenir ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Solteu el dit en acabar."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Connecteu <xliff:g id="NUMBER">%d</xliff:g> punts com a mínim. Torneu-ho a provar:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Patró enregistrat."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Patró enregistrat."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Torneu a dibuixar el patró per confirmar-lo:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Patró de desbloqueig nou:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirma"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Torna a dibuixar"</string>
-    <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Torna-ho a provar"</string>
+    <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Reintenta"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Continua"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Patró de desbloqueig"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Requereix un patró"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Següent"</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="1075370160667458122">"Protegeix la tauleta de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes lliscar 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="tablet" msgid="8616353869251700776">"Protegeix la tauleta de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes lliscar 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="8393155371327584659">"Protegeix el telèfon de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes lliscar el dit per connectar quatre punts com a mínim 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="7041951105633616745">"Gestiona les aplicacions"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestiona i elimina les aplicacions instal·lades"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gestiona les aplicacions i configura les dreceres d\'inici ràpid"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuració de l\'aplicació"</string>
     <string name="install_applications" msgid="4872012136210802181">"Orígens desconeguts"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Permet la instal·lació d\'aplicacions que no siguin d\'Android Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Permet la instal·lació d\'aplicacions d\'origen desconegut"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"La tauleta i les dades personals són més vulnerables a l\'atac d\'aplicacions provinents de fonts desconegudes. Acceptes que ets l\'únic responsable de qualsevol dany que es produeixi a la teva tauleta o de la pèrdua de dades que pugui ocasionar la utilització d\'aquestes aplicacions."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"El telèfon i les dades personals són més vulnerables a rebre atacs d\'aplicacions d\'origen desconegut. Acceptes que ets l\'única persona responsable per qualsevol dany que es produeixi al telèfon o per qualsevol pèrdua de dades que pugui produir-se com a conseqüència de la utilització d\'aquestes aplicacions."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuració avançada"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"Valors predeterminats"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Esborra les dades"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Desinstal·la les actualitzacions"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Has triat executar aquesta aplicació de manera predeterminada per dur a terme algunes accions."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Has seleccionat que vols permetre que aquesta aplicació creï widgets i que accedeixi a les seves dades."</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="1616155457673106022">"És possible que aquesta aplicació no hagi estat dissenyada per a la teva pantalla; pots controlar com s\'ajusta a la pantalla aquí."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordena per mida"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostra els serveis que s\'estan executant"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processos cau"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Restableix prefer. aplic."</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vols rest. pref. aplic.?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Es restabliran totes les preferències per a:"\n\n" "<li>"Aplicacions desactivades"</li>\n" "<li>"Notificacions de l\'aplicació desactivades"</li>\n" "<li>"Aplicacions predeterminades per a accions"</li>\n" "<li>"Restriccions de dades de fons per a les aplicacions"</li>\n\n" No perdràs cap dada de l\'aplicació."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restableix les aplicac."</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestiona l\'espai"</string>
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Selecció d\'opcions de filtre"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Aquesta aplicació pot accedir a les dades següents de la teva tauleta:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Aquesta aplicació pot accedir als elements següents 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="invalid_size_value" msgid="7563537715280712285">"No s\'ha pogut calcular la mida del paquet."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"No tens 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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Canvia la ubicació d\'instal·lació preferida per a les aplicacions noves"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Vols desact. aplic. integr.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Si desactives una aplicació integrada, és possible que altres aplicacions no funcionin correctament."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vols desactivar les notificacions?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactives les notificacions d\'aquesta aplicació, pots perdre\'t actualitzacions i alertes importants."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ús d\'emmagatzematge"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Mostra l\'emmagatzematge que utilitzen les aplicacions"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serveis en execució"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Pot ser que aquest mètode d\'entrada pugui recopilar tot el text que escrius, 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>. Vols utilitzar aquest mètode d\'entrada?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"És possible que aquest corrector ortogràfic pugui recopilar tot el text que escrius, la qual cosa inclou dades personals com ara les contrasenyes i els números de les targetes de crèdit. Prové de l\'aplicació <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vols fer servir aquest corrector ortogràfic?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuració"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"No s\'ha pogut obrir la configuració de: <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Ratolí/ratolí tàctil"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocitat del punter"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de joc"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Utilitza el vibrador"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirecciona el vibrador al controlador de joc quan estigui connectat."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Tria una disposició de teclat"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configura les disposicions de teclat"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Per canviar, prem Ctrl + barra espaiadora"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminat"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Disposicions de teclat"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionari de l\'usuari"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionari personal"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionaris personals"</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_add_screen_title" msgid="742580720124344291">"Frase"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Més opcions"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Menys opcions"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"D\'acord"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Paraula:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Drecera:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Idioma:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Per a tots els idiomes"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Més idiomes..."</string>
     <string name="testing" msgid="6584352735303604146">"Proves"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informació de la tauleta"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informació del telèfon"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID de dispositiu de desenvolupament"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"La informació del dispositiu no està disponible"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Mantén-te activat"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla no se suspendrà mai mentre s\'estigui carregant"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permet les ubicacions fictícies"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions fictícies"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Voleu permetre la depuració USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"La finalitat de la depuració d\'USB és només el desenvolupament. Fes-la servir per copiar dades entre l\'equip i el dispositiu, per instal·lar aplicacions al dispositiu sense notificacions i per llegir les dades del registre."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Vols permetre la conf. de desenvolupament?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Aquesta configuració només està prevista per a usos de desenvolupament. Pot fer que el dispositiu i que les aplicacions s\'interrompin o tinguin un comportament inadequat."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protecció de l\'emmagatz. USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Les aplicacions han de sol·licitar permís per llegir l\'emmagatz. USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vols protegir l\'emmagatz. USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Si l\'emmagatzematge USB està protegit, les aplicacions han de sol·licitar permís per llegir les dades de l\'emmagatzematge extern."\n\n"És possible que algunes aplicacions no funcionin fins que els desenvolupadors no les actualitzin."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protecció de la targeta SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Les aplicacions han de sol·licitar permís per llegir la targeta SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vols protegir la targeta SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Si la targeta SD està protegida, les aplicacions han de sol·licitar permís per llegir les dades de l\'emmagatzematge extern."\n\n"És possible que algunes aplicacions no funcionin fins que els desenvolupadors no les actualitzin."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Selecció de gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Selecció de widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vols crear el widget i permetre l\'accés?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Després de crear el widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> podrà accedir a totes les dades que mostri."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permet sempre que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> creï widgets i que accedeixi a les seves dades"</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>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Pronuncia contrasenyes"</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="3264723681038625967">"Instal·la scripts web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Millora l\'accessibilitat web"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No hi ha cap servei instal·lat"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Necessites un lector de pantalla?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack proporciona comentaris per veu per ajudar usuaris invidents i amb visió disminuïda. Vols instal·lar-lo de manera gratuïta des d\'Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Vols instal·lar scripts web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vols que les aplicacions instal·lin scripts de Google que faran que el seu contingut sigui més accessible?"</string>
-    <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="1072730037861494125">"No s\'ha proporcionat cap descripció."</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_not_available" msgid="3214000535532434353">"Dades d\'ús de bateria no disp."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Instal·la els fitxers de dades de veu necessaris per a la síntesi de veu"</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_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" msgid="3305141107104670703">"El motor que has triat no es pot executar."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configura"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Selecciona un altre motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Pot ser que aquest motor de síntesi de la parla pugui recopilar tot el text que es dirà en veu alta, incloses les dades personals, com ara les contrasenyes i els números de les targetes de crèdit. Ve del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Voleu activar l\'ús d\'aquest motor de síntesi de la parla?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Dona"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Act. el motor nou abans d\'ú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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Dibuixa el patró de desbloqueig"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Has de dibuixar el teu patró de desbloqueig per confirmar la instal·lació de les credencials."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escriu la contrasenya per a l\'emmagatzematge de credencials."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contrasenya actual:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Emmag. credencials esborrat."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"L\'emmagatzematge de credencials no s\'ha esborrat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'emmagatzematge de credencials està activat."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Has d\'establir un PIN o una contrasenya a la pantalla de bloqueig per poder fer servir l\'emmagatzematge de credencials."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Has d\'establir un PIN o una contrasenya a la pantalla de bloqueig per poder fer servir l\'emmagatzematge de credencials."</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="5446972770562918934">"Còpia de seguretat i restabliment"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauració automàtica"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Quan tornis a instal·lar una aplicació, restaura la configuració i les dades de les quals s\'hagi fet una 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="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Actualment les còpies de seguretat d\'escriptori completes no estan protegides"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca per canviar o eliminar la contrasenya per a còpies de seguretat d\'escriptori completes"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vols deixar de fer còpies de seguretat de les contrasenyes de Wi-Fi, dels marcadors i d\'altres paràmetres i de les dades d\'aplicacions i, a més, esborrar totes les còpies que n\'hi hagi als servidors de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuració de l\'administració del dispositiu"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Aquest administrador està actiu i permet que l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> dugui 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_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="6047518536574673606">"Sistema"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"To i vibració de trucada"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"S\'està connectant a la xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"La sincronització ha fallat"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sincronització activa"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"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="background_data" msgid="5779592891375473817">"Dades de referència"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronització activa"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sense sincronització"</string>
     <string name="sync_error" msgid="5060969083117872149">"Error sincron."</string>
+    <string name="last_synced" msgid="4242919465367022234">"Darrera sincronització: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"S\'està sincronitzant ara..."</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><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="6205903695598000286">"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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Hi ha aplicacions que requereixen aquest compte. Només pots eliminar-lo si restableixes la tauleta a la configuració de fàbrica predeterminada (la qual cosa suprimirà totes les teves dades personals) a Configuració &gt; Còpia de seguretat i restabliment."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Hi ha aplicacions que requereixen aquest compte. Només pots eliminar-lo si restableixes el telèfon a la configuració de fàbrica predeterminada (la qual cosa suprimirà totes les teves dades personals) a Configuració &gt; Còpia de seguretat i restabliment."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"No es pot sincronitzar manualment"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"En aquest moment, la sincronització d\'aquest element no està disponible. Per canviar la preferència, activa temporalment les dades de referència i la sincronització automàtica."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"configuració 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"adreça MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Escriu la contrasenya per desxifrar l\'emmagatzematge"</string>
     <string name="try_again" msgid="4272075051293936921">"Torna-ho a provar."</string>
-    <string name="service_busy" msgid="2325014135156127705">"El servei està ocupat. Torna-ho a provar."</string>
     <string name="delete" msgid="4219243412325163003">"Suprimeix"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Depuració"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Selecciona l\'aplicació per depurar"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"No s\'ha definit cap aplicació per depurar"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplicació per depurar: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Selecció de l\'aplicació"</string>
+    <string name="no_application" msgid="2813387563129153880">"Cap"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Espera el depurador"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Apl. depuració espera que s\'adjunti la depuració abans d\'exec."</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Entrada"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Dibuix"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Supervisió"</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 canvis pantalla"</string>
-    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Centelleja àrees de la pantalla en actualitzar-se"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Mostra actual. superfície"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash a superf. de finestres sencer. en act."</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Mostra act. vis. de GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash visual. dins de finestres en pres. amb GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Desact. superposicions HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per a la composició de la pantalla"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Activa les traces"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Selecc. traces activades"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Actualment no hi ha cap traça activada"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traces activades actualment"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Totes les traces activades actualment"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Mostra límits de format"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Mostra els límits de clips, els marges, etc."</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="force_hw_ui" msgid="6426383462520888732">"Força representac. GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Util. acceleració per maquinari 2D a les apl."</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Força l\'ús de GPU per a la 2a presentació"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Perfil representació GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mesura temps repres. a adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Escala durada d\'animació"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Zones de connexió mòbil"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronització automàtica de dades"</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="8621855507876539282">"Cap aplic. ha util. dades durant el 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_disclaimer" product="tablet" msgid="2591250607795265503">"Mesurat per la tauleta. És possible que el recompte d\'ús de dades del teu operador sigui diferent."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Mesurat pel telèfon. És possible que el recompte d\'ús de dades del teu operador sigui diferent."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"restringit"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Vols desactivar les dades mòbils?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Estableix límit de dades mòbils"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Estableix el límit de dades 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mòbils"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Mostra la configuració de l\'aplicació"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringeix les dades de referència"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Desactiva dades de referència en xarxes mòbils. S\'utilitzarà Wi-Fi si està disponible."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desactiva dades de fons en xarxes mòbils. S\'utilitzaran xarxes no mòbils si estan disponibles."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Per restringir dades de referència, estableix un límit de dades mòbils."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vols restringir les dades referència?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Aquesta funció pot provocar que una aplicació que depèn de les dades de referència deixi de funcionar quan no hi hagi Wi-Fi disponible."\n\n"Pots trobar més controls d\'ús de les dades que s\'hi adeqüin a la configuració disponible dins de l\'aplicació."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Aquesta funció pot provocar que una aplicació que depengui de les dades de fons deixi de funcionar quan hi hagi només xarxes mòbils disponibles."\n\n"Pots trobar més controls d\'ús de dades adequats a la configuració disponible a l\'aplicació."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Només pots restringir les dades de referència si has establert un límit de dades mòbils."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activar sincronit. autom. dades?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Els canvis que facis als teus comptes al web es copiaran automàticament a la tauleta."\n\n"És possible que alguns comptes també copiïn els canvis de la tauleta al web. Un compte de Google funciona així."\n\n"Per triar els tipus d\'informació que vols que se sincronitzi en cada compte, vés a Configuració &gt; Comptes."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Els canvis que facis als teus comptes al web es copiaran automàticament al telèfon."\n\n"És possible que alguns comptes també copiïn els canvis del telèfon al web. Un compte de Google funciona així."\n\n"Per triar els tipus d\'informació que vols que se sincronitzi en cada compte, vés a Configuració &gt; Comptes."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vols desactivar sinc. au. dades?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Es conservaran les dades i l\'ús de bateria, però hauràs de sincronitzar els comptes manualment per recopilar la informació recent. I no rebràs notificacions quan hi hagi actualitzacions."</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_warning_editor_title" msgid="3704136912240060339">"Defineix l\'advertiment d\'ús de dades"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Defineix el límit d\'ús de dades"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitació de l\'ús de dades"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"La teva connexió de dades a <xliff:g id="NETWORKS">%1$s</xliff:g> es desactivarà quan s\'arribi al límit especificat."\n\n"Com que la tauleta mesura la utilització de dades i és possible que l\'operador faci un recompte diferent de la utilització, et recomanem que facis servir un límit prudent."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"La teva connexió de dades a <xliff:g id="NETWORKS">%1$s</xliff:g> es desactivarà quan s\'arribi al límit especificat."\n\n"Com que el telèfon mesura la utilització de dades i és possible que l\'operador faci un recompte diferent de la utilització, et recomanem que facis servir un límit prudent."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"La teva connexió de dades mòbil es desactivarà quan s\'arribi al límit especificat."\n\n"Com que la tauleta mesura la utilització de dades i és possible que l\'operador faci un recompte diferent de la utilització, et recomanem que facis servir un límit prudent."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"La teva connexió de dades mòbil es desactivarà quan s\'arribi al límit especificat."\n\n"Com que el telèfon mesura la utilització de dades i és possible que l\'operador faci un recompte diferent de la utilització, et recomanem que facis servir un límit prudent."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vols restringir les dades referència?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si restringeixes les dades mòbils de fons, hi ha aplicacions i serveis que no funcionaran si no estàs connectat a una xarxa Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: aproximadament <xliff:g id="TOTAL">%1$s</xliff:g> utilitzades"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ús aproximat de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ús aproximat de <xliff:g id="TOTAL">%1$s</xliff:g>, segons mesura la tauleta. És possible que l\'operador faci un recompte diferent de la utilització."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ús aproximat de <xliff:g id="TOTAL">%1$s</xliff:g>, segons mesura el telèfon. És possible que l\'operador faci un recompte diferent de la utilització."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Zones de connexió mòbil"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecciona les xarxes Wi-Fi que siguin zones de connexió mòbil. Pot ser que algunes aplicacions tinguin restringit l\'ús d\'aquestes xarxes quan funcionen en segon pla. Pot ser que les aplicacions també avisin abans d\'utilitzar aquestes xarxes per a baixades grans."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Xarxes mòbils"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Xarxes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Per seleccionar zones de connexió mòbil, activa la Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Edició d\'un perfil de VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Connexió amb <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Addició d\'un perfil de VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Edita el perfil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Suprimeix el perfil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"No hi ha cap connexió de xarxa. Torna-ho a provar més tard."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Falta un certificat. Edita el perfil."</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>
@@ -1554,25 +1660,7 @@
     <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"</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="477937585801538951">"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="3973201880357468747">"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="8764686624055084454">"Per desplaçar-te per una llista, pots fer lliscar dos dits per 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="3055831259260848004">"Has completat el tutorial. Per sortir-ne, cerca el botó <xliff:g id="FINISH">%s</xliff:g> i toca\'l."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Correcció ortogràfica"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Corrector ortogràfic"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Introdueix la contrasenya actual per a còpies de seguretat completes aquí"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introdueix una contrasenya nova per a còpies de seguretat completes aquí"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Torna a escriure tota la contrasenya de còpia de seguretat nova aquí"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel·la"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualitzacions addicionals del sistema"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Usuaris i restriccions"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Usuaris"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Afegeix un usuari"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Edita els detalls"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Informació de l\'usuari"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nom"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restriccions de contingut"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN necessari"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Puntuació del contingut"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicacions del sistema"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicacions instal·lades"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Descarta"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Elimina l\'usuari"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Nen trapella"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vols eliminar l\'usuari?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Estàs segur que vols eliminar l\'usuari i totes les dades associades del dispositiu?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra les notificacions"</string>
+    <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index fb36a40..e01d331 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Odpojování..."</item>
     <item msgid="1634960474403853625">"Odpojeno"</item>
     <item msgid="746097431216080650">"Neúspěšné"</item>
+    <item msgid="6367044185730295334">"Blokováno"</item>
+    <item msgid="503942654197908005">"Dočasné předcházení slabému připojení"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Odpojování od sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"Odpojeno"</item>
     <item msgid="8578370891960825148">"Neúspěšné"</item>
+    <item msgid="5660739516542454527">"Blokováno"</item>
+    <item msgid="1805837518286731242">"Dočasné předcházení slabému připojení"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Stisknutí tlačítka"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Žádné"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Kód PIN z přístupového bodu"</item>
-    <item msgid="7364462169350112617">"PIN z tohoto zařízení"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statická"</item>
@@ -211,15 +211,10 @@
     <item msgid="3738430123799803530">"Vyjímatelná karta SD"</item>
     <item msgid="4498124044785815005">"Automaticky vybere systém"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Vypnuto"</item>
-    <item msgid="4804571292609523335">"Vibrovat"</item>
-    <item msgid="595707141547423573">"Ztlumit"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Krátké"</item>
+    <item msgid="3511504869290423954">"Krátká"</item>
     <item msgid="2560532955514699713">"Střední"</item>
-    <item msgid="2372711992605524591">"Dlouhé"</item>
+    <item msgid="2372711992605524591">"Dlouhá"</item>
   </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nikdy nekontrolovat"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Měřítko animace 5x"</item>
     <item msgid="6660750935954853365">"Měřítko animace 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animace je vypnuta"</item>
+    <item msgid="1138649021950863198">"Měřítko animace 0,5x"</item>
+    <item msgid="4394388961370833040">"Měřítko animace 1x"</item>
+    <item msgid="8125427921655194973">"Měřítko animace 1,5x"</item>
+    <item msgid="3334024790739189573">"Měřítko animace 2x"</item>
+    <item msgid="3170120558236848008">"Měřítko animace 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a7994e7..cba55cb 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Ano"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
+    <string name="create" msgid="3578857613172647409">"Vytvořit"</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>
@@ -31,7 +32,7 @@
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Vyžaduje se vypnutí registrace IMS"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Zapnout výpis paměti lte ram"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"Vypnout výpis paměti lte ram"</string>
-    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Zobrazit adresář karty SIM"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Zobrazit adresář SIM karty"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Zobrazit povolená telefonní čísla"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Zobrazit čísla volání služeb"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Získat seznam PDP"</string>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabránit použití vytáčení Bluetooth při uzamčené obrazovce"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Zařízení Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Název zařízení"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Nastavení zařízení"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Nastavení profilu"</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_rename_device" product="tablet" msgid="787970073150631155">"Přejmenovat tablet"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Párová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="5655704645616731277">"Spárujete dotykem"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"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="1931617700075106801">"Klepnutím spárujete se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Klepnutím spárujete 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="device_picker" msgid="8398232791303186677">"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="5279027758886569301">"Aplikace chce zapnout připojení Bluetooth. Povolit?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikace v tabletu chce nastavit tablet do viditelného režimu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Povolit?"</string>
@@ -148,14 +150,14 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Aplikace v telefonu chce zapnout připojení Bluetooth a nastavit telefon do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Povolit?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Aplikace v tabletu chce zapnout Bluetooth a nastavit tablet do viditelného režimu pro ostatní zařízení. Povolit?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Aplikace v telefonu chce zapnout připojení Bluetooth a nastavit telefon do viditelného režimu. Povolit?"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Zapnout Bluetooth?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Zapínání Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vypínání rozhraní Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"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="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Zadaný název hostitele není platný."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Seznam vyloučení, který jste vytvořili, má nesprávný formát. Zadejte 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_port" msgid="5539106187558215246">"Je třeba vyplnit pole portu."</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="2671425042711054494">"Zadaný port není platný."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Server proxy protokolu HTTP může používat prohlížeč, ale nesmí jej používat další aplikace."</string>
@@ -224,30 +226,30 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Nastavit"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Neúspěšné"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Pásmo nastaveno."</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Změna se projeví při příštím připojení kabelu USB."</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Povolit velkokapacitní paměťové zařízení USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Změny se projeví při příštím připojení kabelu USB."</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Povolit velkokapacitní úložiště USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Celková paměť (bajty):"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Úložiště USB není připojeno"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Žádná karta SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Úložiště USB není připojeno."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Karta SD není k dispozici."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Dostupná paměť (bajty):"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Úložiště USB využíváno jako velkokapacitní paměťové zařízení"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Karta SD je využívána jako velkokapacitní paměťové zařízení."</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Nyní můžete úložiště USB bezpečně odebrat."</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Nyní můžete kartu SD bezpečně odebrat."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Úlož. USB užito jako velkokap."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Karta SD je využívána jako velkokapacitní paměťové zařízení."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Úlož. USB lze bezp. odebrat."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Nyní můžete kartu SD bezpečně odebrat."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Úlož. USB odebráno za provozu."</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Karta SD byla odstraněna za provozu."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Obsazená paměť (bajty):"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Hledání médií v úložišti USB…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Úlož. USB připoj. jen ke čtení"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Karta SD je 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="5349877711342869319">"Jazyk"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Vybrat aktivitu"</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="8074070940506840792">"Obrazovka"</string>
+    <string name="display_label" msgid="8074070940506840792">"Displej"</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>
@@ -261,19 +263,19 @@
     <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">"Dat. služby při roamingu"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Datové služby se mohou připojovat při roamingu"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Datové služby se mohou připojovat při roamingu"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"Připojení datových služeb bylo přerušeno, protože jste opustili domovskou síť a datové služby při roamingu máte vypnuty."</string>
+    <string name="roaming" msgid="3596055926335478572">"Datový roaming"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Používat datové služby při roamingu"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Používat datové služby při roamingu"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Připojení datových služeb bylo přerušeno, protože jste opustili domovskou síť a máte vypnutý datový roaming."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Zapnout"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Opravdu chcete povolit datové služby při roamingu? Mohou být účtovány vysoké poplatky."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Upozornění"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Pokud povolíte datový roaming, mohou vám být účtovány vysoké poplatky."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Povolit datový roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Výběr operátora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"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="7095318986757583584">"Umožňuje nastavit datum, čas, časové pásmo a formát"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Automatické datum a čas"</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é čas. pásmo"</string>
@@ -283,14 +285,16 @@
     <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>
     <string name="date_time_set_date" msgid="7021491668550232105">"Nastavení data"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Formát data"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Vybrat 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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Čas"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Zlepšit přiřazování tváří"</string>
+    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Zlepšit rozpoznávání obličeje"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Kontrola živosti"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Vyžadovat mrknutí"</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="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po přechodu do spánku"</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>
@@ -306,32 +310,33 @@
     <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="923629233459331136">"Úč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 napájení. Pokud proces šifrování přerušíte, ztratíte některá nebo všechna data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Úč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_desc" product="tablet" msgid="3839235202103924154">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování tabletu je třeba při každém zapnutí zadat číselný kód PIN nebo heslo, kterým ho opět dešifrujete. Zašifrování tabletu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data."\n\n"Proces šifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte tablet připojený ke zdroji napájení, dokud se šifrování nedokončí. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování musíte při každém zapnutí telefonu vložit číselný kód PIN nebo heslo, abyste ho opět dešifrovali. Zašifrování telefonu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data."\n\n"Proces zašifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte telefon připojený ke zdroji napájení, dokud nebude šifrování dokončeno. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</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="2029407131227814893">"Nabijte baterii a zkuste to znovu."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Připojte 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_dialog_need_password_message" msgid="4071395977297369642">"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="5100339496381875522">"Zašifrovat?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Zašifrování je nevratné, a pokud ho přerušíte, budou vaše data ztracena. Šifrování trvá hodinu a více. Během této doby bude tablet několikrát restartován."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Zašifrování je nevratné, a pokud ho přerušíte, budou vaše data ztracena. Šifrování trvá hodinu a více. Během této doby bude telefon několikrát restartován."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrování"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"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="6891198717505120682">"Šifrování bylo přerušeno a nelze je dokončit. Z tohoto důvodu již nebudou údaje v tabletu přístupné. "\n\n" Chcete-li tablet opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení tabletu obnovit všechna data, která jsou zálohována v účtu Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Šifrování bylo přerušeno a nelze je dokončit. Z tohoto důvodu již nebudou údaje v telefonu přístupné. "\n\n"Chcete-li telefon opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení telefonu obnovit všechna data, která jsou zálohována v účtu Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Vybrat zámek obrazovky"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v tabletu přístupné. "\n\n" Chcete-li tablet opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení tabletu obnovit všechna data, která jsou zálohována v účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v telefonu přístupné. "\n\n"Chcete-li telefon opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení telefonu obnovit všechna data, která jsou zálohována v účtu Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Přepnout metodu vstupu"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vybrat zámek obrazovky"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Výběr záložního zámku"</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_launch_picker_enable_summary" msgid="4791110798817242301">"Vyberte způsob uzamknutí obrazovky"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Jak chcete zařízení odemknout v případě, že vás funkce Odemknutí obličejem nevidí?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Jak chcete zařízení odemknout v případě, že vás funkce Odemknutí obličejem nerozpozná?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Žádný"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Tažením"</string>
@@ -345,12 +350,12 @@
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Vysoké zabezpečení"</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_off" msgid="5881952274566013651">"Žádný"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Tažením"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Odemknutí obličejem"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Gesto"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Heslo"</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>
@@ -358,48 +363,48 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Změna bezpečnostního gesta"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Změna bezpečnostního kódu PIN"</string>
     <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_password_too_short" msgid="7328975683669256660">"Heslo musí obsahovat nejméně %d znaky"</string>
+    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovat nejméně %d znaky"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Heslo musí mít méně než <xliff:g id="NUMBER">%d</xliff:g> znaků."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN musí mít méně než <xliff:g id="NUMBER">%d</xliff:g> číslic."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Kód PIN musí obsahovat pouze číslice 0 až 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Administrátor zařízení neumožňuje používat nedávno užitý kód PIN."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Heslo obsahuje neplatný znak."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Heslo musí obsahovat nejméně jedno písmeno."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Heslo musí obsahovat alespoň jednu číslici."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Heslo musí obsahovat nejméně jedno písmeno."</item>
+    <item quantity="other" msgid="8186027808415585970">"Požadovaný minimální počet písmen v heslu: %d."</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>
+    <item quantity="one" msgid="5583986519662091001">"Heslo musí obsahovat nejméně jedno malé písmeno."</item>
+    <item quantity="other" msgid="2693910942679679225">"Požadovaný minimální počet malých písmen v heslu: %d."</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>
+    <item quantity="one" msgid="2611909966725502768">"Heslo musí obsahovat nejméně jedno velké písmeno."</item>
+    <item quantity="other" msgid="3030801209112209245">"Požadovaný minimální počet velkých písmen v heslu: %d."</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>
+    <item quantity="one" msgid="3820355568839621231">"Heslo musí obsahovat alespoň jednu číslici."</item>
+    <item quantity="other" msgid="4703982391407595924">"Požadovaný minimální počet číslic v heslu: %d."</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>
+    <item quantity="one" msgid="8456579939292408631">"Heslo musí obsahovat nejméně jeden zvláštní symbol."</item>
+    <item quantity="other" msgid="1221290525051187757">"Požadovaný minimální počet zvláštních symbolů v heslu: %d."</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>
+    <item quantity="one" msgid="4594051152085925921">"Heslo musí obsahovat nejméně jeden znak jiný než písmeno."</item>
+    <item quantity="other" msgid="3952508584649046404">"Požadovaný minimální počet nepísmenných znaků v heslu: %d."</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_password_recently_used" msgid="6098087796784262081">"Administrátor zařízení neumožňuje použít heslo, které jste použili nedávno."</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="lock_setup" msgid="1759001157415978959">"Nastavení dokončeno"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Nastavení je dokončeno."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Správa 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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Párování se zařízením:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Zadejte přístupový klíč požadovaný zařízením:"</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_enter_pin_other_device" msgid="4637977124526813470">"Tento kód PIN bude možná nutné zadat i v dalším zařízení."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Tento přístupový klíč bude možná nutné zadat i v druhé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="2796550001376088433">"Párování se zařízením:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Zadejte:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> a poté stiskněte klávesu Return nebo Enter."</string>
@@ -425,12 +430,12 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nelze párovat se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Kód PIN nebo přístupový klíč je nesprávný."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nelze navázat komunikaci."</string>
     <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_connecting_error_message" msgid="229861986106185022">"K zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> se nelze připojit."</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_paired_devices" msgid="1970524193086791964">"Spá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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Povolit výměnu dat, pokud se telefon dotkne jiného zařízení"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povolit výměnu dat, pokud se tablet dotkne jiného zařízení"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povolit výměnu dat, pokud se telefon dotkne jiného zařízení"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Přenos obsahu aplikace prostřednictvím NFC je připraven"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Vypnuto"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Není k dispozici, protože je vypnuta funkce NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Pokud je funkce zapnuta, můžete přenášet obsah aplikace do jiného zařízení s funkcí NFC tím, že podržíte zařízení blízko sebe. Můžete například přenášet stránky prohlížeče, videa YouTube, kontakty a další."\n\n"Přiložte zařízení k sobě (zpravidla zadní stranou) a dotkněte se obrazovky. Aplikace určí, jaký obsah se bude přenášet."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Zjistitelnost po síti"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Povolit aplikacím v jiných zařízeních vyhledávat aplikace v tomto zařízení"</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="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_setup_wizard_title" msgid="70277346338812325">"Vybrat síť Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nelze hledat sítě"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Oznamování sítě"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Oznamovat dostupné nezabezpečené sítě"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Zabránit slabým připojením"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Nepoužívat síť Wi-Fi, pokud nemá dostatečně kvalitní internetové připojení"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Ponechat připojení Wi-Fi během režimu spánku"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Ignorovat slabá připojení"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nepoužívat síť Wi-Fi, pokud nemá dostatečně kvalitní internetové připojení."</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wi-Fi zapnutá v režimu spánku"</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_wps_pbc" msgid="2668564692207863017">"Tlačítko WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadání kódu WPS PIN"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Přímé přip. Wi-Fi"</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_empty_list_wifi_off" msgid="4722299515264875943">"Chcete-li zobrazit dostupné sítě, zapněte Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Vyhledávání sítí Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Jiná síť…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Další"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. nastavení (WPS)"</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="8242979682530043184">"Zadejte kód PIN z přístupového bodu"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Nastavení WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"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_wps_setup_title" msgid="6034518116333042484">"Chráněné nastavení Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spouštění WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Stiskněte na směrovači tlačítko Chráněné nastavení Wi-Fi. Může být označeno textem „WPS“ nebo tímto symbolem:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Zadejte ve svém směrovači sítě Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavení může trvat až dvě minuty."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Spuštění WPS se podařilo. Probíhá připojení k síti..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Připojeno k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS probíhá a dokončení procesu může trvat až dvě minuty."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spuštění WPS se nezdařilo. Zkuste to znovu za několik minut."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavení zabezpečení bezdrátového směrovače (WEP) není podporováno"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavení zabezpečení bezdrátového směrovače (TKIP) není podporováno"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Chyba ověření. Zkuste to prosím znovu."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Byla zjištěna další relace WPS. Zkuste prosím to znovu za několik minut."</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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Bylo zabráněno slabému připojení"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Síť nebyla použita z důvodu špatného připojení. Toto nastavení můžete vypnout na obrazovce Nastavení v části Wi-Fi, položka nabídky Pokročilé."</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_wps_available_first_item" msgid="3538912605343585226">"Je k dispozici chráněná síť"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (k dispozici je chráněná síť)"</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">"Žádné"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Připojení k síti se nezdařilo."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstranit"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Odstranění záznamu sítě se nezdařilo."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Uložit"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Uložení sítě se nezdařilo."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Zrušit"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Zjištěna další relace zabezpečené sítě Wi-Fi. Zkuste to znovu za chvíli."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Délka síťové předpony"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Přímé připojení sítě Wi-Fi"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Nastavit připojení typu peer-to-peer"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Přímé připojení sítě Wi-Fi"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informace o zařízení"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Chráněné nastavení Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Odebrat skupinu"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Pokročilé"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Dostupná zařízení"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Hledání zařízení"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Hledání…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Přejmenovat zařízení"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Partnerská zařízení"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Nelze připojit."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Zařízení se nepodařilo přejmenovat."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Odpojit?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Pokud se odpojíte, vaše spojení se zařízením <xliff:g id="PEER_NAME">%1$s</xliff:g> bude přerušeno."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Pokud se odpojíte, bude spojení se zařízením <xliff:g id="PEER_NAME">%1$s</xliff:g> a s <xliff:g id="PEER_COUNT">%2$s</xliff:g> dalšími zařízeními přerušeno."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušit pozvánku?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušit pozvánku ke spojení s klientem <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Konfigurace hotspotu Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nastavit hotspot sítě 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="display_settings_title" msgid="1708697328627382561">"Zobrazení"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Tichý režim"</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="4296957391257836961">"Hlasitost"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Hudební efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitost vyzvánění"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovat v tichém režimu"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrace a vyzvánění"</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="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváněcí tón"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Vypnout zvuk vyzvánění a oznámení"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Vypnout zvuk hudby a jiných médií"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Vypnout zvuk oznámení"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Vypnout zvuk budíků"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrace při vyzvánění"</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>
@@ -623,17 +651,18 @@
     <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" product="tablet" msgid="9015625921245904495">"Chcete-li nastavit zvuk doku, musíte do něj vložit tablet."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Chcete-li nastavit zvuk doku, musíte do něj vložit telefon."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Chcete-li nastavit zvuk doku, musíte tablet vložit do doku."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Chcete-li nastavit zvuk doku, musíte telefon vložit do doku."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Zvuk při vložení do 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>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <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="7965901687241669598">"Obraz"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Displej"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Autom. otočení obrazovky"</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>
@@ -642,42 +671,42 @@
     <string name="brightness" msgid="2354961343555249270">"Jas"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Nastavení jasu displeje"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
-    <string name="screen_timeout_summary" msgid="327761329263064327">"Po nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrat tapetu z"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrat tapetu:"</string>
     <string name="screensaver_settings_title" msgid="3848608373818910549">"Dekorace displeje"</string>
     <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Pokud je zařízení připojeno ke zdroji, spustí se při přechodu do režimu spánku"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Vypnuto"</string>
     <string name="screensaver_component_title" msgid="8596216100441725363">"Vybraná dekorace"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Čas aktivace"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikdy"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Vyzkoušet"</string>
     <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Spustit i po vložení do doku"</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_settings" msgid="3392331196873564292">"Nastavení zámku SIM karty"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavení zámku SIM karty"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámek SIM karty"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"Zamykat SIM kartu"</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>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Odemknout kartu SIM"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"Starý kód PIN karty SIM"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"Nový kód PIN karty SIM"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Změnit PIN SIM karty"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"PIN SIM karty"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zamykat SIM kartu"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Odemknout SIM kartu"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"Starý PIN SIM karty"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"Nový PIN SIM karty"</string>
     <string name="sim_reenter_new" msgid="3178510434642201544">"Potvrďte nový kód PIN."</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"Kód PIN karty SIM"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM karty"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Nesprávný kód PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Kódy PIN nejsou shodné"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"Kód PIN nelze změnit."\n"Možná jste zadali nesprávný kód PIN."</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"Kód PIN karty SIM byl úspěšně změněn."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Stav zámku karty SIM nelze změnit."\n"Zřejmě jste zadali nesprávný kód PIN."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM karty byl úspěšně změněn."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Stav zámku SIM karty 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" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
@@ -702,7 +731,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Moje telefonní číslo"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Verze PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -727,7 +756,7 @@
     <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="558887013613822577">"Fotografie, videa"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"Zvuk (hudba, vyzváněcí tóny, podcasty atd.)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"Zvuk (hudba, vyzvánění, 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>
@@ -766,11 +795,11 @@
     <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>
+    <string name="apn_settings" msgid="3743170484827528406">"Přístupové body"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Upravit přístupový bod"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Nenastaveno"</string>
     <string name="apn_name" msgid="4115580098369824123">"Jméno"</string>
-    <string name="apn_apn" msgid="2479425126733513353">"Název AP"</string>
+    <string name="apn_apn" msgid="2479425126733513353">"Název přístupvého bodu (APN)"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"Proxy"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"Port"</string>
     <string name="apn_user" msgid="455637547356117761">"Uživatelské jméno"</string>
@@ -786,19 +815,19 @@
     <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 nebo CHAP"</string>
-    <string name="apn_type" msgid="469613123902220544">"Typ názvu AP"</string>
+    <string name="apn_type" msgid="469613123902220544">"Typ přístupového bodu APN"</string>
     <string name="apn_protocol" msgid="3272222921649348640">"Protokol APN"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"Protokol APN pro roaming"</string>
-    <string name="carrier_enabled" msgid="407655861175280806">"Povolit/zakázat název přístupového bodu (APN)"</string>
+    <string name="carrier_enabled" msgid="407655861175280806">"Povolit/zakázat APN"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Název přístupového bodu (APN) povolen"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Název přístupového bodu (APN) zakázán"</string>
     <string name="bearer" msgid="594270280031923558">"Nositel"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Smazat název přístupového bodu"</string>
-    <string name="menu_new" msgid="3014205883303921729">"Nový název AP"</string>
+    <string name="menu_new" msgid="3014205883303921729">"Nový přístupový bod"</string>
     <string name="menu_save" msgid="8109345640668285399">"Uložit"</string>
-    <string name="menu_cancel" msgid="2194502410474697474">"Zrušit"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"Zahodit"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
-    <string name="error_name_empty" msgid="8418502878620394756">"Pole Název nesmí být prázdné."</string>
+    <string name="error_name_empty" msgid="8418502878620394756">"Pole Jméno nesmí být prázdné."</string>
     <string name="error_apn_empty" msgid="6056233831214537267">"Název přístupového bodu (APN) nesmí být prázdný."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Pole MCC musí obsahovat alespoň 3 číslice."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Pole MNC musí obsahovat 2 nebo 3 číslice."</string>
@@ -810,7 +839,7 @@
     <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="8317211882509025841">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mimo jiné následují:"\n\n<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mimo jiné i následující:"\n\n<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</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_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:"\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="7744115866662613411">\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="4801026652617377093">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
@@ -823,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"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="2234954758550554549">"Chcete-li potvrdit obnovení továrních dat, musíte nakreslit bezpečnostní gesto."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Chcete-li potvrdit obnovení továrních dat, musíte nakreslit bezpečnostní gesto."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Pokus o obnovení se nezdařil, protože služba System Clear není dostupná."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Resetovat?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Smazat úložiště USB"</string>
@@ -838,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Chcete kartu SD smazat a odstranit tak všechny soubory, které jsou na ní uloženy? Tuto akci nelze vrátit zpět."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Odstranit vše"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Proveďte gesto odemknutí"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Smazání úložiště USB je třeba potvrdit pomocí bezpečnostního gesta."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Smazání úložiště USB je třeba potvrdit pomocí bezpečnostního gesta."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"Tethering pomocí USB"</string>
@@ -849,7 +878,7 @@
     <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>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Připojeno přes USB. Zaškrtněte prstem políčko pro vytvoření tetheringu."</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Sdíleno"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"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>
@@ -870,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilní sítě"</string>
     <string name="location_title" msgid="1029961368397484576">"Moje poloha"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Určování polohy Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Povolit aplikacím používat k určení vaší přibližné polohy údaje ze zdrojů, jako jsou sítě Wi-Fi nebo mobilní sítě"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Povolit odesílání anonymních dat o poloze do Googlu a současně umožnit povoleným aplikacím, aby k určení vaší přibližné polohy využívaly data ze zdrojů, jako jsou sítě Wi-Fi a mobilní 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>
@@ -878,7 +907,7 @@
     <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="use_location_title" msgid="5206937465504979977">"Poloha a vyhledávání"</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="use_location_summary" msgid="3978805802386162520">"Povolit Googlu 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>
@@ -895,7 +924,7 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"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_pattern_header" msgid="6949761069941694050">"Vyberte gesto"</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é gesto"</string>
@@ -915,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nápovědu zobrazíte stisknutím klávesy Menu."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Na závěr zdvihněte prst z obrazovky."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Minimální počet spojených teček je <xliff:g id="NUMBER">%d</xliff:g>. Zkuste to znovu:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Gesto bylo zaznamenáno."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Gesto bylo zaznamenáno."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Proveďte gesto znovu pro potvrzení:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Nové gesto odemknutí:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potvrdit"</string>
@@ -925,9 +954,9 @@
     <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="2615606088906120711">"Zobrazit vzor"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Zobrazovat gesto"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Při dotyku vibrovat"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tl. napájení zařízení zamkne"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tl. napájení zamkne zařízení"</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>
@@ -937,22 +966,23 @@
     <string name="next_button_label" msgid="8890792540116568321">"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="1075370160667458122">"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="8393155371327584659">"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="lock_intro_message" product="tablet" msgid="8616353869251700776">"Tablet můžete chránit před neoprávněným použitím pomocí osobního bezpečnostního gesta pro odemknutí obrazovky. Tečky na následující obrazovce spojte prstem v jakémkoli pořadí. Je potřeba spojit 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="8393155371327584659">"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í. Je třeba spojit 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="7041951105633616745">"Spravovat aplikace"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Umožňuje spravovat a odebírat instalované aplikace"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikace"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Správa aplikací a klávesových zkratek rychlého spuštění"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavení aplikace"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznámé zdroje"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Povolit instalaci aplikací, které nepocházejí ze služby Market"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Data zařízení 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 zařízení a ztráty dat způsobené používáním těchto aplikací."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Váš telefon a osobní údaje jsou zranitelnější vůči útoku aplikací z neznámých zdrojů. Souhlasíte s tím, ž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_unknown_applications" msgid="176855644862942064">"Povolit instalaci aplikací z neznámých zdrojů"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Data zařízení a osobní údaje jsou zranitelnější vůči útoku aplikací, které pochází z neznámých zdrojů. Souhlasíte s tím, že jste výhradně odpovědní za případné škody na zařízení a ztráty dat způsobené používáním těchto aplikací."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Váš telefon a osobní údaje jsou zranitelnější vůči útoku aplikací, které pochází z neznámých zdrojů. Souhlasíte s tím, ž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="4016682978071086747">"Povolit další možnosti nastavení"</string>
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"Výchozí aplikace"</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>
@@ -972,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Mazání dat"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Odinstalovat aktualizace"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Aplikace byla nastavena, aby se pro některé akce spouštěla jako výchozí."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Této aplikaci jste povolili vytváření widgetů a přístup k jejich datům."</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="1616155457673106022">"Tato aplikace nejspíš není určena pro vaši obrazovku. Zde můžete nastavit, jak se aplikace obrazovce přizpůsobí."</string>
@@ -982,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Řadit podle velikosti"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Zobrazit spuštěné služby"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Zobrazit mezipaměť"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Obnovit nastavení apl."</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnovit nastavení apl.?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Touto akcí obnovíte všechna nastavení pro:"\n\n" "<li>"deaktivované aplikace,"</li>\n" "<li>"deaktivovaná oznámení aplikací,"</li>\n" "<li>"výchozí aplikace k provádění akcí,"</li>\n" "<li>"omezení dat na pozadí pro aplikace."</li>\n\n" O žádná data aplikací nepřijdete."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnovit aplikace"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa paměti"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrovat"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Vyberte možnosti filtru"</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Tato aplikace má přístup k následujícím funkcím tabletu:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"Nepodařilo se určit velikost balíčku."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Žá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>
@@ -1032,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Změna preferovaného umístění pro instalaci nových aplikací"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Zakázat integrovanou aplikaci"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Pokud zakážete integrovanou aplikaci, může se stát, že ostatní aplikace přestanou fungovat správně."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vypnout oznámení?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Pokud v této aplikaci vypnete oznámení, můžete přijít o důležitá upozornění a aktuality."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využití úložiště"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Zobrazit aplikacemi používané úložiště"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spuštěné služby"</string>
@@ -1047,10 +1084,10 @@
     <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">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Spuštěná aplikace"</string>
     <string name="no_services" msgid="7133900764462288263">"Neaktivní"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Služby"</string>
@@ -1067,10 +1104,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Zastavit systémovou službu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Pokud tuto službu zastavíte, může se stát, že některé funkce telefonu nebudou fungovat správně, dokud telefon nevypnete a opět nezapnete."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Pokud tuto službu zastavíte, může se stát, že některé funkce tabletu nebudou fungovat správně, 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" msgid="5292716747264442359">"Jazyk a zadávání"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Jazyk a zadávání"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Nastavení jazyka"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"Klávesnice a metody vstupu"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Klávesnice a metody zadávání"</string>
     <string name="phone_language" msgid="8870144109924299673">"Jazyk"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Automatické nahrazování"</string>
@@ -1080,23 +1117,42 @@
     <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="3001113966880559611">"Zobrazit hesla"</string>
+    <string name="show_password" msgid="3001113966880559611">"Zobrazovat hesla"</string>
     <string name="show_password_summary" msgid="7345931695292850058"></string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"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 platebních karet. Metoda je poskytována aplikací <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete tuto metodu zadávání dat použít?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Prostřednictvím této vstupní metody zadávání dat lze shromažďovat zadaný text včetně osobních údajů, jako jsou hesla a čísla platebních karet. Metoda je poskytována aplikací <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete tuto metodu zadávání dat použít?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Prostřednictvím této kontroly pravopisu lze shromažďovat zadaný text včetně osobních údajů, jako jsou hesla a čísla kreditních karet. Kontrola pravopisu je součástí aplikace <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Chcete tuto kontrolu pravopisu použít?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Nastavení"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Jazyk"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Nastavení aplikace <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> se nepodařilo otevřít"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Myš/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Rychlost kurzoru"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Herní ovladače"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Použít vibrace"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Přesměrovat vibrace do herního ovladače, je-li připojen."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Zvolte rozložení klávesnice"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Nastavit rozvržení klávesnice"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Přepněte klávesami ctrl+mezerník"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Výchozí"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Rozložení klávesnice"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uživatelský slovník"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobní slovník"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobní 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_add_screen_title" msgid="742580720124344291">"Fráze"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Více možností"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Méně možností"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Slovo:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Zkratka:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Jazyk:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Pro všechny jazyky"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Další jazyky..."</string>
     <string name="testing" msgid="6584352735303604146">"Testování"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informace o tabletu"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Info o telefonu"</string>
@@ -1115,35 +1171,46 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Zadávání textu"</string>
     <string name="input_method" msgid="5434026103176856164">"Metoda zadávání dat"</string>
     <string name="current_input_method" msgid="234072873286056438">"Výchozí"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"Nabídka metody vstupu"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Výběr metody zadávání"</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="1317429869771850228">"Nastavit metody vstupu"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"Nastavit metody zadávání"</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="active_input_method_subtypes" msgid="3596398805424733238">"Aktivní metody zadávání"</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="4421813273170250462">"Vybrat aktivní metody vstupu"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Vybrat aktivní metody zadávání"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavení klávesnice na obrazovce"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fyzická klávesnice"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Nastavení fyzické klávesnice"</string>
-    <string name="development_settings_title" msgid="215179176067683667">"Možnosti pro vývojáře"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Pro vývojáře"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID zařízení pro vývoj"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Informace o zařízení nejsou k dispozici."</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Nevypínat obrazovku"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povolit ladění USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ladění prostřednictvím rozhraní USB je určeno pouze pro účely vývoje. Použijte je ke kopírování dat mezi počítačem a zařízením, instalaci aplikací do zařízení bez upozornění a čtení dat protokolů."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Povolit nastavení pro vývojáře?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Tato nastavení jsou určena pouze pro vývojáře. Mohou způsobit rozbití nebo nesprávné fungování zařízení a nainstalovaných aplikací."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Chránit úložiště USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikace musejí před čtením z úložiště USB žádat o povolení"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Chránit úložiště USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Pokud je úložiště USB chráněno, musejí aplikace před čtením dat z externího úložiště požádat o povolení."\n\n"Některé aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Chránit kartu SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikace musejí před čtením z karty SD žádat o povolení"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Chránit kartu SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Pokud je karta SD chráněná, musejí aplikace před čtením dat z externího úložiště požádat o povolení."\n\n"Některé aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Zvolte gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Zvolte widget"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> dní <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvořit widget a povolit přístup?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Po vytvoření widgetu bude moci aplikace <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> získat přístup ke všem datům, které widget zobrazuje."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Vždy povolit aplikaci <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> vytváření widgetů a přístup k jejich datům"</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> 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> h <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>
@@ -1160,18 +1227,15 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Velký text"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tlač. napájení ukončí hovor"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Vyslovovat hesla"</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="3264723681038625967">"Nainstalovat webové skripty"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Usnadnit přístup k webu"</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>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nepovoleno"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Povolit"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Nepovolit"</string>
+    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Nepovolovat"</string>
     <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Použít službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"Služba <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> zaznamenává veškerý text, který napíšete, kromě hesel. To zahrnuje osobní údaje, jako jsou čísla platebních karet. Zaznamenává také údaje o interakci s tabletem."</string>
     <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"Služba <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> zaznamenává veškerý text, který napíšete, kromě hesel. To zahrnuje osobní údaje, jako jsou čísla platebních karet. Zaznamenává také údaje o interakci s telefonem."</string>
@@ -1180,18 +1244,16 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Žádná služba není nainstalována"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potřebujete čtečku obrazovky?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack poskytuje mluvenou navigaci nevidomým a slabozrakým uživatelům. Chcete tuto aplikaci stáhnout zdarma ze služby Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Instalovat webové skripty?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Chcete, aby aplikace nainstalovaly skripty Google, které postiženým usnadní přístup k jejich webovému obsahu?"</string>
-    <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_script_injection_security_warning_summary" msgid="7706858873495386310">"Chcete, aby aplikace nainstalovaly skripty Google, které usnadní přístup k jejich webovému obsahu?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozici není žádný popis."</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_not_available" msgid="3214000535532434353">"Údaje o spotřebě nejsou známy."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"Provoz na baterii: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> od odpojení"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Nabíjení"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Obrazovka zapnutá"</string>
@@ -1210,10 +1272,10 @@
     <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="3023346080675904613">"Obrazovka"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Displej"</string>
     <string name="power_wifi" msgid="2382791137776486974">"WiFi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"V pohotovostním režimu"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Pohotovostní režim"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet v nečinnosti"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"V nečinnosti"</string>
@@ -1242,7 +1304,7 @@
     <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>
-    <string name="battery_sugg_display" msgid="3370202402045141760">"Snižte jas displeje nebo interval vypnutí obrazovky"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Snižte jas displeje nebo interval jeho vypínání"</string>
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Využití baterie sítí WiFi"</string>
     <string name="battery_sugg_wifi" msgid="2085605314976704287">"Pokud síť Wi-Fi nepoužíváte nebo na daném místě není k dispozici, vypněte přijímač Wi-Fi."</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Využití baterie technologií Bluetooth"</string>
@@ -1255,7 +1317,7 @@
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojení"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Při posledním odpojení pro <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Využití baterie celkem"</string>
-    <string name="menu_stats_refresh" msgid="1676215433344981075">"Obnovit"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Aktualizovat"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Hlasový vstup a výstup"</string>
@@ -1285,7 +1347,7 @@
     <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_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" msgid="3305141107104670703">"Modul, který jste vybrali, nelze spustit."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurovat"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vyberte jiný modul"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Modul pro syntézu řeči může shromažďovat veškerý mluvený text, včetně osobních dat jako jsou hesla nebo čísla kreditních karet. Je založen na modulu <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Chcete modul pro syntézu řeči aktivovat?"</string>
@@ -1294,18 +1356,18 @@
     <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="tts_engine_settings_title" msgid="3499112142425680334">"<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>
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Žena"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Před použitím 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="5519037532720577836">"Ovládací prvek napájení"</string>
+    <string name="gadget_title" msgid="5519037532720577836">"Kontrola spotřeby energie"</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_title" msgid="5662579425832406705">"Síť VPN"</string>
@@ -1318,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Proveďte bezpečnostní gesto"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Instalaci pověření je třeba potvrdit provedením bezpečnostního gesta."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Zadejte heslo pro úložiště pověření."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuální heslo:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Úložiště pověření je vymazáno."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Úložiště pověření nelze smazat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Úložiště pověření je aktivováno."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Před použitím úložiště pověření musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Před použitím úložiště pověření musíte nastavit kód PIN nebo heslo zámku obrazovky."</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="5446972770562918934">"Zálohování a obnovení dat"</string>
@@ -1338,13 +1402,13 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobní údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohování mých dat"</string>
     <string name="backup_data_summary" msgid="9157861529438245957">"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_title" msgid="3790872965773196615">"Záložní účet"</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="4235615056371993807">"Při přeinstalaci aplikace 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="4780151366296088113">"Ú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="local_backup_password_summary_none" msgid="393503434408227110">"Úplné zálohy v počítači nejsou v současné době chráněny"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"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="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Chcete přestat zálohovat hesla sítí Wi-Fi, záložky, další nastavení, data aplikací a vymazat všechny kopie ze serverů Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavení správce zařízení"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Systém"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Tón vyzvánění a vibrace"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Připojování k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1457,10 @@
     <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_failed" msgid="1696499856374109647">"Synchronizace se nezdařila"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Synchronizace je aktivní"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <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="background_data" msgid="5779592891375473817">"Data na pozadí"</string>
@@ -1404,16 +1471,20 @@
     <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>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <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">
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Synchronizaci provedete dotykem<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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Vítá vás aplikace Google Sync."</font>" "\n"Nový pohled společnosti Google na synchronizaci dat vám poskytuje přístup ke kontaktům, schůzkám a dalším informacím, ať jste kdekoli."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"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>
@@ -1427,7 +1498,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Některé aplikace tento účet vyžadují. Můžete jej odebrat pouze tím, že v tabletu v nabídce Nastavení &gt; Zálohovat a obnovit obnovíte tovární nastavení (vymažete tak všechna svá osobní data)."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Některé aplikace tento účet vyžadují. Můžete jej odebrat pouze tím, že v telefonu v nabídce Nastavení &gt; Zálohovat a obnovit obnovíte tovární nastavení (vymažete tak všechna svá osobní data)."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nelze ručně synchronizovat"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizace této položky je aktuálně deaktivována. Chcete-li nastavení změnit, dočasně zapněte přenos dat na pozadí a automatickou synchronizaci."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Nastavení sítě 4G"</string>
@@ -1435,7 +1507,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa MAC sítě 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Chcete-li obsah úložiště dešifrovat, zadejte heslo."</string>
     <string name="try_again" msgid="4272075051293936921">"Zkuste to znovu."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Služba je zaneprázdněna, zkuste to znovu."</string>
     <string name="delete" msgid="4219243412325163003">"Smazat"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1514,46 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Ladění"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Vybrat aplikaci pro ladění"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Není nastavena žádná aplikace pro ladění"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplikace pro ladění: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Výběr aplikace"</string>
+    <string name="no_application" msgid="2813387563129153880">"Nic"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Počkat na ladicí program"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikace čeká na připojení ladicího programu"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Vstup"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Kresba"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Sledování"</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">"Zobrazit překryvnou vrstvu 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">"Aktualizace displeje"</string>
-    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Blikání částí displeje při jejich aktualizaci"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Zobrazit obnovení obsahu"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Celý obsah okna při obnovení bliká."</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Zobrazit obnovení s GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Zobrazení v oknech vykreslovaná s GPU blikají."</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Zakázat HW vrstvy"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy použít GPU ke skládání obrazovky."</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Povolit sledování"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Vybrat povolená sledování"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Žádná sledování nejsou momentálně povolena."</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Momentálně povolená sledování: <xliff:g id="NUM">%1$d</xliff:g>"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Všechna sledování jsou momentálně povolena."</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Zobrazit ohraničení"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <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="force_hw_ui" msgid="6426383462520888732">"Vykreslování pomocí GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Použití 2D hardwarové akcelerace v aplikacích"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Vynutit použití GPU pro 2D vykreslování"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profil – vykreslování GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Měřit čas vykreslování v adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Měřítko délky animace"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1466,18 +1562,20 @@
     <string name="show_all_anrs_summary" msgid="641908614413544127">"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">"Dat. služby při roamingu"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Datový roaming"</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_menu_metered" msgid="5056695223222541863">"Mobilní hotspoty"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Změřeno tabletem. Množství dat účtované operátorem se může lišit."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Změřeno telefonem. Množství dat účtované operátorem se může lišit."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"omezeno"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Zakázat mobilní datové přenosy?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Nastavit limit mobilních dat"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Nastavit limit dat 4G"</string>
@@ -1488,33 +1586,50 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobilní"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Žá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="8430240158135453271">"Zobrazit nastavení aplikací"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Omezit datové přenosy na pozadí"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Zakázat data na pozadí v mobilních sítích. Používat sítě Wi-Fi."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Zakázat data na pozadí v mobilních sítích. Používat jiné sítě."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Data na pozadí u aplikace omezíte nastavením limitu mob. dat."</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="5651588785118290771">"Tato funkce může způsobit, že aplikace závislé na datech na pozadí nebudou fungovat, pokud nebude k dispozici síť Wi-Fi."\n\n"Vhodnější ovládací prvky pro využití dat naleznete v nastaveních jednotlivých aplikací."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Pokud budou k dispozici pouze mobilní sítě, může tato funkce způsobit, že aplikace, které data na pozadí vyžadují, nebudou fungovat."\n\n"Vhodnější způsoby řízení využívání dat naleznete v nastaveních aplikace."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Omezení dat na pozadí je k dispozici pouze v případě, že jste nastavili limit přenosu mobilních dat."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <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_warning_editor_title" msgid="3704136912240060339">"Nastavit upozornění na využití dat"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavení limitu datových přenosů"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Nastavuje se omezení datových přenosů"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Po dosažení stanoveného limitu bude datové připojení k síti <xliff:g id="NETWORKS">%1$s</xliff:g> zakázáno."\n\n"Protože se přenesená data měří pomocí tabletu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Po dosažení stanoveného limitu bude datové připojení k síti <xliff:g id="NETWORKS">%1$s</xliff:g> zakázáno."\n\n"Protože se přenesená data měří pomocí telefonu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Po dosažení stanoveného limitu bude datové připojení k síti zakázáno."\n\n"Protože se přenesená data měří pomocí tabletu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Po dosažení stanoveného limitu bude datové připojení k síti zakázáno."\n\n"Protože se přenesená data měří pomocí telefonu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</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="6387252645350792955">"Omezíte-li využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: využito asi <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: využito asi <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: podle měření tabletu využito asi <xliff:g id="TOTAL">%1$s</xliff:g>. Operátor může využití dat účtovat odlišně."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: podle měření telefonu využito asi <xliff:g id="TOTAL">%1$s</xliff:g>. Operátor může využití dat účtovat odlišně."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilní hotspoty"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Vyberte sítě Wi-Fi, které jsou mobilními hotspoty. Aplikacím na pozadí může být používání těchto sítí zakázáno. Aplikace také mohou před stahováním velkých souborů pomocí těchto sítí zobrazit upozornění."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilní sítě"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Sítě Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Chcete-li vybrat mobilní hotspoty, zapněte připojení Wi-Fi."</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>
@@ -1540,12 +1655,14 @@
     <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_edit" msgid="8647191407179996943">"Upravit profil VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Připojit k profilu <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Přidat profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Upravit profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Smazat profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Připojení k síti není k dispozici. Zkuste to prosím znovu později."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Chybí certifikát, upravte prosím profil."</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>
@@ -1554,25 +1671,7 @@
     <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="477937585801538951">"Jakmile zapnete funkci Průzkum dotykem, můžete dotykem obrazovky zjistit, co se nachází pod prstem. Příklad: Aktuální obrazovka obsahuje ikony aplikací. Dotkněte se obrazovky a posunujte prstem, dokud některou z nich nenajdete."</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="3973201880357468747">"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="8764686624055084454">"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="3055831259260848004">"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ě."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Oprava pravopisu"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Kontrola pravopisu"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Sem zadejte aktuální heslo pro úplné zálohy."</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Sem zadejte nové heslo pro úplné zálohy."</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Sem znovu zadejte aktuální heslo pro úplné zálohy."</string>
@@ -1580,4 +1679,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Zrušit"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g> %%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Další aktualizace systému"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Uživatelé a omezení"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Uživatelé"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Přidat uživatele"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Upravit podrobnosti"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Informace o uživateli"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Jméno"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Omezení obsahu"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Vyžadovat PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Klasifikace obsahu"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Systémové aplikace"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Nainstalované aplikace"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Zahodit"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Odebrat uživatele"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Uličník"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Chcete uživatele odebrat?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Opravdu chcete tohoto uživatele a veškerá k němu přidružená data odebrat ze zařízení?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Zobrazit upozornění"</string>
+    <string name="help_label" msgid="1107174367904110532">"Nápověda"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index db4c421..67bebe6 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -82,14 +82,16 @@
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scanner ..."</item>
-    <item msgid="8513729475867537913">"Opretter forbindelse ..."</item>
+    <item msgid="8513729475867537913">"Opretter forbindelse..."</item>
     <item msgid="515055375277271756">"Godkender ..."</item>
-    <item msgid="1943354004029184381">"Henter IP-adresse …"</item>
+    <item msgid="1943354004029184381">"Henter IP-adresse…"</item>
     <item msgid="4221763391123233270">"Tilsluttet"</item>
     <item msgid="624838831631122137">"Midlertidigt standset"</item>
     <item msgid="7979680559596111948">"Afbryder ..."</item>
     <item msgid="1634960474403853625">"Afbrudt"</item>
     <item msgid="746097431216080650">"Mislykkedes"</item>
+    <item msgid="6367044185730295334">"Blokeret"</item>
+    <item msgid="503942654197908005">"Undgår midlertidigt dårlig forbindelse"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Afbryder fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
     <item msgid="197508606402264311">"Afbrudt"</item>
     <item msgid="8578370891960825148">"Mislykkedes"</item>
+    <item msgid="5660739516542454527">"Blokeret"</item>
+    <item msgid="1805837518286731242">"Undgår midlertidigt dårlig forbindelse"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Trykknap"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ingen"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Pinkode fra adgangspunkt"</item>
-    <item msgid="7364462169350112617">"Pinkode fra denne enhed"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statisk"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"SD-kort, der kan fjernes"</item>
     <item msgid="4498124044785815005">"Lad systemet vælge"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Fra"</item>
-    <item msgid="4804571292609523335">"Vibrer"</item>
-    <item msgid="595707141547423573">"Lyd fra"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Mellem"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animationsskala 5x"</item>
     <item msgid="6660750935954853365">"Animationsskala 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animation fra"</item>
+    <item msgid="1138649021950863198">"Animationsskala 0,5x"</item>
+    <item msgid="4394388961370833040">"Animationsskala 1x"</item>
+    <item msgid="8125427921655194973">"Animationsskala 1,5x"</item>
+    <item msgid="3334024790739189573">"Animationsskala 2x"</item>
+    <item msgid="3170120558236848008">"Animationsskala 5x"</item>
+    <item msgid="1069584980746680398">"Animationsskala 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgrænse"</item>
     <item msgid="4071574792028999443">"Ingen baggrundsprocesser"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8ad7f7f..276cd13 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nej"</string>
+    <string name="create" msgid="3578857613172647409">"Opret"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukendt"</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>
@@ -100,7 +101,7 @@
     <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="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" msgid="8373421452106840526">"Synlig for alle Bluetooth-enheder i nærheden (<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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Bloker brug af Bluetooth-opkald, når skærmen er låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheder"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Enhedens navn"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Enhedsindstillinger"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profilindstillinger"</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_rename_device" product="tablet" msgid="787970073150631155">"Omdøb tablet"</string>
@@ -126,18 +129,17 @@
     <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_connecting" msgid="8555009514614320497">"Opretter forbindelse..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Parrer ..."</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="5655704645616731277">"Tryk for at parre"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Der blev ikke fundet Bluetooth-enheder."</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="1931617700075106801">"Tryk for at parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Tryk 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">"Bluetooth enheder"</string>
+    <string name="device_picker" msgid="8398232791303186677">"Valg af Bluetooth-enhed"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Anmodning om Bluetooth-tilladelse"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"En app ønsker at aktivere Bluetooth. Vil du tillade dette?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på din tablet ønsker at gøre din tablet søgbar for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillade dette?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Det indtastede værtsnavn er ikke gyldigt."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Den indtastede udeladelsesliste er ikke korrekt formateret. Indtast en kommasepareret liste over udeladte domæner."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Du skal udfylde portfeltet."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"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="2671425042711054494">"Den indtastede port er ikke gyldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyen anvendes af browseren, men må ikke bruges af andre apps."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Angiv"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Mislykkedes"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Lykkedes"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Ændringerne træder i kraft, når USB-kablet tilsluttes igen"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Aktiver USB-masselagring"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Ændringerne træder i kraft, når USB-kablet tilsluttes igen."</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Aktivér USB-masselagring"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Bytes i alt:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-lager ikke monteret"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Der er intet SD-kort"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB-lageret er ikke monteret."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Der er intet SD-kort."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Ledige bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB bruges som masselager"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-kortet bruges som en masselagringsenhed"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Du kan nu fjerne USB-lager"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Du kan nu fjerne SD-kortet"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB-lageret bruges som masselagringsenhed."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD-kortet bruges som masselagringsenhed."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Du kan nu fjerne USB-lageret."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Du kan nu fjerne SD-kortet."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-lager fjernet under brug!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-kortet blev fjernet, mens det stadig var i brug."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Brugte bytes:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Scanner USB-lager for medier…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB-lageret er skrivebeskyttet."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Det monterede SD-kort er 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="5349877711342869319">"Sprog"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Opret forbindelse til datatjenester ved roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Du har mistet dataforbindelsen, fordi du har forladt dit hjemmenetværk med dataroaming slået fra."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Slå det til"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Tillad dataroaming? Der kan være væsentlige gebyrer for dataroaming."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Bemærk"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Når du tillader dataroaming, risikerer du at skulle betale høje gebyrer for roaming."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Vil du tillade dataroaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Valg af udbyder"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Vælg en netværksudbyder"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dato og tid"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Angiv tid"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Vælg tidszone"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Angiv dato"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Vælg datoformat"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"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="date_picker_title" msgid="1338210036394128512">"Dato"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Gør ansigtsregistreringen bedre"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Bevægelseskontrol"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Kræv blink med øjnene"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Du kan kryptere dine konti, indstillinger, downloadede apps 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 foretage en nulstilling til fabriksdata. Dette sletter alle dine data."\n\n"Krypteringen tager en time eller mere. Du skal starte med et opladet batteri og sørge for, at din tablet forbliver tilsluttet opladeren, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste alle eller nogle af dine data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier samt 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 kan dekryptere den ved at foretage en nulstilling til fabriksdata. Dette sletter alle dine data."\n\n"Krypteringen tager en time eller mere. Du skal starte med et opladt batteri og sørge for, at din telefon forbliver tilsluttet opladeren, indtil krypteringen er gennemført. Hvis du afbryder krypteringsprocessen, vil du miste alle eller nogle af dine data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere dine konti, indstillinger, downloadede apps 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 kun dekryptere din tablet ved at udføre en nulstilling af fabriksdata, som sletter alle dine data."\n\n"Krypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din tablet forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere dine konti, indstillinger, downloadede apps 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 kan kun  dekryptere din telefon ved at udføre en nulstilling af fabriksdata, som sletter alle dine data."\n\n"Krypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din telefon forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</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="2029407131227814893">"Lad dit batteri op, og prøv igen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Tilslut din oplader, 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_dialog_need_password_message" msgid="4071395977297369642">"Du skal angive en pinkode eller adgangskode for skærmlås, inden du kan starte krypteringen."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vil du kryptere?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Denne handling kan ikke fortrydes, og den kan ikke afbrydes uden tab af data til følge. Krypteringen tager mindst en time, og i den tid genstartes tabletten flere gange."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Denne handling kan ikke fortrydes, og den kan ikke afbrydes uden tab af data til følge. Krypteringen tager mindst en time, og i den tid genstartes telefonen flere gange."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kryptering"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Vent, mens din tablet krypteres. <xliff:g id="PERCENT">^1</xliff:g> % fuldført."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"Indtast din adgangskode"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykkedes"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Krypteringen blev afbrudt, og kan ikke fuldføres. Som følge heraf er dataene på din tablet ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af din  tablet, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din tablet efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Krypteringen blev afbrudt, og kan ikke fuldføres. Som følge heraf er dataene på din telefon ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af telefonen, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din telefon efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Vælg skærmlås"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din tablet ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af din  tablet, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din tablet efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din telefon ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af telefonen, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din telefon efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Skift indtastningsmetode"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vælg skærmlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vælg backuplå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>
@@ -348,9 +353,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Træk fingeren hen over"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Ansigtslås"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Mønster"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Pinkode"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Pinkoden skal være på mindst %d tegn"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Adgangskoden skal være kortere end <xliff:g id="NUMBER">%d</xliff:g> tegn."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Pinkoden skal være kortere end <xliff:g id="NUMBER">%d</xliff:g> cifre."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Pinkoden må kun indeholde cifrene 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Enhedens administrator tillader ikke brug af en nylig brugt pinkode."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Adgangskoden indeholder et ulovligt tegn."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Adgangskoden skal indeholde mindst ét bogstav."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Adgangskoden skal indeholde mindst ét tal."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Adgangskoden skal indeholde mindst ét bogstav."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Adgangskoden skal indeholde mindst ét lille bogstav."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Adgangskoden skal indeholde mindst ét stort bogstav."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Adgangskoden skal indeholde mindst 1 tal."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Adgangskoden skal indeholde mindst ét specialtegn."</item>
+    <item quantity="other" msgid="1221290525051187757">"Adgangskoden skal indeholde mindst %d specialtegn."</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>
+    <item quantity="one" msgid="4594051152085925921">"Adgangskoden skal indeholde mindst ét tegn, der ikke er et bogstav."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Enhedens administrator tillader ikke brug af en nylig brugt 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="lock_setup" msgid="1759001157415978959">"Oprettelse er fuldført"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Konfigurationen er fuldført."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhedsadministration"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Enhedsadministratorer"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Vis eller deaktiver enhedsadministratorer"</string>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Indtast enhedens påkrævede adgangsnøgle for at parre med <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>:"</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_enter_pin_other_device" msgid="4637977124526813470">"Du skal muligvis også indtaste denne pinkode på den anden enhed."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Du skal muligvis 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="2796550001376088433">"Sådan parres med:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Skriv på den:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, og tryk derefter på Retur eller Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Der kunne ikke parres med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> på grund af en forkert pinkode eller adgangsnøgle."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Der kan ikke kommunikeres med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Der kunne ikke oprettes 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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Tillad dataudveksling, når telefonen rører en anden enhed"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillad dataudveksling, når tabletten rører en anden enhed"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillad dataudveksling, når telefonen rører en anden enhed"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Klar til at overføre app-indhold via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Fra"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Utilgængelig, fordi NFC er slukket"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Når denne funktion er slået til, kan du overføre appindhold til en anden NFC-kompatibel enhed ved at holde enhederne tæt sammen. For eksempel kan du overføre browsersider, YouTube-videoer, kontaktpersoner og meget mere."\n\n"Hold blot enhederne tæt sammen (typisk ryg mod ryg), og tryk derefter på din skærm. Appen afgør, hvad der bliver overført."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Registrering af netværkstjeneste"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Tillad, at apps på andre enheder kan finde apps på denne enhed"</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="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_setup_wizard_title" msgid="70277346338812325">"Vælg Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Der kan ikke søges efter netværk"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netværksmeddelelse"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Fortæl mig, når der er et tilgængeligt åbent netværk"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Undgå dårlige forbindelser"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Brug kun et Wi-Fi-netværk, hvis det har en god internetforbindelse"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undgå dårlige forbindelser"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Brug kun et Wi-Fi-netværk, hvis det har en god internetforbindelse"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Hold Wi-Fi aktiveret i dvale"</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_wps_pbc" msgid="2668564692207863017">"WPS-trykknap"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Angiv WPS-pinkode"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Søger efter Wi-Fi-netværk..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Andre netværk..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Mere"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</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="8242979682530043184">"Indtast pinkode fra adgangspunkt"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Konfiguration af WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Indtast pinkoden <xliff:g id="WPS_PIN">%1$s</xliff:g> på adgangspunktet"</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_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskyttet konfiguration"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Tryk på Wi-Fi-beskyttet konfiguration på din router. Det kaldes muligvis \"WPS\" eller indeholder dette symbol:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Indtast pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router. Konfigurationen kan tage op til to minutter at fuldføre."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS godkendt. Opretter forbindelse til netværket..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Forbundet til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS er allerede i gang og kan tage op til to minutter at fuldføre"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS mislykkedes. Prøv igen om lidt."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sikkerhedsindstillingen til trådløse routere (WEP) understøttes ikke"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sikkerhedsindstillingen til trådløse routere (TKIP) understøttes ikke"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Godkendelsesfejl. Prøv igen."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En anden WPS-session blev registreret. Prøv igen om et par minutter."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Gemt"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiveret"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Dårlig internetforbindelse er undgået"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Netværket blev undgået på grund af dårlig forbindelse. Deaktiver dette i Indstillinger &gt; Wi-Fi-skærm, menupunktet Avanceret."</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_wps_available_first_item" msgid="3538912605343585226">"Beskyttet netværk er tilgængeligt"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (beskyttet netværk er tilgængeligt)"</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_failed_connect_message" msgid="8491902558970292871">"Der kunne ikke oprettes forbindelse til netværket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Netværket kunne ikke glemmes"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Gem"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netværk kunne ikke gemmes"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuller"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Der blev fundet en anden beskyttet Wi-Fi-session. Prøv om nogle 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Længde på netværkspræfiks"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Konfigurer venneforbindelse"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Oplysninger om enheden"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Beskyttet Wi-Fi-konfiguration"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Fjern gruppe"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avanceret"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Mulige enheder"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Søg efter enheder"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Søger…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Omdøb enhed"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer-enheder"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Der kunne ikke oprettes forbindelse."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Enheden kunne ikke omdøbes."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Vil du afbryde?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Hvis du afbryder, stoppes forbindelsen til <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Hvis du afbryder, stoppes forbindelsen til <xliff:g id="PEER_NAME">%1$s</xliff:g> og <xliff:g id="PEER_COUNT">%2$s</xliff:g> andre enheder."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vil du annullere invitationen?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vil du annullere invitationen til at oprette forbindelse med <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Konfigurer Wi-Fi-hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Konfiguration af 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="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Lydløs"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringetone for telefon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lydstyrke"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Lydstyrke for opkald"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved lydløs"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrer og ring"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standardunderretning"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blinkende meddelelseslys"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
@@ -614,6 +637,11 @@
     <string name="volume_ring_description" msgid="5936851631698298989">"Ringetone og meddelelser"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Underretninger"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmer"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Slå lyden fra for ringetone og meddelelser"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Slå lyden fra for musik og andre medier"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Slå lyden fra for meddelelser"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Slå lyden fra for alarmer"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrer ved opringning"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Du skal docke telefonen, før du konfigurerer docklyde."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Du skal docke telefonen, før du konfigurerer docklyden."</string>
-    <string name="dock_sounds_enable_title" msgid="885839627097024110">"Lyd ved isætning i dockingstation"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Du skal docke telefonen, før du konfigurerer docklyden."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Du skal docke telefonen, før du konfigurerer docklyden."</string>
+    <string name="dock_sounds_enable_title" msgid="885839627097024110">"Lyd ved isætning"</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="account_settings" msgid="6403589284618783461">"Konti"</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="7965901687241669598">"Skærm"</string>
@@ -653,7 +681,7 @@
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitet"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldrig"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Prøv det!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Aktiver også, når tilsluttet dockingstationen"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Aktivér også, når tilsluttet dockingstationen"</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>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -789,7 +817,7 @@
     <string name="apn_type" msgid="469613123902220544">"APN-type"</string>
     <string name="apn_protocol" msgid="3272222921649348640">"APN-protokol"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"Adgangspunktets roamingprotokol"</string>
-    <string name="carrier_enabled" msgid="407655861175280806">"Aktiver/deaktiver adgangspunkt"</string>
+    <string name="carrier_enabled" msgid="407655861175280806">"Aktivér/deaktiver adgangspunkt"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Adgangspunktet er aktiveret"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Adgangspunktet er deaktiveret"</string>
     <string name="bearer" msgid="594270280031923558">"Bærer"</string>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vil du slette alle dine personlige oplysninger og downloadede apps? Denne handling 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="2234954758550554549">"Du skal tegne dit mønster til at låse op for at bekræfte, at tabletcomputeren nulstilles."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Der blev ikke foretaget nogen nulstilling, fordi tjenesten Systemoprydning ikke er tilgængelig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vil du nulstille?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Slet USB-lager"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vil du rydde SD-kortet og alle dets filer? Handlingen kan ikke fortrydes!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Slet alt"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Tegn dit oplåsningsmønster"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette USB-lageret."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil slette USB-lagringen."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"USB-tethering"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilnetværk"</string>
     <string name="location_title" msgid="1029961368397484576">"Min placering"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Googles placeringstjeneste"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Lad apps bruge data fra kilder som Wi-Fi og mobilnetværk til at bestemme din omtrentlige placering"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Tillad, at anonyme placeringsdata sendes til Google. Tillad også, at udvalgte apps anvender data fra kilder såsom Wi-Fi- og mobilnetværk til at bestemme 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 afgøre din placering"</string>
@@ -889,11 +917,11 @@
     <string name="terms_title" msgid="7697580845616764642">"Vilkår og betingelser"</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_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="232523852222964470">"Du har ingen dataforbindelse. Se disse oplysninger nu ved at gå til %s på en computer, der har forbindelse til internettet."</string>
-    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Indlæser ..."</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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryk på Menu for at få hjælp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Slip med fingeren, når du er færdig."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Forbind mindst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv igen:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Mønstret blev registreret!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Mønstret er registreret."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Tegn mønstret igen for at bekræfte:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Dit nye oplåsningsmønster:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bekræft"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Næste"</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="1075370160667458122">"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å den næste skærm. Du skal forbinde mindst fire punkter."\n\n"Er du klar? Tryk på \"Næste\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"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å den næste skærm. Du skal forbinde mindst fire punkter."\n\n"Er du klar? Tryk på Næste."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskyt din telefon mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug fingeren til at forbinde mindst fire punkter i vilkårlig rækkefølge på næste skærmbillede. "\n\n"Når du er klar til at begynde, trykker du på Næste."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerede apps"</string>
@@ -945,14 +973,15 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrer apps, konfigurer genveje til hurtig start"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Indstillinger for app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukendte kilder"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Tillad installation af apps, der ikke stammer fra Marked"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Tillad installation af apps fra ukendte kilder"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Dine tabletdata og personlige data er mere sårbare over for angreb fra apps fra ukendte kilder. Du accepterer, at du alene er ansvarlig for eventuelle skader på din tablet eller tab af data, der kan skyldes brug af disse apps."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Din telefon og dine personlige data er mere sårbare over for angreb fra apps fra ukendte kilder. Du accepterer, at du alene er ansvarlig for eventuelle skader på din telefon eller tab af data, der kan skyldes brugen af disse apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avancerede indstillinger"</string>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktiver flere indstillinger"</string>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktivér flere indstillinger"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Oplysninger om appen"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Start som standard"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"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>
@@ -968,10 +997,11 @@
     <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>
+    <string name="enable_text" msgid="9217362512327828987">"Aktivér"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ryd data"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Afinstaller opdateringer"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Du har valgt at benytte denne app som standard for nogle handlinger."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Du har valgt at tillade, at denne app opretter widgets og får adgang til deres data."</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="1616155457673106022">"Denne app er muligvis ikke beregnet til din skærm. Her kan du kontrollere, hvordan den skal tilpasses til din skærm."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter efter størrelse"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Vis kørende tjenester"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Cachelagrede processer"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Nulstil app-præferencer"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nulstil app-præferencer?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dette vil nulstille alle præferencer for:"\n\n<li>"deaktiverede apps"</li>\n<li>"underretninger om deaktiverede apps"</li>\n<li>"standardapplikationer til handlinger"</li>\n<li>"begrænsninger for baggrundsdata for apps"</li>\n\n"Du vil ikke miste nogen appdata."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Nulstil apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrer plads"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Vælg filtreringsmuligheder"</string>
@@ -995,7 +1029,7 @@
     <string name="internal_storage" msgid="1584700623164275282">"Internt lager"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lager"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortlager"</string>
-    <string name="recompute_size" msgid="7722567982831691718">"Beregner størrelse igen ..."</string>
+    <string name="recompute_size" msgid="7722567982831691718">"Beregner størrelse igen..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Vil du slette appdata?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"Alle data i denne app slettes permanent. Det omfatter alle filer, indstillinger, konti, databaser osv."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
@@ -1009,8 +1043,8 @@
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Data for appen kunne ikke ryddes."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Denne app har adgang til følgende på din tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Denne app 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="computing_size" msgid="1599186977475211186">"Beregner..."</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"Pakkestørrelsen kunne ikke beregnes."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Du har ikke installeret nogen apps fra tredjepart."</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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Skift den foretrukne installationsplacering for nye apps"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktiver indbygget app?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Hvis du deaktiverer en indbygget app, kan det medføre, at andre apps ikke fungerer korrekt."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vil du deaktivere meddelelser?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Hvis du deaktiverer meddelelser for denne app, kan du gå glip af vigtige beskeder og opdateringer."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Lagerforbrug"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vis lagerplads, der bruges af apps"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kørende tjenester"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Denne inputmetode kan muligvis indsamle al indtastet tekst, f.eks. personlige data såsom adgangskoder og kreditkortnumre. Den kommer fra appen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vil du anvende denne inputmetode?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Denne stavekontrol kan muligvis indsamle al den tekst, som du skriver, også personlige data som adgangskoder og kreditkortnumre. Den kommer fra appen <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruge denne stavekontrol?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Indstillinger"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Sprog"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Indstillingerne for <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> kunne ikke åbnes"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mus/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Markørens hastighed"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Spillekontroller"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Brug vibrator"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Omdiriger vibrator til spillekontroller, når den er tilsluttet."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Vælg tastaturlayout"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Konfigurer tastaturlayout"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Tryk på Ctrl-Mellemrum for at skifte"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturlayout"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Brugerordbog"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personlig ordbog"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personlige ordbø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_add_screen_title" msgid="742580720124344291">"Sætning"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Flere muligh."</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Færre muligh."</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Ord:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Genvej:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Sprog:"</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="8165273379942105271">"Du har ikke nogen ord i brugerordbogen. Du kan tilføje et ord ved at trykke på knappen Tilføj (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Alle sprog"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"For alle sprog"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Flere sprog..."</string>
     <string name="testing" msgid="6584352735303604146">"Tester"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Oplysninger om tabletcomputer"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefonoplysninger"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Konfigurer valgmuligheder for appudvikling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-fejlretning"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Fejlretningstilstand, når USB er tilsluttet"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Udviklings-id til enheden"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Enhedsoplysninger er ikke tilgængelige"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Undgå dvale"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skærmen går ikke i dvale under opladning"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vil du tillade USB-fejlretning?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-fejlretning er kun beregnet til udvikling og kan bruges til at kopiere data mellem din computer og enheden, installere apps på enheden uden meddelelser og læse logdata."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Vil du tillade udviklingsindstillinger?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Disse indstillinger er kun beregnet til brug i forbindelse med udvikling. De kan forårsage, at din enhed og dens applikationer går ned eller ikke fungerer korrekt."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Beskyt USB-lageret"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps skal anmode om tilladelse til at læse USB-lageret"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vil du beskytte USB-lageret?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Når USB-lageret er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager."\n\n" Nogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Beskyt SD-kortet"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps skal anmode om tilladelse til at læse SD-kortet"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vil du beskytte SD-kortet?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager."\n\n"Nogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Vælg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Vælg widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du oprette en widget og tillade adgang?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Når du opretter en widget, kan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> få adgang til alle data, den viser."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Tillad altid, at <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> opretter widgets og får adgang til deres data"</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>t <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>t <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>
@@ -1158,14 +1224,11 @@
     <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">"Tænd/sluk afbryder opkald"</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Afbryderknap afslutter opkald"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Indtal adgangskoder"</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="3264723681038625967">"Installer webscripts"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Styrk tilgængeligheden på nettet"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Der er ikke installeret nogen tjenester"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Har du brug for en skærmoplæser?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack giver talefeedback for at hjælpe blinde og svagtseende brugere. Vil du installere det gratis fra Android Marked?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Vil du installere webscripts?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Skal apps installere scripts fra Google, som gør deres webindhold mere tilgængeligt?"</string>
-    <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="1072730037861494125">"Ingen beskrivelse til rådighed."</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_not_available" msgid="3214000535532434353">"Batteribrugsdata utilgængeligt."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,10 +1346,10 @@
     <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_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" msgid="3305141107104670703">"Maskinen, som du har valgt, kan ikke køre."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurer"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vælg en anden maskine"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Denne tale kan muligvis indsamle al den tekst, der udtales, inklusive personlige data som adgangskoder og kreditkortnumre. Den kommer fra <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-maskinen. Aktiver brug af denne talesyntesemaskine?"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Denne tale kan muligvis indsamle al den tekst, der udtales, inklusive personlige data som adgangskoder og kreditkortnumre. Den kommer fra <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-maskinen. Aktivér brug af denne talesyntesemaskine?"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Maskiner"</string>
     <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>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Kvinde"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Aktivér 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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Tegn dit oplåsningsmønster"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Skriv adgangskoden til lager for loginoplysninger."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuværende adgangskode:"</string>
@@ -1329,11 +1392,11 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Oplysningslagring er slettet."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Loginlageret kan ikke ryddes."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Oplysningslagring er aktiveret."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Du skal angive en pinkode eller adgangskode til skærmlåsen, før du kan bruge lageret for loginoplysninger."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du skal angive en pinkode eller adgangskode til skærmlåsen, før du kan bruge lageret for loginoplysninger."</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="5446972770562918934">"Sikkerhedskopiering og nulstilling"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"Sikkerhedskopiering og nulstilling"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Sikkerhedskopiering/nulstilling"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Sikkerhedskopiering/nulstilling"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"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>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk gendannelse"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Når du geninstallerer en app, skal du gendanne sikkerhedskopierede indstillinger og data"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kode til lokal sikkerhedskopi"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Lokale fuldstændige sikkerhedskopieringer er i øjeblikket ikke beskyttet"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tryk for at skifte eller fjerne adgangskoden til fuld lokal sikkerhedskopiering"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vil du stoppe sikkerhedskopieringen af dine Wi-Fi-adgangskoder, bogmærker, andre indstillinger og appdata samt slette alle kopier på Googles servere?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Enhedsadministrationsindstillinger"</string>
@@ -1352,16 +1415,16 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiver"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Enhedsadministratorer"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Ingen tilgængelige enhedsadministratorer"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktiver enhedsadministrator?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Aktiver"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktivér enhedsadministrator?"</string>
+    <string name="add_device_admin" msgid="7133327675884827091">"Aktivér"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Enhedsadministrator"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Hvis denne administrator aktiveres, får appen <xliff:g id="APP_NAME">%1$s</xliff:g> tilladelse til at foretage følgende handlinger:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Denne administrator er aktiv og tillader, at appen <xliff:g id="APP_NAME">%1$s</xliff:g> kan foretage disse 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_and_notification_title" msgid="4703470169010662085">"Ringetone og meddelelser"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Underretninger"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"System"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ringetone og vibration ved opkald"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Opretter forbindelse til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Synkroniseringen mislykkedes"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Synkronisering er aktiveret"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Synkronisering"</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="background_data" msgid="5779592891375473817">"Baggrundsdata"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Sidst synkroniseret <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Synkroniserer nu…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Velkommen til Google Synkroniser!"</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="6205903695598000286">"Indstillinger for synkronisering af app"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data og synkronisering"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Skift adgangskode"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Denne konto kræves af nogle apps. Du kan kun fjerne den ved at nulstille tabletten til fabriksindstillingerne (hvilket sletter alle dine personlige data) i Indstillinger &gt; Sikkerhedskopiering og nulstilling."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Denne konto kræves af nogle apps. Du kan kun fjerne den ved at nulstille tabletten til fabriksindstillingerne (hvilket sletter alle dine personlige data) i Indstillinger &gt; Sikkerhedskopiering og nulstilling."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Der kan ikke synkroniseres manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering af dette element er deaktiveret lige nu. Hvis du vil ændre indstillingen, skal du aktivere baggrundsdata og automatisk synkronisering midlertidigt."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Indstillinger for 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="4131758584074246224">"Indtast en adgangskode for at dekryptere lageret"</string>
     <string name="try_again" msgid="4272075051293936921">"Prøv igen."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Tjenesten er optaget. Prøv igen."</string>
     <string name="delete" msgid="4219243412325163003">"Slet"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,26 +1510,50 @@
     <string name="select_all" msgid="1562774643280376715">"Markér 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="debug_debugging_category" msgid="6781250159513471316">"Fejlfinding"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Vælg app til fejlfinding"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Ingen applikation til fejlfinding er angivet"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Applikation til fejlfinding: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Vælg applikation"</string>
+    <string name="no_application" msgid="2813387563129153880">"Ingen"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Vent på fejlfinder"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Fejlrettet app venter på tilknytning af fejlfinder før udførelse"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Tegning"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Overvågning"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Striks tilstand 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 på den del af skærmen, der opdateres"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Vis overfladeopdateringer"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Fremhæv hele vinduesoverflader, når de opdateres"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Vis opdat. af GPU-visn."</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Fremhæv visninger i vinduer, når de tegnes med GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlejring"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Brug altid GPU til skærmsammensætning"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Aktivér spor"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Vælg aktiverede spor"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Der er i øjeblikket ingen aktiverede spor"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g>"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alle spor er i øjeblikket aktiveret"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Vis layoutgrænser"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Vis grænser for klip, margener osv."</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="force_hw_ui" msgid="6426383462520888732">"Tving gengivelse af GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Brug 2D-hardwareacceleration i applikationer"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Gennemtving brug af GPU til 2D-tegning"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"GPU-profilgengivelse"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mål gengivelsestiden i adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Animatorvarighedsskala"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</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\"-meddelelser"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Vis \"App svarer ikke\"-meddelelser"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Vis \"Appen 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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobilhotspots"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Synkroniser data automatisk"</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="8621855507876539282">"Ingen apps har brugt 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_disclaimer" product="tablet" msgid="2591250607795265503">"Målt af din tablet. Dit mobilselskabs beregning af dataforbrug kan variere."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Målt af din telefon. Dit mobilselskabs beregning af dataforbrug kan variere."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"begrænset"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Vil du deaktivere mobildata?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Angiv mobildatagrænse"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Angiv grænse for 4G-data"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobil"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Vis indstillinger for app"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Begræns baggrundsdata"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Deaktiver kun baggrundsdata på mobildatanetværk. Wi-Fi bruges, hvis tilgængeligt."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Deaktiver baggrundsdata på mobilnetværk. Netværk, som ikke er mobilnetværk, vil blive brugt, hvis de er tilgængelige."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Hvis du vil begrænse baggrundsdata for denne app, skal du først angive en mobildatagrænse."</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="5651588785118290771">"Denne funktion kan forårsage, at en app, der bruger baggrundsdata, holder op med at fungere, når Wi-Fi ikke er tilgængelig."\n\n"Du kan finde mere passende kontrol af dataforbrug i indstillingerne i appen."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Denne funktion kan medføre, at en app, der er afhængig af baggrundsdata, ikke længere fungerer, når der kun er mobilnetværk til rådighed."\n\n"Du kan finde mere hensigtsmæssige metoder til kontrol af dataforbruget i de indstillinger, der er tilgængelige i selve appen."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Begrænsning af baggrundsdata er kun muligt, hvis du har angivet en grænse for mobildata."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Slå aut. synk. af data til?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alle ændringer, som du foretager på dine konti på nettet, vil automatisk blive kopieret til din tablet."\n\n" Der vil muligvis også være nogle konti, hvor de ændringer, du foretager på telefonen, automatisk kopieres til internettet. Sådan fungerer en Google-konto."\n\n"Du kan vælge, hvilke former for oplysninger, der skal synkroniseres på hver konto, ved at gå til Indstillinger &gt; Konti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Alle ændringer, som du foretager på dine konti på nettet, vil automatisk blive kopieret til din telefon."\n\n" Der vil muligvis også være nogle konti, hvor de ændringer, du foretager på telefonen, automatisk kopieres til internettet. Sådan fungerer en Google-konto."\n\n"Du kan vælge, hvilke former for oplysninger, der skal synkroniseres på hver konto, ved at gå til Indstillinger &gt; Konti."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Slå aut. synk. af data fra?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Dette vil sænke data- og batteriforbruget, men du skal til gengæld synkronisere hver konto manuelt for at hente de seneste oplysninger, og du vil ikke modtage underretninger, når der kommer nye opdateringer."</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_warning_editor_title" msgid="3704136912240060339">"Angiv en advarsel om dataforbrug"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Angiv en grænse for dataforbrug"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Grænse for dataforbrug"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Din <xliff:g id="NETWORKS">%1$s</xliff:g>-dataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Da dataforbrug måles af din tablet, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Din <xliff:g id="NETWORKS">%1$s</xliff:g>-dataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Da dataforbrug måles af din telefon, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Da dataforbrug måles af din tablet, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Da dataforbrug måles af din telefon, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vil du begrænse baggrundsdata?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Hvis du begrænser mobildata i baggrunden, vil nogle apps og tjenester ikke fungere, medmindre du har forbindelse til et Wi-Fi-netværk."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: cirka <xliff:g id="TOTAL">%1$s</xliff:g> brugt"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> brugt."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> brugt, målt af tablet. Mobilselskabers beregning af forbrug kan variere."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> brugt, målt af telefon. Mobilselskabers beregning af forbrug kan variere."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilhotspots"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Vælg de Wi-Fi-netværk, som er mobilhotspots. Apps kan være forhindret i at bruge disse netværk, når de kører i baggrunden. Apps kan også advare dig, før disse netværk bliver brugt til store downloads."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilnetværk"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-netværk"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Hvis du vil vælge mobilhotspots, skal du slå Wi-Fi til."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Rediger VPN-profil"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Opret forbindelse til <xliff:g id="PROFILE">%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 cirkler"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Tilføj VPN-profil"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Rediger profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Slet profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Der er ingen netværksforbindelse. Prøv igen senere."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Der mangler et certifikat. Rediger profilen."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"Når du aktiverer \"Udforsk med berøring\", kan du trykke på skærmen for at se, hvad der vises under din finger. Den aktuelle skærm indeholder f.eks. appikoner. Find et 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="3973201880357468747">"Hvis du vil aktivere noget, som du rører ved, skal du trykke kort på det. Glid med fingeren, 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="8764686624055084454">"Glid to fingre langs skærmen for at rulle gennem en liste. Den aktuelle skærm indeholder f.eks. en liste over appnavne, der kan rulles 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="3055831259260848004">"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="spellcheckers_settings_title" msgid="399981228588011501">"Stavekontrol"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Indtast her din aktuelle adgangskode til fuldstændig sikkerhedskopiering"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Angiv her en ny adgangskode til fuldstændige sikkerhedskopieringer"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Gentag din nye adgangskode til ny fuldstændig sikkerhedskopiering her"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuller"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g> %%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Yderligere systemopdateringer"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Brugere og begrænsninger"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Brugere"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Tilføj bruger"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Rediger oplysninger"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Brugeroplysninger"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Navn"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Indholdsbegrænsninger"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Kræv pinkode"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Bedømmelse af indhold"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Systemapps"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installerede aps"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Kassér"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Fjern bruger"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Irriterende unge"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vil du fjerne brugeren?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Er du sikker på, at du vil fjerne brugeren og alle tilhørende data fra enheden?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis meddelelser"</string>
+    <string name="help_label" msgid="1107174367904110532">"Hjælp"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 3c7bc32..10fb68a 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Verbindung wird getrennt..."</item>
     <item msgid="1634960474403853625">"Nicht verbunden"</item>
     <item msgid="746097431216080650">"Nicht erfolgreich"</item>
+    <item msgid="6367044185730295334">"Blockiert"</item>
+    <item msgid="503942654197908005">"Schlechte Internetverbindung wird vorübergehend vermieden."</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Verbindung mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g> wird getrennt..."</item>
     <item msgid="197508606402264311">"Nicht verbunden"</item>
     <item msgid="8578370891960825148">"Nicht erfolgreich"</item>
+    <item msgid="5660739516542454527">"Blockiert"</item>
+    <item msgid="1805837518286731242">"Schlechte Internetverbindung wird vorübergehend vermieden."</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push-Schaltfläche"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Keine"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN von Zugangspunkt"</item>
-    <item msgid="7364462169350112617">"PIN von diesem Gerät"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statisch"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Austauschbare SD-Karte"</item>
     <item msgid="4498124044785815005">"Auswahl durch das System"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Aus"</item>
-    <item msgid="4804571292609523335">"Vibrieren"</item>
-    <item msgid="595707141547423573">"Stummschalten"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
     <item msgid="2560532955514699713">"Mittel"</item>
@@ -233,21 +228,30 @@
   </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>
+    <item msgid="6624864048416710414">"Animationsmaßstab: 0,5x"</item>
+    <item msgid="2219332261255416635">"Animationsmaßstab: 1x"</item>
+    <item msgid="3544428804137048509">"Animationsmaßstab: 1,5x"</item>
+    <item msgid="3110710404225974514">"Animationsmaßstab: 2x"</item>
+    <item msgid="4402738611528318731">"Animationsmaßstab: 5x"</item>
+    <item msgid="6189539267968330656">"Animationsmaßstab: 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>
+    <item msgid="3375781541913316411">"Animationsmaßstab: 0,5x"</item>
+    <item msgid="1991041427801869945">"Animationsmaßstab: 1x"</item>
+    <item msgid="4012689927622382874">"Animationsmaßstab: 1,5x"</item>
+    <item msgid="3289156759925947169">"Animationsmaßstab: 2x"</item>
+    <item msgid="7705857441213621835">"Animationsmaßstab: 5x"</item>
+    <item msgid="6660750935954853365">"Animationsmaßstab: 10x"</item>
+  </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animation aus"</item>
+    <item msgid="1138649021950863198">"Animationsmaßstab: 0,5x"</item>
+    <item msgid="4394388961370833040">"Animationsmaßstab: 1x"</item>
+    <item msgid="8125427921655194973">"Animationsmaßstab: 1,5x"</item>
+    <item msgid="3334024790739189573">"Animationsmaßstab: 2x"</item>
+    <item msgid="3170120558236848008">"Animationsmaßstab: 5x"</item>
+    <item msgid="1069584980746680398">"Animationsmaßstab: 10x"</item>
   </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardlimit"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 434b9fc..21b3e1a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nein"</string>
+    <string name="create" msgid="3578857613172647409">"Erstellen"</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>
@@ -111,6 +112,8 @@
     <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_device_details" msgid="4594773497930028085">"Geräteeinstellungen"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profileinstellungen"</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_rename_device" product="tablet" msgid="787970073150631155">"Tablet umbenennen"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Unbenanntes Bluetooth-Gerät"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Suche läuft"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Zum Pairing berühren"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Kein Bluetooth-Gerät in der Nähe 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="1931617700075106801">"Für Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> berühren"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Für Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> berühren"</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="device_picker" msgid="8398232791303186677">"Bluetooth-Geräteauswahl"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-Berechtigungsanfrage"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Eine App versucht, Bluetooth zu aktivieren. Zulassen?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Eine App auf Ihrem Tablet versucht, 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 zulassen?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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 Ihre Anrufliste zugreifen. Möchten Sie %2$s den Zugriff erlauben?"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s möchte auf Ihre Kontakte und Ihre Anrufliste 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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Der eingegebene Hostname ist ungültig."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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_port" msgid="5539106187558215246">"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="2671425042711054494">"Der eingegebene Port ist ungültig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, darf aber nicht von anderen Apps verwendet werden."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Festlegen"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Fehlgeschlagen"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Erfolgreich"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Die Änderungen werden nach dem erneuten Anschließen des USB-Kabels übernommen."</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Die Änderungen werden nach dem erneuten Anschließen des USB-Kabels übernommen."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB-Massenspeicher aktivieren"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Bytes insgesamt:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-Speicher nicht bereitgest."</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Keine SD-Karte"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB-Speicher nicht bereitgest."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Keine SD-Karte"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Verfügbare Bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-Speicher wird als Massenspeicher verwendet"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-Karte wird als Massenspeichergerät verwendet"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"USB-Speicher kann jetzt sicher entfernt werden."</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Die SD-Karte kann jetzt sicher entfernt werden."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB-Speicher wird als Massenspeicher verwendet."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD-Karte wird als Massenspeichergerät verwendet."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"USB-Speicher kann nun entfernt werden."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Die SD-Karte kann jetzt sicher entfernt werden."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-Speicher während Verwendung entfernt"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Die SD-Karte wurde während der Verwendung entfernt!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Verwendete Bytes:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB-Sp. auf Medien scannen"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB-Speicher schreibgeschützt"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Die bereitgestellte SD-Karte ist schreibgeschützt."</string>
     <string name="skip_label" msgid="47510779345218297">"Ohne"</string>
     <string name="next_label" msgid="4693520878012668114">"Weiter"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Sprache"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Bei Roaming mit Datendienst verbinden"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Die Datenkonnektivität wurde unterbrochen, da Sie Ihr Heimnetzwerk verlassen haben und Daten-Roaming nicht aktiviert ist."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Aktivieren"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Daten-Roaming zulassen? Es können beträchtliche Roaming-Gebühren anfallen!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Achtung"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Wenn Sie das Roaming zulassen, können beträchtliche Roaming-Gebühren anfallen!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Roaming zulassen?"</string>
     <string name="networks" msgid="6333316876545927039">"Netzbetreiberauswahl"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Netzbetreiber auswählen"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum &amp; Uhrzeit"</string>
@@ -283,16 +285,18 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Uhrzeit festlegen"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Zeitzone auswählen"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Datum festlegen"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Datumsformat"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Datumsformat auswählen"</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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Uhrzeit"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Gesichtserkennung verbessern"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Aktualitätsprüfung"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Augenzwinkern erforderlich"</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_title" msgid="2723190010708381889">"Info zum Eigentümer"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Text für Display-Sperre eingeben"</string>
     <string name="location_settings_title" msgid="8935806698251432196">"Standortdienste"</string>
@@ -303,29 +307,30 @@
     <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">"Eine numerische PIN oder ein Passwort einrichten, mit dem das Tablet beim Einschalten entschlüsselt werden muss."</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Eine numerische PIN oder ein Passwort einrichten, mit dem das Telefon beim Einschalten entschlüsselt werden muss."</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Numerische PIN oder Passwort festlegen, mit dem das Tablet beim Einschalten entschlüsselt werden muss"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerische PIN oder Passwort festlegen, mit dem das Telefon beim Einschalten entschlüsselt werden muss"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Verschlüsselt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps 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 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="3504519024884099702">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Telefons müssen Sie bei jedem Einschalten des Geräts eine numerische PIN oder ein Passwort eingeben. Sie können die Verschlüsselung Ihres Telefons 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_desc" product="tablet" msgid="3839235202103924154">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Tablets ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Tablets nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Tablet angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Telefons ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Telefons nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Telefon angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</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="2029407131227814893">"Laden Sie Ihren Akku auf und versuchen Sie es erneut."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"Sie müssen eine PIN oder ein Passwort für die Bildschirmsperre festlegen, bevor Sie die Verschlüsselung starten können."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Verschlüsseln?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"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="5682944380460921880">"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="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"Geben Sie Ihr Passwort ein."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Verschlüsselung fehlgeschlagen"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Tablet nicht mehr möglich. "\n\n"Damit Sie Ihr Tablet wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Tablet nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Telefon nicht mehr möglich. "\n\n"Damit Sie Ihr Telefon wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Telefon nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Sperre auswählen"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Tablet nicht mehr möglich. "\n\n"Damit Sie Ihr Tablet wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Tablet nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Telefon nicht mehr möglich. "\n\n"Damit Sie Ihr Telefon wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Telefon nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Eingabemethode wechseln"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Display-Sperre wählen"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Ersatzsperre wählen"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Muster"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Passwort"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Display-Sperre deaktivieren"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Entsperrungsmuster entfernen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Entsperrungs-PIN entfernen"</string>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Die PIN muss mindestens %d Zeichen enthalten."</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Das Passwort muss weniger als <xliff:g id="NUMBER">%d</xliff:g> Zeichen haben."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Die PIN muss weniger als <xliff:g id="NUMBER">%d</xliff:g> Stellen haben."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN darf nur die Ziffern 0 bis 9 enthalten."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Der Geräteadministrator lässt die Verwendung einer früheren PIN nicht zu."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Das Passwort enthält ein ungültiges Zeichen."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Das Passwort muss mindestens einen Buchstaben enthalten."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Das Passwort muss mindestens eine Ziffer enthalten."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Das Passwort muss mindestens einen Buchstaben enthalten."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Das Passwort muss mindestens einen Kleinbuchstaben enthalten."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Das Passwort muss mindestens einen Großbuchstaben enthalten."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Das Passwort muss mindestens eine Ziffer enthalten."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Das Passwort muss mindestens ein Sonderzeichen enthalten."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Das Passwort muss mindestens ein Zeichen enthalten, das kein Buchstabe ist."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Der 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">"Abbrechen"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Abbrechen"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Weiter"</string>
-    <string name="lock_setup" msgid="1759001157415978959">"Einrichtung abgeschlossen"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Die Einrichtung ist abgeschlossen."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Geräteverwaltung"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Geräteadministratoren"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Geräteadministratoren abrufen oder deaktivieren"</string>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Geben Sie zum Pairing mit <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 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>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Möglicherweise müssen Sie diese PIN auch auf dem anderen Gerät eingeben."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Zum Pairing mit:&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vergewissern Sie sich, dass folgender Schlüssel angezeigt wird:<&lt;br&gt;&lt;b&gt;P<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
 )  -->
     <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>
@@ -426,7 +431,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich, da die eingegebene PIN oder der Schlüssel falsch ist."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kommunikation mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist nicht möglich."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Keine Verbindung zu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> möglich"</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">"Suche läuft..."</string>
@@ -479,19 +484,23 @@
     <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="5237208142892767592">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Bereit zur Übertragung von App-Inhalten über NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Aus"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nicht verfügbar, da NFC deaktiviert ist"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Wenn diese Funktion aktiviert ist, können Sie App-Inhalte auf ein anderes NFC-fähiges Gerät beamen, indem Sie die Geräte dicht nebeneinander halten. Sie können beispielsweise Browserseiten, YouTube-Videos und Kontakte beamen."\n\n"Halten Sie die Geräte einfach dicht nebeneinander, am besten Rückseite an Rückseite, und berühren Sie den Bildschirm. Die App bestimmt, was übertragen wird."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Diensterkennung"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Ermöglicht Apps auf anderen Geräten, Apps auf diesem Gerät zu erkennen"</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="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_setup_wizard_title" msgid="70277346338812325">"WLAN auswählen"</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>
@@ -499,25 +508,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Netzwerkscan nicht möglich"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netzwerkhinweis"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Benachrichtigen, wenn ein offenes Netzwerk verfügbar ist"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Schlechte Internetverbindungen vermeiden"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"WLAN nur bei guter Internetverbindung verwenden"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Schlechte Internetverbindungen vermeiden"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"WLAN nur bei guter Internetverbindung verwenden"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"WLAN im Standby-Modus aktiviert lassen"</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_wps_pbc" msgid="2668564692207863017">"WPS-Push-Taste"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN-Eingabe"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scannen"</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 aktivieren, um verfügbare Netze abzurufen"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Suche nach WLAN-Netzwerken läuft…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Anderes Netzwerk…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Mehr"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisches Setup (WPS)"</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="8242979682530043184">"PIN vom Zugriffspunkt eingeben"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS-Einrichtung"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> am Zugangspunkt 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_wps_setup_title" msgid="6034518116333042484">"Geschützte WLAN-Einrichtung"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS wird gestartet…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Wählen Sie die Schaltfläche \"Wi-Fi Protected Setup\" auf Ihrem Router aus. Eventuell lautet sie auch \"WPS\" oder enthält dieses Symbol:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Geben Sie die PIN <xliff:g id="NUMBER">%1$s</xliff:g> auf Ihrem WLAN-Router ein. Die Einrichtung kann bis zu 2 Minuten dauern."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS erfolgreich. Netzwerkverbindung wird hergestellt…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS ist bereits im Aufbau. Dies kann bis zu 2 Minuten dauern."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS fehlgeschlagen. Bitte versuchen Sie es in einigen Minuten erneut."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Die Sicherheitseinstellung für drahtlose Router (WEP) wird nicht unterstützt."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Die Sicherheitseinstellung für drahtlose Router (TKIP) wird nicht unterstützt."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentifizierungsfehler. Bitte versuchen Sie es erneut."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Es wurde eine andere WPS-Sitzung gefunden. Bitte versuchen Sie es in einigen Minuten 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>
@@ -538,20 +560,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Gespeichert"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiviert"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Schlechte Verbindung"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Das Netzwerk wurde aufgrund der schlechten Verbindung umgangen. Sie können dieses Verhalten im WLAN-Bildschirm unter \"Einstellungen\" im Menü \"Erweitert\" deaktivieren."</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_wps_available_first_item" msgid="3538912605343585226">"Geschütztes Netzwerk verfügbar"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (geschütztes Netzwerk verfügbar)"</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_failed_connect_message" msgid="8491902558970292871">"Netzwerkverbindung konnte nicht hergestellt werden."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Entfernen"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Netzwerk konnte nicht entfernt werden."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Speichern"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netzwerk konnte nicht gespeichert werden."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Abbrechen"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Andere geschützte WLAN-Sitzung gefunden. Versuchen Sie es später 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>
@@ -569,33 +591,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Länge Netzwerkpräfix"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Einrichtung von Peer-to-Peer-Verbindungen"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Geräte-Informationen"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Geschützte WLAN-Einrichtung"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Gruppe entfernen"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Erweitert"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Verfügbare Geräte"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Nach Geräten suchen"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Suche läuft…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Gerät umbenennen"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer-Geräte"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Verbindung nicht möglich"</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Gerät konnte nicht umbenannt werden."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Verbindung trennen?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Wenn Sie die Verbindung trennen, wird Ihre Verbindung mit <xliff:g id="PEER_NAME">%1$s</xliff:g> beendet."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Wenn Sie die Verbindung trennen, wird Ihre Verbindung mit <xliff:g id="PEER_NAME">%1$s</xliff:g> und <xliff:g id="PEER_COUNT">%2$s</xliff:g> weiteren Geräten beendet."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Einladung ablehnen?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Möchten Sie die Einladung zum Verbinden mit <xliff:g id="PEER_NAME">%1$s</xliff:g> ablehnen?"</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_configure_ap_text" msgid="3474995108398156258">"WLAN-Hotspot konfigurieren"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"WLAN-Hotspot einrichten"</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="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Lautlos-Modus"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lautstärke"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Klingeltonlautstärke"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Im Lautlos-Modus vibrieren"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrieren und klingeln"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standardbenachrichtigung"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Benachrichtigungslicht"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Klingelton"</string>
@@ -615,6 +638,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Klingelton &amp; Benachrichtigungen stummschalten"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Musik &amp; andere Medien stummschalten"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Benachrichtigungen stummschalten"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Wecker stummschalten"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Beim Klingeln vibrieren"</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>
@@ -624,14 +652,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Zum Einrichten des Dock-Audios muss das Tablet angedockt sein."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Zum Einrichten des Dock-Audios muss das Telefon angedockt sein."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Zum Einrichten des Dock-Audios muss das Tablet angedockt sein."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Zum Einrichten des Dock-Audios muss das Telefon angedockt sein."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Ton bei Dock-Anschluss"</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; Synchronisierung"</string>
+    <string name="account_settings" msgid="6403589284618783461">"Konten"</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="7965901687241669598">"Display"</string>
@@ -703,7 +731,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -728,7 +756,7 @@
     <string name="memory_media_usage" msgid="3738830697707880405">"Medien"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, Videos"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"Audio (Musik, Klingeltöne, Podcasts usw.)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"Audio (Musik, Töne, 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>
@@ -809,8 +837,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Auf Werkszustand zurück"</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="8317211882509025841">"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>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>" und heruntergeladene Apps"</li>"."</string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"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>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>" und heruntergeladene Apps"</li>"."</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"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>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"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>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</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="7744115866662613411">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
@@ -824,14 +852,14 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Alle persönlichen Daten und heruntergeladenen Apps löschen? Diese Aktion 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="2234954758550554549">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen auf die Werkseinstellungen zu bestätigen."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen auf die Werkseinstellungen zu bestätigen."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Die Zurücksetzung konnte nicht durchgeführt werden, da der Dienst zur Systembereinigung nicht verfügbar ist."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zurücksetzen?"</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>
     <string name="media_format_summary" product="default" msgid="3805714639375830120">"Löscht alle Daten auf der SD-Karte"</string>
-    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"Alle USB-Speicher löschen? "<b>"Alle"</b>" darin gespeicherten Daten gehen damit verloren!"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"USB-Speicher ganz löschen? "<b>"Alle"</b>" darin gespeicherten Daten gehen damit verloren!"</string>
     <string name="media_format_desc" product="default" msgid="8764037252319942415">"SD-Karte löschen? Sie verlieren damit "<b>"alle"</b>" Daten auf der Karte!"</string>
     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"USB-Speicher löschen"</string>
     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"SD-Karte löschen"</string>
@@ -839,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD-Karte und alle darauf gespeicherten Dateien löschen? Die Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Alles löschen"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Sie müssen Ihr Entsperrungsmuster zeichnen, um die Löschung des USB-Speichers zu bestätigen."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Sie müssen Ihr Entsperrungsmuster zeichnen, um die Löschung des USB-Speichers zu bestätigen."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"USB-Tethering"</string>
@@ -871,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilfunknetze"</string>
     <string name="location_title" msgid="1029961368397484576">"Mein Standort"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Standortdienst von Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Zulassen, dass Apps WLAN und Mobilfunknetze für die Bestimmung meines ungefähren Standorts verwenden"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Anonyme Standortdaten dürfen an Google gesendet werden. Außerdem können bestimmte Apps Daten aus Quellen wie WLAN und Mobilfunknetzen für die Bestimmung des ungefähren Standorts nutzen."</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 meinen Standort mithilfe von GPS bestimmen."</string>
@@ -916,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Menütaste drücken, um die Hilfe aufzurufen"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Lassen Sie die Tasten los, wenn Sie fertig sind."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Verbinden Sie mindestens <xliff:g id="NUMBER">%d</xliff:g> Punkte. Versuchen Sie es erneut:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Muster wurde aufgezeichnet!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Muster wurde aufgezeichnet."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Zeichnen Sie das Muster zur Bestätigung erneut:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Ihr neues Entsperrungsmuster:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bestätigen"</string>
@@ -928,7 +956,7 @@
     <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="2615606088906120711">"Muster sichtbar machen"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Bei Berührung vibrieren"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Ein-/Aus sperrt Gerät sofort"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Ein/Aus sperrt Gerät"</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>
@@ -938,15 +966,15 @@
     <string name="next_button_label" msgid="8890792540116568321">"Weiter"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sichern Ihres Tablets"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Telefon sichern"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Schützen Sie Ihr Tablet vor unbefugtem Zugriff: Erstellen Sie ein persönliches Entsperrungsmuster für Ihren Bildschirm. Verbinden Sie auf dem nächsten Bildschirm in beliebiger Reihenfolge mindestens vier Punkte mit dem Finger."\n\n"Bereit? Tippen Sie auf \"Weiter\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Schützen Sie Ihr Tablet vor unbefugtem Zugriff: Erstellen Sie ein persönliches Entsperrungsmuster für Ihren Bildschirm. Verbinden Sie auf dem nächsten Bildschirm in beliebiger Reihenfolge mindestens vier Punkte mit dem Finger."\n\n"Bereit? Tippen Sie auf \"Weiter\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Schützen Sie Ihr Telefon vor unbefugtem Zugriff! Erstellen Sie ein persönliches Entsperrungsmuster für Ihren Bildschirm. 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="7041951105633616745">"Apps verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installierte Apps verwalten und entfernen"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"Apps verwalten, Tastenkombinationen für Schnellstart einrichten"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"Apps verwalten, Tastenkombinationen für Schnellstart festlegen"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"App-Einstellungen"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unbekannte Herkunft"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Installation von Nicht-Market-Apps zulassen"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Installation von Apps aus unbekannten Quellen zulassen"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Apps mit unbekannter Herkunft 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 und jegliche Datenverluste tragen, die aus der Verwendung dieser Apps entstehen können."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Apps mit unbekannter Herkunft 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 und jegliche Datenverluste tragen, die aus der Verwendung dieser Apps entstehen können."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Erweiterte Einstellungen"</string>
@@ -954,10 +982,11 @@
     <string name="application_info_label" msgid="5736524913065714880">"App-Info"</string>
     <string name="storage_label" msgid="8700867073480107253">"Speicher"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Standardmäßig starten"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Standardeinstellungen"</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>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cache leeren"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
     <string name="controls_label" msgid="7611113077086853799">"Steuerung"</string>
     <string name="force_stop" msgid="7435006169872876756">"Stoppen erzwingen"</string>
@@ -973,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Daten löschen"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Updates deinstallieren"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Sie haben diese App für einige Aktionen als Standard festgelegt."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Sie haben dieser App das Erstellen von Widgets und den Zugriff auf ihre Daten erlaubt."</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="1616155457673106022">"Möglicherweise ist diese App nicht auf Ihren Bildschirm ausgelegt. Hier können Sie einstellen, wie sie an Ihren Bildschirm angepasst wird."</string>
@@ -983,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Nach Größe sortieren"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Aktive Dienste anzeigen"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Prozesse im Cache anzeigen"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"App-Einstellungen zurücksetzen"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"App-Einstellungen zurücksetzen?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hierdurch werden alle Einstellungen zurückgesetzt für:"\n\n" "<li>"Deaktivierte Apps"</li>\n" "<li>"Deaktivierte App-Benachrichtigungen"</li>\n" "<li>"Standard-Apps für Aktionen"</li>\n" "<li>"Hintergrunddatenbeschränkungen für Apps"</li>\n\n" Es gehen Ihnen keine App-Daten verloren."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Apps zurücksetzen"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Speicherplatz verwalten"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filteroptionen auswählen"</string>
@@ -1011,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Diese App kann auf die folgenden Funktionen Ihres Tablets zugreifen:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Diese App 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="invalid_size_value" msgid="7563537715280712285">"Paketgröße konnte nicht berechnet werden."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Sie haben keine Apps 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>
@@ -1033,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Bevorzugten Installationspfad für neue Apps ändern"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Integrierte App deaktivieren?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Durch das Deaktivieren einer integrierten App kommt es möglicherweise zu unerwünschtem Verhalten anderer Apps."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Benachrichtigungen deaktivieren?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Wenn Sie die Benachrichtigungen für diese App deaktivieren, verpassen Sie eventuell wichtige Warnmeldungen und Updates."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Speichernutzung"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Von Apps verwendeten Speicher anzeigen"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktive Dienste"</string>
@@ -1044,7 +1080,7 @@
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> frei"</string>
-    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> verw."</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> belegt"</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
@@ -1071,7 +1107,7 @@
     <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="8275523930352487827">"Tastatur und Eingabemethoden"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatur &amp; Eingabemethoden"</string>
     <string name="phone_language" msgid="8870144109924299673">"Sprache"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Autom. Ersetzung"</string>
@@ -1083,21 +1119,40 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Leertaste zweimal drücken, um \".\" hinzuzufügen"</string>
     <string name="show_password" msgid="3001113966880559611">"Passwörter sichtbar"</string>
     <string name="show_password_summary" msgid="7345931695292850058"></string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Diese Eingabemethode kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der App <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Möchten Sie diese Eingabemethode verwenden?"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Diese Rechtschreibprüfung kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der App <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Möchten Sie die Rechtschreibprüfung verwenden?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Diese Eingabemethode kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der App \"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>\". Möchten Sie diese Eingabemethode verwenden?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Diese Rechtschreibprüfung kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der App \"<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>\". Möchten Sie die Rechtschreibprüfung verwenden?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Einstellungen"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Sprache"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Einstellungen für <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> konnten nicht geöffnet werden."</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Maus/Touchpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Zeigergeschwindigkeit"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Gamecontroller"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Vibration verwenden"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Vibration zu Gamecontroller weiterleiten, sofern eine Verbindung besteht"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Tastaturlayout wählen"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Tastaturlayouts einrichten"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Drücken Sie zum Wechseln Strg+Leertaste."</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturlayouts"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Mein Wörterbuch"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Persönliches Wörterbuch"</string>
+    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Mein Wörterbuch"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persönliche Wörterbücher"</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_add_screen_title" msgid="742580720124344291">"Wortgruppe"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Mehr Optionen"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Weniger Optionen"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Wort:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Tastaturkürzel:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Sprache:"</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="8165273379942105271">"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="user_dict_settings_empty_text" msgid="8165273379942105271">"Es sind noch keine Wörter in Ihrem Wörterbuch vorhanden. Sie können Wörter hinzufügen, indem Sie das \"+\"-Symbol berühren."</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Für alle Sprachen"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Weitere Sprachen..."</string>
     <string name="testing" msgid="6584352735303604146">"Test"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet-Informationen"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformation"</string>
@@ -1120,7 +1175,7 @@
     <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">"Nie anzeigen"</string>
-    <string name="configure_input_method" msgid="1317429869771850228">"Eingabemethoden einrichten"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"Eingabemethoden festlegen"</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>
@@ -1134,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Optionen zur App-Entwicklung festlegen"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-Debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debugmodus bei Anschluss über USB"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Entwicklungsgerät-ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Geräteinformationen nicht verfügbar"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Aktiv lassen"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Falsche Standorte"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Falsche Standorte zulassen"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-Debugging zulassen?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-Debugging ist nur für Entwicklungszwecke vorgesehen. Damit können Sie Daten zwischen Ihrem Computer und Ihrem Gerät kopieren, Apps auf Ihrem Gerät ohne Benachrichtigung installieren und Protokolldaten lesen."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Entwicklungseinstellungen zulassen?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Diese Einstellungen sind ausschließlich für Entwicklungszwecke geeignet. Sie können Ihr Gerät und die darauf installierten Apps beschädigen oder zu unerwünschtem Verhalten führen."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB-Speicher schützen"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps benötigen die Berechtigung zum Lesen des USB-Speichers"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB-Speicher schützen?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wenn der USB-Speicher geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher."\n\n"Einige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD-Karte schützen"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps benötigen die Berechtigung zum Lesen der SD-Karte"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD-Karte schützen?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wenn die SD-Karte geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher."\n\n"Einige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget auswählen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget auswählen"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget erstellen und Zugriff erlauben?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Nach der Erstellung des Widgets hat <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> Zugriff auf alle von ihm angezeigten Daten."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> immer das Erstellen von Widgets und den Zugriff auf ihre Daten erlauben"</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>
@@ -1161,12 +1227,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Großer Text"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Ein/Aus beendet Anruf"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Passwörter aussprechen"</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 Beschreibungen Ihrer Aktionen."\n\n" Diese Funktion ist für Nutzer mit geringem Sehvermögen."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Reaktionszeit Berühren/Halten"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Webskripts installieren"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Web-Bedienung verbessern"</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">"An"</string>
     <string name="accessibility_service_state_off" msgid="2458594460762620776">"Deaktiviert"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Zugelassen"</string>
@@ -1181,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Keine Dienste installiert"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Benötigen Sie einen Screenreader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack bietet blinden Nutzern und Nutzern mit eingeschränktem Sehvermögen gesprochenes Feedback. Möchten Sie diese Funktion kostenlos von Android Market installieren?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Webskripts installieren?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Dürfen Apps Skriptdateien von Google installieren, um Ihnen den Zugang zu ihren Inhalten zu erleichtern?"</string>
-    <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="1072730037861494125">"Es wurde keine Beschreibung bereitgestellt."</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 Daten zum Akkuverbrauch"</string>
+    <string name="power_usage_not_available" msgid="3214000535532434353">"Keine Daten zum Akkuverbrauch"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1286,10 +1347,10 @@
     <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_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" msgid="3305141107104670703">"Das ausgewählte Modul kann nicht ausgeführt werden."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurieren"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Anderes Modul auswählen"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Dieses Sprachsynthesemodul kann den gesamten gesprochenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Es ist Teil der Anwendung <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Möchten Sie dieses Sprachsynthesemodul aktivieren?"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Dieses Sprachsynthesemodul kann den gesamten gesprochenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Es ist Teil der App \"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>\". Möchten Sie dieses Sprachsynthesemodul aktivieren?"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Module"</string>
     <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>
@@ -1302,7 +1363,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Weiblich"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Modul vor Verwendung aktivieren"</string>
     <string name="tts_engine_settings_button" msgid="1030512042040722285">"Einstellungen der Suchmaschine starten"</string>
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Bevorzugtes Modul"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Allgemein"</string>
@@ -1319,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Installieren der Anmeldedaten zu bestätigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuelles Passwort:"</string>
@@ -1330,22 +1393,22 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Speicher wurde gelöscht."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Anmeldedaten nicht gelöscht"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Der Anmeldeinformationsspeicher ist aktiviert."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Zur Verwendung des Anmeldeinformationsspeichers müssen Sie eine PIN oder ein Passwort für die Bildschirmsperre festlegen."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"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="5446972770562918934">"Sichern &amp; zurücksetzen"</string>
     <string name="privacy_settings_title" msgid="4856282165773594890">"Sichern &amp; zurücksetzen"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"Backup und Wiederherstellung"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"Sicherung &amp; 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="9157861529438245957">"App-Daten, 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. Wiederherstellung"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"Stellen Sie nach der Neuinstallation einer App gesicherte Einstellungen und Daten wieder her."</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"Nach der Neuinstallation einer App gesicherte Einstellungen und Daten wiederherstellen"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop-Sicherungspasswort"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Vollständige Desktop-Sicherungen sind derzeit nicht passwortgeschü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="local_backup_password_summary_none" msgid="393503434408227110">"Vollständige Desktop-Sicherungen sind momentan nicht passwortgeschützt."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Zum Ändern oder Entfernen des Passworts für vollständige Desktop-Sicherungen berühren"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Sicherung Ihrer WLAN-Passwörter, Lesezeichen, anderer Einstellungen und App-Daten beenden und alle Kopien auf Google-Servern löschen?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Einstellungen für die Geräteverwaltung"</string>
@@ -1356,13 +1419,13 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Geräteadministrator aktivieren?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Aktivieren"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Geräteadministrator"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Die Aktivierung dieses Administrators ermöglicht es der App <xliff:g id="APP_NAME">%1$s</xliff:g>, folgende Vorgänge auszuführen:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"Die Aktivierung dieses Administrators ermöglicht der App <xliff:g id="APP_NAME">%1$s</xliff:g>, folgende Vorgänge auszuführen:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Dieser Administrator ist aktiv und ermöglicht der App <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_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="6047518536574673606">"System"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Klingelton &amp; Vibration für Anrufe"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Verbinden mit WLAN <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1394,7 +1457,9 @@
     <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_failed" msgid="1696499856374109647">"Fehler bei der Synchronisierung"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Synchronisierung aktiv"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Synchronisierung"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Bei der Synchronisierung treten momentan Probleme auf. Sie wird in Kürze fortgesetzt."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Konto hinzufügen"</string>
     <string name="background_data" msgid="5779592891375473817">"Hintergrunddaten"</string>
@@ -1405,6 +1470,8 @@
     <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="last_synced" msgid="4242919465367022234">"Zuletzt synchronisiert am <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Synchronisieren…"</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>
@@ -1414,7 +1481,7 @@
     <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="sync_plug" msgid="3905078969081888738"><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="6205903695598000286">"Einstellungen für die App-Synchronisierung"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Daten &amp; Synchronisierung"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Passwort ändern"</string>
@@ -1428,7 +1495,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Dieses Konto ist für manche Apps erforderlich. Sie können es nur entfernen, indem Sie das Tablet unter \"Einstellungen\" > \"Sichern &amp; zurücksetzen\" auf die Werkseinstellungen zurücksetzen (damit werden alle Ihre persönlichen Daten gelöscht)."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Dieses Konto ist für manche Apps erforderlich. Sie können es nur entfernen, indem Sie das Telefon unter \"Einstellungen\" &gt; \"Sichern &amp; zurücksetzen\" auf die Werkseinstellungen zurücksetzen (damit werden all Ihre persönlichen Daten gelöscht)."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Manuelle Synchronisierung nicht möglich"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Die Synchronisierung hierfür ist deaktiviert. Zur Änderung dieser Einstellung aktivieren Sie vorübergehend Hintergrunddaten und automatische Synchronisierung."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G-Einstellungen"</string>
@@ -1436,7 +1504,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-MAC-Adresse"</string>
     <string name="enter_password" msgid="4131758584074246224">"Passwort zum Entschlüsseln des Speichers eingeben"</string>
     <string name="try_again" msgid="4272075051293936921">"Erneut versuchen"</string>
-    <string name="service_busy" msgid="2325014135156127705">"Der Dienst ist ausgelastet. Versuchen Sie es erneut."</string>
     <string name="delete" msgid="4219243412325163003">"Löschen"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1444,21 +1511,45 @@
     <string name="select_all" msgid="1562774643280376715">"Alles 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="debug_debugging_category" msgid="6781250159513471316">"Debugging"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Debugging-App auswählen"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Keine Debugging-App festgelegt"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Debugging-App: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"App auswählen"</string>
+    <string name="no_application" msgid="2813387563129153880">"Keine"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Auf Debugger warten"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"App wartet vor der Ausführung auf den Start des Debuggers"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Eingabe"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Zeichnung"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Überwachung"</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_screen_updates" msgid="5470814345876056420">"Oberflächenaktualisierungen anzeigen"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash für gesamte Fensteroberfläche bei Aktualisierung"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Aktual. der GPU-Ansicht anzeigen"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash-Ansicht im Fenster, wenn mit GPU dargestellt"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"HW-Overlays deaktivieren"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU immer für Bildschirmaufbau verwenden"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Tracing aktivieren"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Aktivierte Traces wählen"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Momentan sind keine Traces aktiviert."</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> Traces sind momentan aktiviert."</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Momentan sind alle Traces aktiviert."</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Layoutgrenzen einblenden"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Clip-Begrenzungen, Ränder usw. anzeigen"</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="force_hw_ui" msgid="6426383462520888732">"GPU-Rendering erzwingen"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"2D-Hardwarebeschleunigung in Apps verwenden"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Einsatz von GPU für 2D-Zeichnung erzwingen"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"GPU-Rendering für Profil"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Rendering-Zeit in adb shell dumpsys gfxinfo messen"</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="animator_duration_scale_title" msgid="3406722410819934083">"Maßstab für Animatorzeit"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1472,13 +1563,14 @@
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G-Nutzung separat anzeigen"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"WLAN anzeigen"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet-Nutzung anzeigen"</string>
+    <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobile Hotspots"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Daten automatisch synchronisieren"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Zyklus ändern..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Tag, an dem Datenverbrauchszyklus zurückgesetzt wird:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Kein Datenverbrauch 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_disclaimer" product="tablet" msgid="2591250607795265503">"Abrechnung des Datenverbrauchs durch Tablet, kann von Mobilfunkanbieter abweichen."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Abrechnung des Datenverbrauchs durch Telefon. Kann von Mobilfunkanbieter abweichen."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"eingeschränkt"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Mobile Daten deaktivieren?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Limit für mobile Daten festlegen"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G-Datenlimit festlegen"</string>
@@ -1489,33 +1581,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobil"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"App-Einstellungen anzeigen"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Hintergrunddaten beschränken"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Hintergrunddaten nur in Mobilfunknetzen deaktivieren und sofern verfügbar WLAN verwenden"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Hintergrunddaten in Mobilfunknetzen deaktivieren und sofern verfügbar andere als Mobilfunknetze verwenden"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Legen Sie zur Beschränkung der App-Hintergrunddaten zuerst ein Mobildatenlimit fest."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Hintergrunddaten beschränken?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Diese Funktion kann dazu führen, dass eine von Hintergrunddaten abhängige App nicht mehr funktioniert, wenn kein WLAN verfügbar ist."\n\n"Die innerhalb der App verfügbaren Einstellungen bieten geeignetere Steuerelemente zur Datennutzung."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Diese Funktion kann dazu führen, dass eine auf Hintergrunddaten basierende App nicht mehr funktioniert, wenn nur Mobilfunknetze verfügbar sind."\n\n"Geeignetere Kontrollmechanismen für den Datenverbrauch finden Sie in den Einstellungen der App."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Hintergrunddaten können nur beschränkt werden, wenn Sie ein Limit für mobile Daten festgelegt haben."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Autom. Synchronisierung aktivieren?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Tablet übernommen."\n\n"Für einige Konten werden möglicherweise auch Änderungen, die Sie auf Ihrem Tablet vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google-Konten."\n\n"Unter \"Einstellungen &gt; Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Telefon übernommen."\n\n"Für einige Konten werden möglicherweise auch Änderungen, die Sie auf Ihrem Telefon vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google-Konten."\n\n"Unter \"Einstellungen &gt; Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Autom. Synchronisierung deaktivieren?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"So reduzieren Sie den Datenverbrauch und schonen den Akku, müssen jedoch jedes einzelne Konto manuell synchronisieren, um neue Informationen abzurufen. Außerdem erhalten Sie keine Benachrichtigungen, wenn Aktualisierungen erfolgen."</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_warning_editor_title" msgid="3704136912240060339">"Warnung für Datenverbrauch festlegen"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limit für Datenverbrauch festlegen"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begrenzung des Datenverbrauchs"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Ihre <xliff:g id="NETWORKS">%1$s</xliff:g>-Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist."\n\n"Der Datenverbrauch wird von Ihrem Tablet berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Ihre <xliff:g id="NETWORKS">%1$s</xliff:g>-Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist."\n\n"Der Datenverbrauch wird von Ihrem Telefon berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Ihre mobile Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist."\n\n"Der Datenverbrauch wird von Ihrem Tablet berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Ihre mobile Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist."\n\n"Der Datenverbrauch wird von Ihrem Telefon berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Hintergrunddaten beschränken?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Wenn Sie mobile Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur, sofern Sie mit einem WLAN-Netzwerk verbunden sind."</string>
+    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Wenn Sie mobile Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> verwendet"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> verwendet"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> verwendet. Abrechnung des Datenverbrauchs durch Tablet. Kann von Mobilfunkanbieter abweichen."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> verwendet. Abrechnung des Datenverbrauchs durch Telefon. Kann von Mobilfunkanbieter abweichen."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobile Hotspots"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Wählen Sie die WLAN-Netzwerke aus, die mobile Hotspots sind. Die Verwendung dieser Netzwerke kann für Apps im Hintergrund eingeschränkt werden. Eventuell senden Apps auch eine Warnung, bevor diese Netzwerke für umfangreiche Downloads verwendet werden."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilfunknetze"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WLAN-Netzwerke"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Aktivieren Sie WLAN, um mobile Hotspots auszuwählen."</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>
@@ -1541,12 +1645,14 @@
     <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_edit" msgid="8647191407179996943">"VPN-Profil bearbeiten"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Mit <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"VPN-Profil hinzufügen"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Profil bearbeiten"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Profil löschen"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Es ist keine Netzwerkverbindung verfügbar. Bitte versuchen Sie es später erneut."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Ein Zertifikat fehlt. Bitte ändern Sie das Profil."</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>
@@ -1555,25 +1661,7 @@
     <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 Bedienungshilfen"</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="477937585801538951">"Nachdem Sie \"Tippen &amp; Entdecken\" aktiviert haben, können Sie den Bildschirm berühren und erfahren, was sich unter Ihrem Finger befindet. Momentan enthält der Bildschirm beispielsweise Symbole für Apps. Finden 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="3973201880357468747">"Tippen Sie auf ein etwas, 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="8764686624055084454">"Zum Scrollen durch eine Liste können Sie zwei Finger über den Bildschirm bewegen. Der aktuelle Bildschirm enthält beispielsweise eine Liste mit App-Namen, in der Sie nach oben oder unten scrollen können. Versuchen Sie, einige Apps 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="3055831259260848004">"Sie haben die Anleitung abgeschlossen. Tippen Sie zum Beenden auf <xliff:g id="FINISH">%s</xliff:g>."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Rechtschreibprüfung"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Rechtschreibprüfung"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Geben Sie Ihr aktuelles Passwort für vollständige Sicherungen hier ein."</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Geben Sie hier ein neues Passwort für vollständige Sicherungen ein."</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Geben Sie Ihr neues Passwort für vollständige Sicherungen hier erneut ein."</string>
@@ -1581,4 +1669,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Abbrechen"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Zusätzliche Systemupdates"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Nutzer &amp; Beschränkungen"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Nutzer"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Nutzer hinzufügen"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Details bearbeiten"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Nutzerinformationen"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Name"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Inhaltsbeschränkungen"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN erforderlich"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Einstufung des Inhalts"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"System-Apps"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installierte Apps"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Verwerfen"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Nutzer entfernen"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Nervensäge"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Nutzer entfernen?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Möchten Sie den Nutzer und alle mit ihm verbundenen Daten wirklich von Ihrem Gerät löschen?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Benachrichtigungen zeigen"</string>
+    <string name="help_label" msgid="1107174367904110532">"Hilfe"</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 5bd385e..c394858 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Αποσύνδεση..."</item>
     <item msgid="1634960474403853625">"Αποσυνδέθηκε"</item>
     <item msgid="746097431216080650">"Ανεπιτυχής"</item>
+    <item msgid="6367044185730295334">"Αποκλεισμένο"</item>
+    <item msgid="503942654197908005">"Προσωρινή αποφυγή αδύναμης σύνδεσης"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Αποσύνδεση από <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Αποσυνδέθηκε"</item>
     <item msgid="8578370891960825148">"Ανεπιτυχής"</item>
+    <item msgid="5660739516542454527">"Αποκλεισμένο"</item>
+    <item msgid="1805837518286731242">"Προσωρινή αποφυγή αδύναμης σύνδεσης"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Πάτημα κουμπιού"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Κανένα"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN από σημείο πρόσβασης"</item>
-    <item msgid="7364462169350112617">"PIN από αυτήν τη συσκευή"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Στατικό"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Αφαιρούμενη κάρτα SD"</item>
     <item msgid="4498124044785815005">"Να αποφασίζει το σύστημα"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Απενεργοποιημένη"</item>
-    <item msgid="4804571292609523335">"Δόνηση"</item>
-    <item msgid="595707141547423573">"Σίγαση"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Σύντομο"</item>
     <item msgid="2560532955514699713">"Μεσαία"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Κλίμ. κινούμ. εικ. 5x"</item>
     <item msgid="6660750935954853365">"Κλίμ. κινούμ. εικ. 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Κινούμ. εικόνες απενεργοποιημένες"</item>
+    <item msgid="1138649021950863198">"Κλίμακα κινούμενων εικόνων 0,5x"</item>
+    <item msgid="4394388961370833040">"Κλίμακα κινούμενων εικόνων 1x"</item>
+    <item msgid="8125427921655194973">"Κλίμακα κινούμενων εικόνων 1,5x"</item>
+    <item msgid="3334024790739189573">"Κλίμακα κινούμενων εικόνων 2x"</item>
+    <item msgid="3170120558236848008">"Κλίμακα κινούμενων εικόνων 5x"</item>
+    <item msgid="1069584980746680398">"Κλίμακα κινούμενων εικόνων 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Τυπικό όριο"</item>
     <item msgid="4071574792028999443">"Δεν υπάρχουν διεργασίες παρασκηνίου"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1c19956..ab1ea8d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Ναι"</string>
     <string name="no" msgid="6731231425810196216">"Όχι"</string>
+    <string name="create" msgid="3578857613172647409">"Δημιουργία"</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>
@@ -111,6 +112,8 @@
     <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_device_details" msgid="4594773497930028085">"Ρυθμίσεις συσκευής"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Ρυθμίσεις προφίλ"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Δεν έχει οριστεί όνομα, χρήση ονόματος λογαριασμού"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Σάρωση για συσκευές"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Μετονομασία tablet"</string>
@@ -131,13 +134,12 @@
     <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="5655704645616731277">"Αγγίξτε για σύζευξη"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Δεν βρέθηκαν συσκευές 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="1931617700075106801">"Αγγίξτε για σύζευξη με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Αγγίξτε για σύζευξη με τη συσκευή <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="device_picker" msgid="8398232791303186677">"Επιλογέας συσκευής Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Αίτημα άδειας Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Κάποια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth. Να επιτραπεί;"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Μια εφαρμογή από το tablet σας θέλει να ενεργοποιήσει τη δυνατότητα ανίχνευσης του tablet σας από άλλες Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Να επιτραπεί;"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Αγγίξτε για να συνδεθείτε στη συσκευή \"<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_acceptance_dialog_text" msgid="6555508756987053866">"Το %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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Το όνομα κεντρικού υπολογιστή που πληκτρολογήσατε δεν είναι έγκυρο."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Η λίστα εξαιρέσεων που έχετε πληκτρολογήσει δεν έχει μορφοποιηθεί σωστά. Πληκτρολογήστε τους τομείς που θέλετε να εξαιρεθούν, χωρίζοντάς τους με κόμμα."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Πρέπει να συμπληρώσετε το πεδίο θύρας."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Θα πρέπει να συμπληρώσετε το πεδίο θύρας."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Το πεδίο θύρας θα πρέπει να είναι κενό αν το πεδίο κεντρικού υπολογιστή είναι κενό."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Η θύρα που πληκτρολογήσατε δεν είναι έγκυρη."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ο διακομ. μεσολ. HTTP χρησιμοποιείται από το πρόγρ. περιήγ., αλλά δεν πρέπει να χρησιμοποιείται από άλλες εφαρμογές."</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"Οι αλλαγές θα πραγματοποιηθούν όταν πραγματοποιηθεί επανασύνδεση του καλωδίου USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Οι αλλαγές εφαρμόζονται όταν επανασυνδέεται το καλώδιο USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Ενεργοποίηση χώρου μαζικής αποθήκευσης USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Συνολικός αριθμός byte:"</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_not_present_status" product="nosdcard" msgid="1636218515775929394">"Μη προσαρτ. χώρος αποθ. USB."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Δεν υπάρχει κάρτα SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Διαθέσιμος αριθμός bytes:"</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="6691584887397909775">"Μπορείτε πια να καταργήσετε τον αποθηκευτικό χώρο USB με ασφάλεια"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Μπορείτε να αφαιρέσετε την κάρτα SD με ασφάλεια"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Μαζ. αποθ. στο χώρο αποθ. USB."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Η κάρτα SD χρησιμοποιείται ως συσκευή μαζικής αποθήκευσης."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Ασφ. κατάργ. χώρου αποθ. USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Τώρα μπορείτε να αφαιρέσετε την κάρτα 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">"Αριθμός bytes που χρησιμοποιήθηκαν:"</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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Χώρος αποθ. USB μόνο για ανάγ."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Η κάρτα SD που προσαρτήθηκε είναι μόνο για ανάγνωση."</string>
     <string name="skip_label" msgid="47510779345218297">"Παράλ"</string>
     <string name="next_label" msgid="4693520878012668114">"Επόμενο"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Γλώσσα"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"Όταν επιτρέπετε την περιαγωγή δεδομένων, ενδέχεται να επιβαρυνθείτε με σημαντικές χρεώσεις περιαγωγής!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Να επιτρέπεται η περιαγωγή δεδομένων;"</string>
     <string name="networks" msgid="6333316876545927039">"Επιλογή παρόχου"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Επιλέξτε μια εταιρία δικτύου"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ημερομηνία και ώρα"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"Επιλογή μορφής ημερομηνίας"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Βελτίωση αντιστοίχισης προσώπων"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Έλεγχος ζωντάνιας"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Απαιτείται βλεφάρισμα ματιών"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Μπορείτε να κάνετε κρυπτογράφηση λογαριασμών, ρυθμίσεων, εφαρμογών των οποίων έχετε πραγματοποιήσει λήψη και των δεδομένων, των μέσων και άλλων αρχείων τους. Μόλις κρυπτογραφήσετε το tablet σας, θα πρέπει να εισαγάγετε έναν αριθμητικό κωδικό PIN ή έναν κωδικό πρόσβασης για να το αποκρυπτογραφείτε κάθε φορά που το ενεργοποιείτε: δεν μπορείτε να αποκρυπτογραφήσετε το tablet σας, εκτός αν κάνετε επαναφορά των εργοστασιακών σας ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μία ώρα ή περισσότερο. Πρέπει να ξεκινήσετε με φορτισμένη μπαταρία και το tablet σας θα πρέπει να παραμείνει συνδεδεμένο μέχρι να ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία της κρυπτογράφησης, θα χάσετε όλα ή κάποια από τα δεδομένα σας."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Μπορείτε να κάνετε κρυπτογράφηση λογαριασμών, ρυθμίσεων, εφαρμογών των οποίων έχετε πραγματοποιήσει λήψη και των δεδομένων, των μέσων και άλλων αρχείων τους. Μόλις κρυπτογραφήσετε το τηλέφωνο σας, θα πρέπει να εισαγάγετε έναν αριθμητικό κωδικό PIN ή έναν κωδικό πρόσβασης για να το αποκρυπτογραφείτε κάθε φορά που το ενεργοποιείτε: δεν μπορείτε να αποκρυπτογραφήσετε το τηλέφωνό σας, εκτός αν κάνετε επαναφορά των εργοστασιακών σας ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μία ώρα ή περισσότερο. Πρέπει να ξεκινήσετε με φορτισμένη μπαταρία και το τηλέφωνό σας θα πρέπει να παραμείνει συνδεδεμένο μέχρι να ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία της κρυπτογράφησης, θα χάσετε όλα ή κάποια από τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το tablet σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του tablet σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη και το tablet σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το τηλέφωνό σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό 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="2029407131227814893">"Φορτίστε την μπαταρία σας και δοκιμάστε ξανά."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Συνδέστε τον φορτιστή σας και δοκιμάστε ξανά."</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_dialog_need_password_message" msgid="4071395977297369642">"Πρέπει να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης προτού αρχίσει η κρυπτογράφηση."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Να γίνει κρυπτογράφηση;"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Η λειτουργία κρυπτογράφησης είναι μη αναστρέψιμη και, αν τη διακόψετε, θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο, κατά τη διάρκεια της οποίας θα γίνει πολλές φορές επανεκκίνηση του tablet."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Η λειτουργία κρυπτογράφησης είναι μη αναστρέψιμη και, αν τη διακόψετε, θα χαθούν δεδομένα. Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο, κατά τη διάρκεια της οποίας θα γίνει πολλές φορές επανεκκίνηση του τηλεφώνου."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Κρυπτογράφηση"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του tablet. <xliff:g id="PERCENT">^1</xliff:g>% ολοκληρώθηκε."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του τηλεφώνου σας. <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="2223340178473871064">"Πληκτρολογήστε τον κωδικό πρόσβασής σας"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Η κρυπτογράφηση απέτυχε"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο tablet σας. "\n\n" Για να συνεχίσετε να χρησιμοποιείτε το tablet σας θα πρέπει να πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το tablet σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο τηλέφωνό σας. "\n\n"Για να συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας θα πρέπει να πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το τηλέφωνό σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Επιλογή κλειδ. οθόνης"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο tablet σας. "\n\n" Για να συνεχίσετε να χρησιμοποιείτε το tablet σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το tablet σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από το Λογαριασμό σας Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο τηλέφωνό σας. "\n\n"Για να συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το τηλέφωνό σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Εναλλαγή μεθόδου εισαγωγής"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Επιλογή κλειδ. οθόνης"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Επιλ. εφεδρ. κλειδώμ."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Κλείδ.οθόν."</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Αλλαγή κλειδώματος οθ."</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Μοτίβο"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Κωδικός πρόσβασης"</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>
@@ -362,44 +367,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Ο κωδικός πρόσβασης πρέπει να περιέχει λιγότερους από <xliff:g id="NUMBER">%d</xliff:g> χαρακτήρες."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Το PIN πρέπει να περιέχει λιγότερα από <xliff:g id="NUMBER">%d</xliff:g> ψηφία."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Το PIN πρέπει να περιέχει μόνο ψηφία από το 0 έως το 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Ο διαχειριστής της συσκευής δεν επιτρέπει τη χρήση πρόσφατου PIN."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Ο κωδικός πρόσβασης περιέχει έναν μη έγκυρο χαρακτήρα."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα γράμμα."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα ψηφίο."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα σύμβολο."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"O κωδικός πρόσβασης πρέπει να έχει τουλάχιστον ένα γράμμα"</item>
-    <item quantity="other" msgid="7278096339907683541">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d γράμματα"</item>
+    <item quantity="one" msgid="3063853802158131458">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 γράμμα."</item>
+    <item quantity="other" msgid="8186027808415585970">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d γράμματα."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"O κωδικός πρόσβασης πρέπει να έχει τουλάχιστον ένα πεζό γράμμα"</item>
-    <item quantity="other" msgid="588499075580432178">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d πεζά γράμματα"</item>
+    <item quantity="one" msgid="5583986519662091001">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 πεζό γράμμα."</item>
+    <item quantity="other" msgid="2693910942679679225">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d πεζά γράμματα."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"O κωδικός πρόσβασης πρέπει να έχει τουλάχιστον ένα κεφαλαίο γράμμα"</item>
-    <item quantity="other" msgid="2183090598541826806">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d κεφαλαία γράμματα"</item>
+    <item quantity="one" msgid="2611909966725502768">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 κεφαλαίο γράμμα."</item>
+    <item quantity="other" msgid="3030801209112209245">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d κεφαλαία γράμματα."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα αριθμητικό ψηφίο"</item>
-    <item quantity="other" msgid="995673409754935278">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d αριθμητικά ψηφία"</item>
+    <item quantity="one" msgid="3820355568839621231">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 αριθμητικό ψηφίο."</item>
+    <item quantity="other" msgid="4703982391407595924">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d αριθμητικά ψηφία."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"O κωδικός πρόσβασης πρέπει να έχει τουλάχιστον ένα ειδικό σύμβολο"</item>
-    <item quantity="other" msgid="3047460862484105274">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d ειδικά σύμβολα"</item>
+    <item quantity="one" msgid="8456579939292408631">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 ειδικό σύμβολο."</item>
+    <item quantity="other" msgid="1221290525051187757">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d ειδικά σύμβολα."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον ένα χαρακτήρα που δεν είναι γράμμα"</item>
-    <item quantity="other" msgid="5574191164708145973">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d χαρακτήρες που δεν είναι γράμματα"</item>
+    <item quantity="one" msgid="4594051152085925921">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 χαρακτήρα που δεν είναι γράμμα."</item>
+    <item quantity="other" msgid="3952508584649046404">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον %d χαρακτήρες που δεν είναι γράμματα."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Ο διαχειριστής της συσκευής δεν επιτρέπει τη χρήση ενός πρόσφατου κωδικού πρόσβασης"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Ο διαχειριστής της συσκευής δεν επιτρέπει τη χρήση πρόσφατου κωδικού πρόσβασης."</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="lock_setup" msgid="1759001157415978959">"Ολοκλήρωση ρύθμισης"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Η ρύθμιση ολοκληρώθηκε."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Για σύζευξη με:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Πληκτρολογήστε το κλειδί πρόσβασης συσκευής που απαιτείται:"</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_enter_pin_other_device" msgid="4637977124526813470">"Επίσης, ενδέχεται να χρειαστεί να πληκτρολογήσετε αυτό το PIN στην άλλη συσκευή."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Επίσης, ενδέχεται να χρειαστεί να πληκτρολογήσετε το κλειδί πρόσβασης στην άλλη συσκευή."</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="2796550001376088433">"Για σύζευξη με:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Πληκτρολογήστε:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> και πιέστε το πλήκτρο επιστροφής (Return) ή το πλήκτρο Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Δεν ήταν δυνατή η σύζευξη με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> λόγω εσφαλμένου αριθμού PIN ή κλειδιού πρόσβασης."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Δεν είναι δυνατή η σύνδεση με τη συσκευή <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_connecting_error_message" msgid="229861986106185022">"Δεν ήταν δυνατή η σύνδεση με τη συσκευή <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το τηλέφωνο αγγίζει μια άλλη συσκευή"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το tablet έρχεται σε επαφή με μια άλλη συσκευή"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το τηλέφωνο αγγίζει μια άλλη συσκευή"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Έτοιμο για μετάδοση περιεχομένου εφαρμογής μέσω NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Απενεργοποίηση"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Δεν διατίθεται, επειδή η ΕΚΠ είναι απενεργοποιημένη"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Όταν αυτή η λειτουργία είναι απενεργοποιημένη, μπορείτε να μεταδώσετε περιεχόμενο εφαρμογών σε άλλη συσκευή με δυνατότητα ΕΚΠ, διατηρώντας τις συσκευές σε κοντινή απόσταση μεταξύ τους. Για παράδειγμα, μπορείτε να μεταδώσετε σελίδες του προγράμματος περιήγησης, βίντεο του YouTube, επαφές και άλλα."\n\n"Απλώς φέρετε τις συσκευές σε κοντινή απόσταση μεταξύ τους (συνήθως πλάτη με πλάτη) και, στη συνέχεια, αγγίξτε την οθόνη. Η εφαρμογή καθορίζει τι θα μεταδοθεί."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Εντοπισμός υπηρεσίας δικτύου"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Να επιτρέπεται σε εφαρμογές ή σε άλλες συσκευές να εντοπίζουν εφαρμογές σε αυτήν τη συσκευή"</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="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_setup_wizard_title" msgid="70277346338812325">"Επιλογή Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Δεν είναι δυνατή η σάρωση για δίκτυα"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Ειδοποίηση δικτύου"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Να ειδοποιούμαι όταν υπάρχει διαθέσιμο ανοικτό δίκτυο"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Αποφυγή κακών συνδέσεων"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Να μην γίνεται χρήση δικτύων Wi-Fi, εκτός αν έχουν καλή σύνδεση στο Διαδίκτυο"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Αποφυγή κακών συνδέσεων"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Να μην γίνεται χρήση δικτύων Wi-Fi, εκτός αν έχουν καλή σύνδεση στο Διαδίκτυο"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Να παραμένει ενεργοποιημένο το 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_wps_pbc" msgid="2668564692207863017">"Κουμπί WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Εισαγ. κωδ. Pin WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Αναζήτηση για δίκτυα Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Άλλο δίκτυο…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Περισσότερα"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Αυτόματη ρύθμιση (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Εμφάνιση σύνθετων επιλογών"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"Εισαγωγή αριθμού PIN από σημείο πρόσβασης"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Ρύθμιση WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Πληκτρολογήστε τον αριθμό 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_wps_setup_title" msgid="6034518116333042484">"Ρύθμιση προστατευόμενου Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Έναρξη WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Πατήστε ο κουμπί ρύθμισης προστατευόμενου Wi-Fi στον δρομολογητή σας. Ενδέχεται να ονομάζεται \"WPS\" ή να περιέχει αυτό το σύμβολο:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Εισαγάγετε τον κωδικό PIN <xliff:g id="NUMBER">%1$s</xliff:g> στον δρομολογητή σας Wi-Fi. Η ολοκλήρωση της εγκατάστασης μπορεί να διαρκέσει έως και δύο λεπτά."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Επιτυχία WPS. Σύνδεση στο δίκτυο…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Η ρύθμιση WPS βρίσκεται ήδη σε εξέλιξη και ενδεχομένως να χρειαστούν έως και δύο λεπτά προκειμένου να ολοκληρωθεί"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Αποτυχία WPS. Προσπαθήστε ξανά σε λίγα λεπτά."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Δεν υποστηρίζεται η ρύθμιση ασφάλειας ασύρματου δρομολογητή (WEP)"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Δεν υποστηρίζεται η ρύθμιση ασφάλειας ασύρματου δρομολογητή (TKIP)"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Αποτυχία ελέγχου ταυτότητας. Προσπαθήστε ξανά."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Έχει εντοπιστεί μια άλλη συνεδρία WPS. Προσπαθήστε ξανά σε λίγα λεπτά."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Δίκτυο SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ασφάλεια"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Ισχύς σήματος"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Αποθηκευμένο"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Απενεργοποιημένο"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Αποφυγή κακής σύνδεσης στο Διαδίκτυο"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Το δίκτυο δεν χρησιμοποιήθηκε λόγω κακής σύνδεσης. Απενεργοποιήστε αυτήν τη ρύθμιση από το στοιχείο Ρυθμίσεις &gt; Οθόνη Wi-Fi του μενού Σύνθετες ρυθμίσεις."</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="3538912605343585226">"Προστατευόμενο δίκτυο διαθέσιμο"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (προστατευόμενο δίκτυο διαθέσιμο)"</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_failed_connect_message" msgid="8491902558970292871">"Αποτυχία σύνδεσης στο δίκτυο"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Να διαγραφεί από τη μνήμη"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Αποτυχία κατάργησης απομνημόνευσης δικτύου"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Αποθήκευση"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Αποτυχία αποθήκευσης δικτύου"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Ακύρωση"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Εντοπίστηκε άλλη προστατευμένη περίοδος σύνδ. WiFi. Δοκιμάστε ξανά σε λίγο."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Πύλη"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Μήκος προθέματος δικτύου"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Ρύθμιση ομότιμης συνδεσιμότητας"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Στοιχεία συσκευής"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Ρύθμιση προστατευμένου Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Πληκτρολογήστε τον αριθμό 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_remove_group" msgid="4844634506540667517">"Κατάργηση ομάδας"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Σύνθετες ρυθμίσεις"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Διαθέσιμες συσκευές"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Αναζήτηση συσκευών"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Αναζήτηση…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Μετονομασία συσκευής"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Ομότιμες συσκευές"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Δεν ήταν δυνατή η σύνδεση."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Αποτυχία μετονομασίας συσκευής."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Αποσύνδεση;"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Αν αποσυνδεθείτε, θα λήξει η σύνδεσή σας με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Αν αποσυνδεθείτε, θα λήξει η σύνδεσή σας με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g> και <xliff:g id="PEER_COUNT">%2$s</xliff:g> άλλες συσκευές."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ακύρωση πρόσκλησης;"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Θέλετε να ακυρώσετε την πρόσκληση για τη σύνδεση με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g>;"</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_ap_text" msgid="61237027772641155">"Ρύθμιση φορητού σημείου πρόσβασης 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="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ήχος"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Λειτουργία σίγασης"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ήχος κλήσης τηλεφώνου"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ρυθμίσεις έντασης"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Μουσικά εφέ"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ένταση ήχου ειδοποίησης"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Δόνηση στο αθόρυβο"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Δόνηση και κουδούνισμα"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Σίγαση ήχου κλήσης &amp; ειδοποιήσεων"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Σίγαση μουσικής &amp; άλλων μέσων"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Σίγαση ειδοποιήσεων"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Σίγαση ειδοποιήσεων"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Δόνηση κατά το κουδούνισμα"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"Θα πρέπει να συνδέσετε το tablet πριν από τη ρύθμιση του ήχου της βάσης σύνδεσης."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Θα πρέπει να συνδέσετε το τηλέφωνο πριν από τη ρύθμιση του ήχου της βάσης σύνδεσης."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Θα πρέπει να συνδέσετε το tablet πριν από τη ρύθμιση του ήχου της βάσης σύνδεσης."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Θα πρέπει να συνδέσετε το τηλέφωνο πριν από τη ρύθμιση του ήχου της βάσης σύνδεσης."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Ήχος κατά την εισαγωγή στη βάση σύνδεσης"</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="account_settings" msgid="6403589284618783461">"Λογαριασμοί"</string>
     <string name="search_settings" msgid="1910951467596035063">"Αναζήτηση"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Διαχείριση ρυθμίσεων αναζήτησης και ιστορικού"</string>
     <string name="display_settings" msgid="7965901687241669598">"Προβολή"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"Έκδοση 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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Να διαγραφούν όλα τα προσωπικά σας στοιχεία και οι ληφθείσες εφαρμογές; Δεν μπορείτε να αναστρέψετε αυτήν την ενέργεια!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Διαγραφή όλων"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για επιβεβαίωση επαναφοράς tablet."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την επαναφορά στις εργοστασιακές ρυθμίσεις."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Δεν πραγματοποιήθηκε επαναφορά επειδή η υπηρεσία Εκκαθάρισης συστήματος δεν είναι διαθέσιμη."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Να γίνει επαναφορά;"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Διαγρ. αποθ. χώρου USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Να γίνει διαγραφή της κάρτας 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="nosdcard" msgid="2192044794228379224">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να διαγράψετε το χώρο αποθήκευσης USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε ότι θέλετε να διαγράψετε την κάρτα 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="6688416425801386511">"Πρόσδεση USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Δίκτυα κινητής τηλεφωνίας"</string>
     <string name="location_title" msgid="1029961368397484576">"Η τοποθεσία μου"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Υπηρεσία τοποθεσίας Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Οι εφαρμογές μπορούν να χρησιμοποιούν δίκτυα Wi-Fi και κινητής τηλεφωνίας για τον προσδιορισμό της κατά προσέγγιση τοποθεσίας σας"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Επιτρέπεται η αποστολή ανώνυμ. δεδ. τοποθ. στην Google. Επίσης επιτρέπεται σε εφαρμογές η χρήση συνδέσ. όπως 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Πατήστε \"Μενού\" για βοήθεια."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Αφήστε το δάκτυλο μετά την ολοκλήρωση."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Συνδέστε τουλάχιστον <xliff:g id="NUMBER">%d</xliff:g> σημεία. Προσπαθήστε ξανά:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Το μοτίβο καταγράφηκε!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Το μοτίβο καταγράφηκε."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Σχεδιάστε ξανά το μοτίβο για επιβεβαίωση:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Το νέο μοτίβο ξεκλειδώματος:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Επιβεβαίωση"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Επόμενο"</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="1075370160667458122">"Προστατέψτε το tablet σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Χρησιμοποιήστε το δάχτυλό σας για να συνδέσετε τις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. Πρέπει να συνδέσετε τουλάχιστον τέσσερις τελείες. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Αγγίξτε το στοιχείο \"Επόμενο\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Προστατέψτε το tablet σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Σύρετε το δάχτυλό σας για να συνδέσετε τις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. Πρέπει να συνδέσετε τουλάχιστον τέσσερις τελείες. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Αγγίξτε το στοιχείο \"Επόμενο\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Προστατέψτε το τηλέφωνό σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Σύρετε το δάχτυλό σας για να συνδέσετε τουλάχιστον τέσσερις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Αγγίξτε το στοιχείο \"Επόμενο\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Διαχείριση εφαρμογών"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Διαχείριση και κατάργηση εγκατεστημένων εφαρμογών"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Διαχείριση εφαρμογών, ρύθμιση συντομεύσεων γρήγορης εκκίνησης"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ρυθμίσεις εφαρμογής"</string>
     <string name="install_applications" msgid="4872012136210802181">"Άγνωστες πηγές"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Να επιτρέπεται η εγκατάσταση εφαρμογών που δεν βρίσκονται στο Android Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Να επιτρέπεται η εγκατάσταση εφαρμογών από άγνωστες πηγές"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Η συσκευή σας tablet και τα προσωπικά σας δεδομένα είναι περισσότερο ευάλωτα σε επιθέσεις από εφαρμογές από άγνωστες προελεύσεις. Συμφωνείτε ότι είστε αποκλειστικά υπεύθυνοι για τυχόν βλάβη η οποία ενδέχεται να δημιουργηθεί στο tablet σας ή τυχόν απώλεια δεδομένων η οποία ενδέχεται να προκύψει μέσα από τη χρήση αυτών των εφαρμογών."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Το τηλέφωνό σας και τα προσωπικά δεδομένα σας είναι ευάλωτα σε επιθέσεις από εφαρμογές που προέρχονται από άγνωστες πηγές. Συμφωνείτε ότι είστε οι μοναδικοί υπεύθυνοι για κάθε ζημιά στο τηλέφωνο ή για απώλεια δεδομένων που ενδέχεται να προκύψουν από τη χρήση τέτοιων εφαρμογών."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Σύνθετες ρυθμίσεις"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Πληροφορίες εφαρμογής"</string>
     <string name="storage_label" msgid="8700867073480107253">"Αποθηκευτικός χώρος"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Εκκίνηση από προεπιλογή"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Προεπιλογές"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Συμβατότητα οθόνης"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Άδειες"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Προσωρινή μνήμη"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Εκκαθάριση δεδομένων"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Κατάργηση εγκατάστασης ενημερώσεων"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Έχετε επιλέξει να γίνεται εκκίνηση αυτής της εφαρμογής από προεπιλογή για ορισμένες ενέργειες."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Έχετε επιλέξει να επιτρέπεται σε αυτήν την εφαρμογή η δημιουργία γραφικών στοιχείων και η πρόσβαση στα δεδομένα τους."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Δεν έχουν οριστεί προεπιλογές."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Εκκαθάριση προεπιλογών"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Αυτή η εφαρμογή ενδέχεται να μην έχει σχεδιαστεί για την οθόνη σας. Εδώ μπορείτε να ελέγξετε τον τρόπο προσαρμογής της στην οθόνη σας."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ταξινόμηση με βάση μέγεθος"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Εμφ. υπ. που εκτελούνται"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Εμφ. διαδ. προσωρ. μνήμης"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Επαναφ. προτιμ. εφαρμ."</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Επαναφ. προτιμ. εφαρμ;"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Η ενέργεια αυτή θα επαναφέρει όλες τις προτιμήσεις για:"\n\n" "<li>"Απενεργοποιημένες εφαρμογές"</li>\n" "<li>"Απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n" "<li>"Προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n" "<li>"Περιορισμοί δεδομένων παρασκηνίου για εφαρμογές"</li>\n\n" Δεν θα χάσετε τα δεδομένα εφαρμογών."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Επαναφορά εφαρμογών"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Διαχείριση χώρου"</string>
     <string name="filter" msgid="2018011724373033887">"Φίλτρο"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Επιλογές φίλτρου"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Αυτή η εφαρμογή μπορεί να αποκτήσει πρόσβαση στα ακόλουθα στο tablet σας:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Αυτή η εφαρμογή μπορεί να αποκτήσει πρόσβαση στα ακόλουθα στο τηλέφωνό σας:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Υπολογισμός..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"Δεν είναι δυνατός ο υπολογισμός του μεγέθους του πακέτου"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"Δεν ήταν δυνατός ο υπολογισμός του μεγέθους του πακέτου."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Δεν έχετε εγκαταστήσει εφαρμογές τρίτων μερών."</string>
     <string name="version_text" msgid="9189073826278676425">"έκδοση <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Μετακίνηση"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Αλλαγή της προτιμώμενης θέσης εγκατάστασης για νέες εφαρμογές"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Απενεργ. ενσωματωμ. εφαρμογής;"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Αν απενεργοποιήσετε μια ενσωματωμένη εφαρμογή, ενδέχεται να μην εκτελούνται σωστά κάποιες άλλες εφαρμογές."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Απενεργοποίηση ειδοποιήσεων;"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Εάν απενεργοποιήσετε τις ειδοποιήσεις για αυτήν την εφαρμογή, ενδέχεται να χάσετε σημαντικές ειδοποιήσεις και ενημερώσεις."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Αποθηκευτικός χώρος"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Προβολή χώρου αποθήκευσης που χρησιμοποιείται από τις εφαρμογές"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Υπηρεσίες που εκτελούνται"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Αυτή η μέθοδος εισαγωγής ενδέχεται να έχει τη δυνατότητα να συλλέξει όλα τα κείμενα που πληκτρολογείτε, συμπεριλαμβανομένων προσωπικών δεδομένων, όπως είναι οι κωδικοί πρόσβασης και οι αριθμοί πιστωτικής κάρτας. Προέρχεται από την εφαρμογή <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Να γίνει χρήση αυτής της μεθόδου εισαγωγής;"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Αυτός ο ορθογραφικός έλεγχος που χρησιμοποιείτε ενδέχεται να έχει τη δυνατότητα να συλλέξει όλο το κείμενο που πληκτρολογείτε, συμπεριλαμβανομένων προσωπικών δεδομένων όπως κωδικών πρόσβασης και αριθμών πιστωτικών καρτών. Προέρχεται από την εφαρμογή <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Θέλετε να χρησιμοποιήσετε τον ορθογραφικό έλεγχο;"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Ρυθμίσεις"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Γλώσσα"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Δεν ήταν δυνατό το άνοιγμα των ρυθμίσεων για την εφαρμογή <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Ποντίκι/επιφάνεια αφής"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Ταχύτητα δείκτη"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Χειριστήριο παιχνιδιού"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Χρήση δόνησης"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Ανακατεύθυνση δόνησης στο χειριστήριο του παιχνιδιού κατά τη σύνδεση."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Επιλέξτε διάταξη πληκτρολογίου"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Ρύθμιση διατάξεων πληκτρολογίου"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Για εναλ., πατ. Control-Πληκ.διαστ."</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Προεπιλογή"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Διατάξεις πληκτρολογίου"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Λεξικό χρήστη"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Προσωπικό λεξικό"</string>
     <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_add_screen_title" msgid="742580720124344291">"Φράση"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Περισσότερες επιλογές"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Λιγότερες επιλογές"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"ΟΚ"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Λέξη:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Συντόμευση:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Γλώσσα:"</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="8165273379942105271">"Δεν υπάρχουν λέξεις καταχωρισμένες στο λεξικό χρήστη. Προσθέστε μια λέξη πατώντας το κουμπί Προσθήκη ( + )."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Όλες οι γλώσσες"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Για όλες τις γλώσσες"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Περισσότερες γλώσσες..."</string>
     <string name="testing" msgid="6584352735303604146">"Δοκιμή"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Πληροφορίες tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Πληροφορίες τηλεφώνου"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Ορισμός επιλογών για ανάπτυξη εφαρμογής"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Εντοπισμός σφαλμάτων USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Λειτουργία εντοπισμού σφαλμάτων όταν το USB είναι συνδεδεμένο"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Αναγνωριστικό ανάπτυξης συσκευής"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Οι πληροφορίες συσκευής δεν είναι διαθέσιμες"</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="7316799925425402244">"Ο εντοπισμός σφαλμάτων USB προορίζεται μόνο για σκοπούς προγραμματισμού. Χρησιμοποιήστε τον για αντιγραφή δεδομένων μεταξύ του υπολογιστή και της συσκευής σας, για την εγκατάσταση εφαρμογών στη συσκευή σας χωρίς προειδοποίηση και για την ανάγνωση δεδομένων καταγραφής."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Να επιτρέπεται η χρήση των ρυθμίσεων ανάπτυξης;"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Αυτές οι ρυθμίσεις προορίζονται για χρήση κατά την ανάπτυξη. Μπορούν να προκαλέσουν προβλήματα στη λειτουργία της συσκευής και των εφαρμογών σας."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Προστασία χώρου αποθήκευσης USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση χώρου αποθήκευσης USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Να προστατεύεται ο χώρος αποθήκευσης USB;"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Όταν ένας χώρος αποθήκευσης USB προστατεύεται, οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση δεδομένων από τον εξωτερικό χώρο αποθήκευσης."\n\n"Ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν μέχρι να ενημερωθούν από τους προγραμματιστές τους."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Προστασία κάρτας SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση κάρτας SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Να προστατεύεται η κάρτα SD;"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Όταν μια κάρτα SD προστατεύεται, οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση δεδομένων από τον εξωτερικό χώρο αποθήκευσης."\n\n"Ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν μέχρι να ενημερωθούν από τους προγραμματιστές τους."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Επιλογή gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Επιλογή γραφικού στοιχείου"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Να γίνει δημιουργία γραφικού στοιχείου και να επιτρέπεται η πρόσβαση;"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Αφού δημιουργήσετε το γραφικό στοιχείο, ο κεντρικός υπολογιστής <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> θα μπορεί να αποκτά πρόσβαση σε όλα τα δεδομένα που προβάλλει."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Να επιτρέπεται πάντα στον κεντρικό υπολογιστή <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> η δημιουργία γραφικών στοιχείων και η πρόσβαση στα δεδομένα τους"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Μεγάλο κείμενο"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Το κουμπί λειτουργίας τερματίζει την κλήση"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Εκφώνηση κωδικών πρόσβασης"</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="3264723681038625967">"Εγκατάσταση σεναρίων ιστού"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Βελτίωση προσβασιμότητας στον ιστό"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Χρειάζεστε έναν αναγνώστη οθόνης;"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Το TalkBack παρέχει σχόλια σε μορφή ομιλίας για να διευκολύνει χρήστες με προβλήματα όρασης. Θέλετε να το εγκαταστήσετε δωρεάν από το Android Market;"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Να γίνει εγκατάσταση σεναρίων ιστού;"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Θέλετε να οι εφαρμογές να εγκαταστήσουν σενάρια από την Google που διευκολύνουν την πρόσβαση στο περιεχόμενο ιστού που έχουν;"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Αυτή η λειτουργία αλλάζει τον τρόπο απόκρισης της συσκευής σας στα αγγίγματα. Να ενεργοποιηθεί;"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Δεν υπάρχει περιγραφή."</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_not_available" msgid="3214000535532434353">"Μη διαθέσιμα δεδ. χρήσ. μπατ."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"Δεν είναι δυνατή η εκτέλεση της μηχανής που επιλέξατε."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Διαμόρφωση"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Επιλέξτε μια άλλη μηχανή"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Αυτή η μηχανή σύνθεσης ομιλίας μπορεί να συγκεντρώσει όλο το κείμενο που θα εκφωνηθεί, συμπεριλαμβανομένων προσωπικών δεδομένων όπως οι κωδικοί πρόσβασης και οι αριθμοί πιστωτικών καρτών. Προέρχεται από τη μηχανή <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Να ενεργοποιηθεί η μηχανή σύνθεσης ομιλίας;"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"Ενερ. νέας μηχ. πριν τη χρήση."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την εγκατάσταση των διαπιστευτηρίων."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Πληκτρολογήστε τον κωδικό πρόσβασης του αποθηκευτικού χώρου διαπιστευτηρίων."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Τρέχον κωδικός πρόσβασης:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Ο αποθ. χώρος διαπιστ. διαγρ."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Αδυν. διαγρ. αποθ. χώρ. διαπιστ."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Ο χώρος αποθήκευσης διαπιστευτηρίων ενεργοποιήθηκε."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Πρέπει να ορίσετε έναν αριθμό PIN ή κωδικό πρόσβασης κλειδώματος οθόνης προτού χρησιμοποιήσετε τον χώρο αποθήκευσης διαπιστευτηρίων."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Πρέπε να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης πριν χρησιμοποιήσετε τον χώρο αποθήκευσης διαπιστευτηρίων."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Τόνος επείγουσας ανάγκης"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ορισμός συμπεριφοράς κατά την πραγματοποίηση κλήσης επείγουσας ανάγκης"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Αντίγραφα ασφαλείας και επαναφορά"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Αυτόματη επαναφορά"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Κατά την εκ νέου εγκατάσταση μιας εφαρμογής, ανακτήστε τις ρυθμίσεις και τα δεδομένα για τα οποία έχετε δημιουργήσει αντίγραφα ασφαλείας"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Κωδ.πρόσβ.αντ.ασφ.επιφ.εργ."</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Προς το παρόν, τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας δεν προστατεύονται."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Επιλογή για αλλαγή ή κατάργηση του κωδικού πρόσβασης για τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας δεν προστατεύονται αυτήν τη στιγμή"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Αγγίξτε για αλλαγή ή κατάργηση του κωδικού πρόσβασης για τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Θέλετε να διακοπεί η δημιουργία αντιγράφων ασφαλείας για τους κωδικούς πρόσβασης Wi-Fi, τους σελιδοδείκτες και τις άλλες ρυθμίσεις και τα δεδομένα εφαρμογών και να διαγραφούν όλα τα αντίτυπα από τους διακομιστές της Google;"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ρυθμίσεις διαχείρισης συσκευής"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Αυτός ο διαχειριστής είναι ενεργός και επιτρέπει στην εφαρμογή <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">"Ήχοι κλήσης και ειδοποιήσεις"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Ειδοποιήσεις"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Σύστημα"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ήχος κλήσης και δόνηση"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"Σύστημα"</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="3747859666621319757">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Ο συγχρονισμός απέτυχε"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Ενεργοποίηση συγχρονισμού"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Συγχρονισμός"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Ο συγχρονισμός αντιμετωπίζει προβλήματα αυτήν τη στιγμή. Θα είναι διαθέσιμο ξανά σύντομα."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Προσθήκη λογαριασμού"</string>
     <string name="background_data" msgid="5779592891375473817">"Δεδομένα φόντου"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Συγχρ. είναι ενεργ."</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Ο συγχρονισμός είναι απενεργοποιημένος"</string>
     <string name="sync_error" msgid="5060969083117872149">"Σφάλμα συγχρονισμού"</string>
+    <string name="last_synced" msgid="4242919465367022234">"Τελευταίος συγχρονισμός <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Συγχρονισμός τώρα..."</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Καλώς ορίσατε στο Google Sync!"</font>" "\n"Πρόκειται για μια προσέγγιση της Google στον συγχρονισμό δεδομένων, η οποία επιτρέπει την πρόσβαση στις επαφές, στις συναντήσεις σας και σε πολλά άλλα, όπου και αν βρίσκεστε."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Ρυθμίσεις συγχρονισμού εφαρμογής"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Δεδομένα και συγχρονισμός"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Αλλαγή κωδικού πρόσβασης"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Αυτός ο λογαριασμός απαιτείται από ορισμένες εφαρμογές. Μπορείτε να τον καταργήσετε μόνο μέσω της επαναφοράς των προεπιλεγμένων εργοστασιακών ρυθμίσεων του tablet (με την οποία διαγράφονται όλα τα προσωπικά σας δεδομένα) από το μενού Ρυθμίσεις &gt; Δημιουργία αντιγράφων ασφαλείας και επαναφορά."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Αυτός ο λογαριασμός απαιτείται από ορισμένες εφαρμογές. Μπορείτε να τον καταργήσετε μόνο μέσω της επαναφοράς των προεπιλεγμένων εργοστασιακών ρυθμίσεων του τηλεφώνου (με την οποία διαγράφονται όλα τα προσωπικά σας δεδομένα) από το μενού Ρυθμίσεις &gt; Δημιουργία αντιγράφων ασφαλείας και επαναφορά."</string>
     <string name="provider_label" msgid="7724593781904508866">"Προώθηση συνδρομών"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"Συγχρονισμός <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Δεν είναι δυνατός ο μη αυτόματος συγχρονισμός"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ο συγχρονισμός για αυτό το στοιχείο είναι προς το παρόν απενεργοποιημένος. Για να αλλάξετε τη ρύθμισή σας, ενεργοποιήστε προσωρινά τα δεδομένα παρασκηνίου και τον αυτόματο συγχρονισμό."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Ρυθμίσεις 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Διεύθυνση 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Εισαγάγετε κωδικό πρόσβασης για την αποκρυπτογράφηση του αποθηκευτικού χώρου"</string>
     <string name="try_again" msgid="4272075051293936921">"Δοκιμάστε ξανά."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Η συσκευή είναι απασχολημένη. Δοκιμάστε ξανά."</string>
     <string name="delete" msgid="4219243412325163003">"Διαγραφή"</string>
     <string name="misc_files" msgid="6720680815969643497">"Διάφορα αρχεία"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"Επιλογή όλων"</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="debug_debugging_category" msgid="6781250159513471316">"Εντοπισμός σφαλμάτων"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Επιλέξτε εφαρμογή εντοπισμού σφαλμάτων"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Δεν έχει οριστεί εφαρμογή εντοπισμού σφαλμάτων"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Εφαρμογή εντοπισμού σφαλμάτων: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Επιλέξτε εφαρμογή"</string>
+    <string name="no_application" msgid="2813387563129153880">"Καμία"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Περιμένετε το εργαλείο εντοπισμού σφαλμάτων"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Αναμονή εφαρμογής για να συνδεθεί ο εντοπισμός σφαλμάτων"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Εισαγωγή"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Σχέδιο"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Παρακολούθηση"</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_screen_updates" msgid="5470814345876056420">"Εμφάνιση ενημερώσεων επιφάνειας"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Προβολή Flash ολόκλ. των επιφ παραθ. όταν ενημερ."</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Εμφάνιση των ενημερώσεων προβολής GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Προβολές Flash εντός παραθύρων όταν γίνεται σχεδιασμός με το GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Απενεργ. επικαλύψεων HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Να γίνεται πάντα χρήση του GPU για σύνθεση οθόνης"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Ενεργοποίηση ιχνών"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Επιλ. ενεργ. ιχνών"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Δεν υπάρχουν ενεργοποιημένα ίχνη την τρέχουσα στιγμή"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> ίχνη είναι ενεργοποιημένα την τρέχουσα στιγμή"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Όλα τα ίχνη είναι επί του παρόντος ενεργοποιημένα"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Εμφάνιση ορίων διάταξης"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Εμφάνιση ορίων κλιπ, περιθωρίων, κλπ."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Προβολή χρήσης CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Επικάλυψη οθόνης για προβολή τρέχουσας χρήσης CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Αναγκαστική απόδοση GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Χρησιμοποιήστε επιτάχυνση υλικού 2D στις εφαρμογές"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Αναγκαστική χρήση του GPU για σχέδιο 2D"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Απόδοση GPU προφίλ"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Μέτρ. χρόνου απόδοσης σε adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Κλίμακα κίνησης παραθύρου"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Κλίμακα κίνησης μετάβασης"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator duration scale"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Εφαρμογές"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Μη διατήρ. δραστηριοτήτων"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Διαγραφή κάθε δραστηριότητας μετά τον τερματισμό"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Σημεία πρόσβασης για κιν."</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Αυτόματος συγχρονισμός δεδομένων"</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="8621855507876539282">"Καμία εφαρμ. δεν χρησιμ. δεδ. αυτήν την περίοδο"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Προσκήνιο"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Φόντο"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Μέτρηση από tablet. Ο υπολ. της χρήσης δεδ. της εταιρ. κιν.τηλεφ. ίσως διαφέρει."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Μέτρηση από τηλέφ. Ο υπολ. της χρήσης δεδ. της εταιρ. κιν.τηλεφ. ίσως διαφέρει."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"περιορισμένη"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Να απενεργοποιηθούν τα δεδομένα για κινητά;"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Ορισμός ορίου δεδομένων κινητού"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Ορισμός ορίου δεδομένων 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Κινητά"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Κανένα"</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="8430240158135453271">"Προβολή ρυθμίσεων εφαρμογής"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Περιορισμός δεδομ. παρασκηνίου"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Δεδομένα στο παρασκήνιο μόνο σε Wi-Fi, αν είναι διαθέσιμο."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Απενεργ. δεδ. παρασκ. σε δίκτυα κινητής. Θα χρησιμ. άλλα δίκτυα."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Ορίστε ένα όριο δεδ. κιν. τηλ. για να περιορ. τα δεδ. παρασκ."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Περιορ.δεδομ.παρασκην.;"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Αυτή η λειτουργία μπορεί να προκαλέσει τη διακοπή λειτουργίας μιας εφαρμογής που εξαρτάται από δεδομένα παρασκηνίου όταν δεν υπάρχει διαθέσιμο Wi-Fi."\n\n"Μπορείτε να βρείτε πιο κατάλληλα στοιχεία ελέγχου χρήσης δεδομένων στις ρυθμίσεις που διατίθενται από την εφαρμογή."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Αυτή η λειτουργία μπορεί να κάνει μια εφαρμογή που βασίζεται στα δεδομένα παρασκηνίου να πάψει να λειτουργεί σωστά όταν διατίθενται μόνο δίκτυα κινητής τηλεφωνίας ."\n\n"Μπορείτε να βρείτε περισσότερα κατάλληλα στοιχεία ελέγχου χρήσης δεδομένων στις ρυθμίσεις που διατίθενται στην εφαρμογή."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ο περιορισμός των δεδομένων παρασκηνίου είναι δυνατός μόνο όταν έχετε ορίσει ένα όριο δεδομένων κινητής τηλεφωνίας."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Ενεργοπ. αυτόμ. συγχρ. δεδομ.;"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Θα γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στους λογαριασμούς σας στον ιστό στο tablet σας."\n\n"Σε ορισμένους λογαριασμούς ενδέχεται να γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στο tablet σας στον ιστό. Ένας Λογαριασμός Google λειτουργεί με αυτόν τον τρόπο."\n\n"Για να επιλέξετε το είδος των πληροφοριών που συγχρονίζονται σε κάθε λογαριασμό, μεταβείτε στην περιοχή Ρυθμίσεις &gt; Λογαριασμοί."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Θα γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στους λογαριασμούς σας στον ιστό στο τηλέφωνό σας."\n\n"Σε ορισμένους λογαριασμούς ενδέχεται να γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στο τηλέφωνό σας στον ιστό. Ένας Λογαριασμός Google λειτουργεί με αυτόν τον τρόπο."\n\n"Για να επιλέξετε το είδος των πληροφοριών που συγχρονίζονται σε κάθε λογαριασμό, μεταβείτε στην περιοχή Ρυθμίσεις &gt; Λογαριασμοί."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Απενεργ. αυτόμ. συγχρ. δεδομ.;"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Με αυτόν τον τρόπο θα εξοικονομήσετε δεδομένα και χρήση μπαταρίας, αλλά θα πρέπει να συγχρονίσετε κάθε λογαριασμό με μη αυτόματο τρόπο για να συλλέξετε πρόσφατες πληροφορίες. Δεν θα λαμβάνετε ειδοποιήσεις κατά τη διάρκεια των ενημερώσεων."</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_warning_editor_title" msgid="3704136912240060339">"Ορισμός προειδοποίησης χρήσης δεδομένων"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ορισμός ορίου χρήσης δεδομένων"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Περιορισμός χρήσης δεδομένων"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Η σύνδεση δεδομένων <xliff:g id="NETWORKS">%1$s</xliff:g> θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο."\n\n"Επειδή η χρήση δεδομένων μετράται από το tablet σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, σκεφτείτε το ενδεχόμενο να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Η σύνδεση δεδομένων <xliff:g id="NETWORKS">%1$s</xliff:g> θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο."\n\n"Επειδή η χρήση δεδομένων μετράται από το τηλέφωνό σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, σκεφτείτε το ενδεχόμενο να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Η σύνδεση των δεδομένων του κινητού τηλεφώνου σας θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο."\n\n"Επειδή η χρήση δεδομένων υπολογίζεται από το tablet σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, καλό θα ήταν να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Η σύνδεση των δεδομένων του κινητού τηλεφώνου σας θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο."\n\n"Επειδή η χρήση δεδομένων υπολογίζεται από το τηλέφωνό σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, σκεφτείτε το ενδεχόμενο να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Περιορ.δεδομ.παρασκην.;"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Αν περιορίσετε τα δεδομένα παρασκηνίου κινητής τηλεφωνίας, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν εκτός και αν έχετε συνδεθεί σε δίκτυο Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: έχουν χρησιμοποιηθεί περίπου <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: έχουν χρησιμοποιηθεί περίπου <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: χρησιμοπ. <xliff:g id="TOTAL">%1$s</xliff:g>, βάσει tablet. Ο υπολογισμός χρήσης του δικτύου σας ίσως διαφέρει."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: χρησιμοπ. <xliff:g id="TOTAL">%1$s</xliff:g>, βάσει μέτρησης. Ο υπολογ. χρήσης του δικτύου σας ίσως διαφέρει."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Σημεία πρόσβασης για κιν."</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Επιλέξτε τα δίκτυα Wi-Fi που αποτελούν σημεία πρόσβασης για κινητά. Η χρήση αυτών των δικτύων από τις εφαρμογές μπορεί να αποκλειστεί όταν βρίσκονται στο παρασκήνιο. Οι εφαρμογές μπορεί επίσης να προειδοποιούν πριν από τη χρήση αυτών των δικτύων για μεγάλες λήψεις."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Δίκτυα κινητής τηλεφωνίας"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Δίκτυα Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Για επιλογή σημ. πρόσβ. για κινητά, ενεργοποιήστε το Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Επεξεργασία προφίλ VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Σύνδεση στο προφίλ <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Προσθήκη προφίλ VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Επεξεργασία προφίλ"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Διαγραφή προφίλ"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Δεν υπάρχει σύνδεση δικτύου. Δοκιμάστε ξανά αργότερα."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Λείπει ένα πιστοποιητικό. Επεξεργαστείτε το προφίλ."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"Αφού ενεργοποιήσετε την \"Εξερεύνηση μέσω αφής\", μπορείτε να αγγίξετε την οθόνη για να μάθετε τι βρίσκεται κάτω από το δάχτυλό σας. Για παράδειγμα, η τρέχουσα οθόνη περιέχει εικονίδια εφαρμογών. Βρείτε ένα από αυτά αγγίζοντας την οθόνη και σέρνοντας το δάχτυλό σας."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Συνεχίστε την ολίσθηση με το δάχτυλό σας στην οθόνη, μέχρι να βρείτε τουλάχιστον ένα ακόμη εικονίδιο."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Για να ενεργοποιήσετε ένα στοιχείο που αγγίζετε, πατήστε το. Σύρετε το δάχτυλό σας έως ότου βρείτε το εικονίδιο για την εφαρμογή <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="8764686624055084454">"Για να πραγματοποιήσετε κύλιση σε μια λίστα, μπορείτε να σύρετε δύο δάχτυλα στην οθόνη. Για παράδειγμα, η τρέχουσα οθόνη περιέχει μια λίστα ονομάτων εφαρμογών, στην οποία μπορείτε να πραγματοποιήσετε κύλιση προς τα πάνω ή προς τα κάτω. Αρχικά, προσπαθήστε να αναγνωρίσετε μερικά στοιχεία στη λίστα πραγματοποιώντας ολίσθηση με ένα δάχτυλο."</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="3055831259260848004">"Έχετε ολοκληρώσει το πρόγραμμα εκμάθησης. Βρείτε και αγγίξτε το κουμπί <xliff:g id="FINISH">%s</xliff:g> για έξοδο."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Διόρθωση ορθογραφίας"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Ορθογραφικός έλεγχος"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Πληκτρολογήστε τον τρέχοντα κωδικό πρόσβασής σας για πλήρες αντίγραφο ασφαλείας εδώ"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Πληκτρολογήστε εδώ έναν νέο κωδικό πρόσβασης για πλήρη αντίγραφα ασφαλείας"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Πληκτρολογήστε ξανά τον νέο κωδικό πρόσβασής σας για πλήρες αντίγραφο ασφαλείας εδώ"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ακύρωση"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Πρόσθετες ενημερώσεις συστήματος"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Χρήστες &amp; περιορισμοί"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Χρήστες"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Προσθήκη χρήστη"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Επεξεργασία λεπτομερειών"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Πληροφορίες χρήστη"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Όνομα"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Περιορισμοί περιεχομένου"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Απαιτείται PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Αξιολόγηση περιεχομένου"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Εφαρμογές συστήματος"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Εγκατεστημένες εφαρμογές"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Απόρριψη"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Κατάργηση χρήστη"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Ενοχλητικό παιδί"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Κατάργηση χρήστη;"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Είστε βέβαιοι ότι θέλετε να καταργήσετε τον χρήστη και όλα τα σχετικά δεδομένα από τη συσκευή;"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Εμφάν. ειδοποιήσεων"</string>
+    <string name="help_label" msgid="1107174367904110532">"Βοήθεια"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 80642ac..0af57e7 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Disconnecting…"</item>
     <item msgid="1634960474403853625">"Disconnected"</item>
     <item msgid="746097431216080650">"Unsuccessful"</item>
+    <item msgid="6367044185730295334">"Blocked"</item>
+    <item msgid="503942654197908005">"Temporarily avoiding poor connection"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Disconnecting from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Disconnected"</item>
     <item msgid="8578370891960825148">"Unsuccessful"</item>
+    <item msgid="5660739516542454527">"Blocked"</item>
+    <item msgid="1805837518286731242">"Temporarily avoiding poor connection"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push button"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"None"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN from access point"</item>
-    <item msgid="7364462169350112617">"PIN from this device"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Static"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Removable SD card"</item>
     <item msgid="4498124044785815005">"Let the system decide"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Off"</item>
-    <item msgid="4804571292609523335">"Vibrate"</item>
-    <item msgid="595707141547423573">"Mute"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Short"</item>
     <item msgid="2560532955514699713">"Medium"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animation scale 5x"</item>
     <item msgid="6660750935954853365">"Animation scale 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animation off"</item>
+    <item msgid="1138649021950863198">"Animation scale .5x"</item>
+    <item msgid="4394388961370833040">"Animation scale 1x"</item>
+    <item msgid="8125427921655194973">"Animation scale 1.5x"</item>
+    <item msgid="3334024790739189573">"Animation scale 2x"</item>
+    <item msgid="3170120558236848008">"Animation scale 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6236161..de87dc8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Yes"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
+    <string name="create" msgid="3578857613172647409">"Create"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prevent use of the Bluetooth dialler when the screen is locked"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth devices"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Device name"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Device settings"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profile settings"</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_rename_device" product="tablet" msgid="787970073150631155">"Rename tablet"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</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="5655704645616731277">"Touch to pair"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No nearby Bluetooth devices were found."</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="1931617700075106801">"Touch to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Touch 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="device_picker" msgid="8398232791303186677">"Bluetooth device chooser"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth permission request"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"An app wants to turn on Bluetooth. Allow?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"An app on your tablet wants to make your tablet discoverable by other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Allow?"</string>
@@ -148,14 +150,14 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"An app on your phone wants to turn on Bluetooth and make your phone discoverable by other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Allow?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"An app on your tablet wants to turn on Bluetooth and make your tablet discoverable by other devices. Allow?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"An app on your phone wants to turn on Bluetooth and make your phone discoverable by other devices. Allow?"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning Bluetooth on…"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning on Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth connection request"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wants 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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"The hostname that you typed isn\'t valid."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"The exclusion list that you\'ve typed isn\'t properly formatted. Type 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_port" msgid="5539106187558215246">"You need to 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="2671425042711054494">"The port that you typed is not valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Set"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Unsuccessful"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Successful"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Changes take effect when USB cable is reconnected"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Changes take effect when the USB cable is reconnected."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Enable USB mass storage"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total bytes:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB storage not mounted"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"No SD card"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB storage not mounted."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"No SD card."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Available bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB storage is being used as a mass storage device"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD card is being used as a mass storage device"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"It is now safe to remove the USB storage"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"It is now safe to remove the SD card"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB storage is being used as a mass storage device."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD card is being used as a mass storage device."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"It is now safe to remove the USB storage."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"It is now safe to remove the SD card."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB storage was removed while still in use!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD card was removed while still in use!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Used bytes:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Scanning USB storage for media…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB storage mounted read-only."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Language"</string>
@@ -257,17 +259,17 @@
     <string name="settings_label" msgid="1626402585530130914">"Settings"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"Airplane mode"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Aeroplane mode"</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="radio_controls_summary" msgid="2998818677094465517">"Manage Wi-Fi, Bluetooth, aeroplane 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>
     <string name="roaming_disable" msgid="1295279574370898378">"Connect to data services when roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Turn it on"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Allow data roaming? You may incur significant roaming charges!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Attention"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"When you allow data roaming, you may incur significant roaming charges!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Allow data roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Operator selection"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Choose a network operator"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Date &amp; time"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Set time"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Select time zone"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Set date"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Select date format"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Choose 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="date_picker_title" msgid="1338210036394128512">"Date"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Time"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Improve face matching"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Liveness check"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Require eye blink"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you have encrypted 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 of 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="3504519024884099702">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you have encrypted your phone, you must enter a numeric PIN or password to decrypt it each time 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_desc" product="tablet" msgid="3839235202103924154">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your tablet, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can\'t decrypt 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="7663118199519229502">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your phone, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can\'t decrypt 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="2029407131227814893">"Please charge your battery and try again."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"You need to set a lock screen PIN or password before you can start encryption."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encrypt?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the tablet will restart several times."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which 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="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"Type your password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"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>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Encryption was interrupted and can\'t complete. As a result, the data on your phone is no longer accessible. "\n\n"To 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>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Select screen lock"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. "\n\n" To resume using your tablet, you need to 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>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. "\n\n"To resume using your phone, you need to 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>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Choose backup 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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Pattern"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN must be at least %d characters"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Password must be fewer than <xliff:g id="NUMBER">%d</xliff:g> characters."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN must be fewer than <xliff:g id="NUMBER">%d</xliff:g> digits."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN must contain only digits 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"The device administrator doesn\'t allow using a recent PIN."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Password contains an illegal character."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Password must contain at least one letter."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Password must contain at least one digit."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Password must contain at least 1 letter."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Password must contain at least 1 lower-case letter."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Password must contain at least 1 upper-case letter."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Password must contain at least 1 numerical digit."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Password must contain at least 1 special symbol."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Password must contain at least 1 non-letter character."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"The device administrator doesn\'t allow using 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="lock_setup" msgid="1759001157415978959">"Setup complete"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Set up is complete."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Device administration"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"To pair with:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type 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_enter_pin_other_device" msgid="4637977124526813470">"You may also need to type this PIN on the other device."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"You may also need to type 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="2796550001376088433">"To pair with:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type on it:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, then press Return or Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g> because of an incorrect PIN or passkey."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Can\'t communicate with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Couldn\'t connect 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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Allow data exchange when the phone touches another device"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Allow data exchange when the tablet touches another device"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Allow data exchange when the phone touches another device"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Ready to transmit app content via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Off"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Unavailable because NFC is turned off"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam Browser pages, YouTube videos, People contacts and more."\n\n"Just bring the devices together (typically back to back) and then touch your screen. The app determines what gets beamed."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Network service discovery"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Allow apps on other devices to discover apps on this device"</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="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_setup_wizard_title" msgid="70277346338812325">"Select Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Can\'t scan for networks"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Network notification"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notify me when an open network is available"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Avoid poor connections"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Don\'t use a Wi-Fi network unless it has a good Internet connection"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Don\'t use a WiFi network unless it has a good Internet connection"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Keep Wi-Fi on during sleep"</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_wps_pbc" msgid="2668564692207863017">"WPS Push Button"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Entry"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Searching for WiFi networks..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Other network…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"More"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</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="8242979682530043184">"Type PIN from access point"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS setup"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Type 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_wps_setup_title" msgid="6034518116333042484">"Wi-Fi Protected Setup"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starting WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Press the WiFi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Enter PIN <xliff:g id="NUMBER">%1$s</xliff:g> on your Wi-Fi router. The setup may take up to two minutes to complete."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS succeeded. Connecting to the network…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Connected to the Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS is already in progress and can take up to two minutes to complete"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Request failed. Please try again in a few minutes."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"The wireless router security setting (WEP) is not supported"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"The wireless router security setting (TKIP) is not supported"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentication failure. Please try again."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Another WPS session was detected. Please try again in a few minutes."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Saved"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disabled"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Avoided poor Internet connection"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"The network was avoided due to poor connection. Turn off this behaviour from the Settings &gt; Wi-Fi screen, Advanced menu item."</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_wps_available_first_item" msgid="3538912605343585226">"Protected network available"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (protected network available)"</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_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Failed to forget network"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Failed to save network"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Another Wi-Fi protected session was detected. Try again 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Network prefix length"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Set up peer-to-peer connectivity"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Device information"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi protected setup"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Type 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_remove_group" msgid="4844634506540667517">"Remove group"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Advanced"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Available devices"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Search for devices"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Searching…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Rename device"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer devices"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Could not connect."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Failed to rename device."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Disconnect?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"If you disconnect, your connection with <xliff:g id="PEER_NAME">%1$s</xliff:g> will end."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"If you disconnect, your connection with <xliff:g id="PEER_NAME">%1$s</xliff:g> and <xliff:g id="PEER_COUNT">%2$s</xliff:g> other devices will end."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Configure Wi-Fi hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Set up 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="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Silent mode"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Music effects"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringer volume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrate and ring"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Default notification"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Mute ringtone &amp; notifications"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Mute music &amp; other media"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Mute notifications"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Mute alarms"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrate when ringing"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"You must dock the tablet before setting up dock audio."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"You must dock the phone before setting up dock audio."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"You need to dock the tablet before setting up dock audio."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"You need to dock the phone before setting up dock audio."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dock insertion sound"</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="account_settings" msgid="6403589284618783461">"Accounts"</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="7965901687241669598">"Display"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"My phone number"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"PRL Version"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -820,10 +848,10 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"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="7209547812233487345">"Erase all your personal information and downloaded apps? You can\'t reverse this action!"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"Erase all your personal information and downloaded apps? You cannot 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="2234954758550554549">"You must draw your unlock pattern to confirm a factory data reset."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"You need to draw your unlock pattern to confirm a factory data reset."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No reset was performed because the System Clear service isn\'t available."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Reset?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Erase USB storage"</string>
@@ -834,12 +862,12 @@
     <string name="media_format_desc" product="default" msgid="8764037252319942415">"Erase the SD card? You will lose "<b>"all"</b>" data on the card!"</string>
     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Erase USB storage"</string>
     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Erase SD card"</string>
-    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Erase the USB storage, deleting all files stored there? You can\'t reverse this action!"</string>
-    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Erase the SD card, deleting all files stored there? You can\'t reverse this action!"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Erase the USB storage, deleting all files stored there? You cannot reverse this action!"</string>
+    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Erase the SD card, deleting all files stored there? You cannot reverse this action!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Erase everything"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Draw your unlock pattern"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"You must draw your unlock pattern to confirm that you want to erase the USB storage."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"You need to draw your unlock pattern to confirm that you want to erase the USB storage."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"You need to 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="6688416425801386511">"USB tethering"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile networks"</string>
     <string name="location_title" msgid="1029961368397484576">"My Location"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google\'s location service"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Let apps use data from sources such as Wi-Fi and mobile networks to determine your approximate location"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Allow anonymous location data to be sent to Google. Also allow permitted apps to use data from sources such as 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>
@@ -887,7 +915,7 @@
     <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="settings_license_activity_title" msgid="7553683406244228650">"Open source licences"</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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Press Menu for help."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Release finger when done."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Connect at least <xliff:g id="NUMBER">%d</xliff:g> dots. Try again:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Pattern recorded!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Pattern recorded."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Draw pattern again to confirm:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Your new unlock pattern:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirm"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Next"</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="1075370160667458122">"Protect your tablet from unauthorised use by creating a personal screen unlock pattern. Slide 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="tablet" msgid="8616353869251700776">"Protect your tablet from unauthorised use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen. You need to connect at least four dots. "\n\n"Ready to start? Touch Next."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protect your phone from unauthorised use by creating a personal screen unlock pattern. Slide 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="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Manage apps, set up quick-launch shortcuts"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"App settings"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unknown sources"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Allow installation of non-Market apps"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Allow installation of apps from unknown sources"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Your tablet and personal data are more vulnerable to attack by apps 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 apps."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Your phone and personal data are more vulnerable to attack by apps 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 apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"App info"</string>
     <string name="storage_label" msgid="8700867073480107253">"Storage"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Launch by default"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Defaults"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Clear data"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Uninstall updates"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"You\'ve chosen to launch this app by default for some actions."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"You\'ve chosen to allow this app to create widgets and access their data."</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="1616155457673106022">"This app may not be designed for your screen. You can control how it adjusts to your screen here."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sort by size"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Show running services"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Show cached processes"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"This will reset all preferences for:"\n\n" "<li>"Disabled apps"</li>\n" "<li>"Disabled app notifications"</li>\n" "<li>"Default applications for actions"</li>\n" "<li>"Background data restrictions for apps"</li>\n\n" You will not lose any app data."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Reset apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Choose filter options"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"This app can access the following on your tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"This app 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="invalid_size_value" msgid="7563537715280712285">"Couldn\'t compute the package size."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"You don\'t have any third-party apps 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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Change the preferred installation location for new applications."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disable built-in app?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"If you disable a built-in app, other apps may misbehave."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Turn off notifications"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"If you turn off notifications for this app, you may miss important alerts and updates."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Storage use"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"View storage used by apps"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Running services"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"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 app <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Use this input method?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"This spell checker may be able to collect all the text that you type, including personal data like passwords and credit card numbers. It comes from the app <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Use this spell checker?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Settings"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Language"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Failed to open settings for <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/track pad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Pointer speed"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Game Controller"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Use vibrator"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirect vibrator to game controller when connected."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Choose keyboard layout"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Set up keyboard layouts"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"To switch, press Control-Spacebar"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Keyboard layouts"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"User dictionary"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personal dictionary"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personal 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_add_screen_title" msgid="742580720124344291">"Phrase"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"More options"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Fewer options"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Word:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Shortcut:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Language:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"For all languages"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"More languages…"</string>
     <string name="testing" msgid="6584352735303604146">"Testing"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet information"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Phone information"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Set options for app 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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Development device ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Device information not available"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Stay awake"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Allow development settings?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"These settings are intended for development use only. They can cause your device and the applications on it to break or misbehave."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protect USB storage"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps must request permission to read USB storage"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protect USB storage?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"When USB storage is protected, apps must request permission to read data from external storage."\n\n"Some apps may not work until updated by their developers."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protect SD card"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps must request permission to read SD card"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protect SD card?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"When SD card is protected, apps must request permission to read data from external storage."\n\n"Some apps may not work until updated by their developers."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Choose gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Choose widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Create widget and allow access?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"After you create the widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> can access all the data that it displays."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Always allow <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> to create widgets and access their data"</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>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Speak passwords"</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="3264723681038625967">"Install web scripts"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Enhance web accessibility"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No services installed"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Need a screen reader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack provides spoken feedback to help blind and low-vision users. Do you want to install it for free from Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Install web scripts?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Do you want apps to install scripts from Google that make their web content more accessible?"</string>
-    <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="1072730037861494125">"No description provided."</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_not_available" msgid="3214000535532434353">"Battery usage data isn\'t available."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1240,7 +1301,7 @@
     <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_sugg_radio" msgid="8211336978326295047">"Switch to aeroplane 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>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Reduce the screen brightness and/or screen timeout"</string>
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Battery used by WiFi"</string>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"The engine you have chosen can\'t run."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configure"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Choose another engine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"This speech synthesis engine may be able to collect all the text that will be spoken, including personal data like passwords and credit card numbers. It comes from the <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Enable the use of this speech synthesis engine?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Female"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Enable a 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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Draw your unlock pattern"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"You need to draw your unlock pattern to confirm credential installation."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Type the password for credential storage."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Credential storage has been erased."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Credential storage couldn\'t be erased."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Credential storage is enabled."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"You must set a lock screen PIN or password before you can use credential storage."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"You need to set a lock screen PIN or password before you can use credential storage."</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="5446972770562918934">"Backup &amp; reset"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed up settings and data"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop backup password"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Desktop full backups aren\'t 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="local_backup_password_summary_none" msgid="393503434408227110">"Desktop full backups aren\'t currently protected"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Touch to change or remove the password for desktop full backups"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Stop backing up your Wi-Fi passwords, bookmarks, other settings and app data, plus erase all copies on Google servers?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Device administration settings"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"This administrator is active and allows the app <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_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="6047518536574673606">"System"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Call ringtone &amp; vibrate"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Connecting to Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Sync failed"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sync active"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Sync"</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="background_data" msgid="5779592891375473817">"Background data"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Last synced <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Syncing now…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" "\n"A Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"App 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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"This account is required by some apps. You can only remove it by resetting the tablet to factory defaults (which deletes all your personal data) in Settings &gt; Backup &amp; reset."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"This account is required by some apps. You can only remove it by resetting the phone to factory defaults (which deletes all of your personal data) in Settings &gt; Backup &amp; reset."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G settings"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="4131758584074246224">"Type password to decrypt storage"</string>
     <string name="try_again" msgid="4272075051293936921">"Try again."</string>
-    <string name="service_busy" msgid="2325014135156127705">"The service is busy. Try again."</string>
     <string name="delete" msgid="4219243412325163003">"Delete"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Debugging"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Select debug app"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"No debug application set"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Debugging application: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Select application"</string>
+    <string name="no_application" msgid="2813387563129153880">"Nothing"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Wait for debugger"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Debugged application waits for debugger to attach before executing"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Drawing"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitoring"</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_screen_updates" msgid="5470814345876056420">"Show surface updates"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash entire window surfaces when they update"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Show GPU view updates"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash views inside windows when drawn with the GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Disable HW overlays"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Enable tracing"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Select enabled traces"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"No traces currently enabled"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traces currently enabled"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"All traces currently enabled"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Show layout bounds"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Show clip bounds, margins, etc."</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="force_hw_ui" msgid="6426383462520888732">"Force GPU rendering"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Use 2D hardware acceleration in applications"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Force use of GPU for 2d drawing"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profile GPU rendering"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Measure rendering time in adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Animator duration scale"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobile hotspots"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Auto-sync data"</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="8621855507876539282">"No apps 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_disclaimer" product="tablet" msgid="2591250607795265503">"Measured by your tablet. Your operator\'s data usage accounting may differ."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Measured by your phone. Your operator\'s data usage accounting may differ."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"restricted"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Disable mobile data?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Set mobile data limit"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Set 4G data limit"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobile"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"View app settings"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restrict background data"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Disable background data on mobile data network only. Wi-Fi will be used, if available."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Disable background data on mobile networks. Non-mobile networks will be used if available."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"To restrict background data for this app, first set a mobile data limit."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restrict background data?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"This feature may cause an app that depends on background data to stop working when Wi-Fi isn\'t available."\n\n"You can find more appropriate data usage controls in the settings available within the app."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"This feature may cause an app that depends on background data to stop working when only mobile networks are available."\n\n"You can find more appropriate data usage controls in the settings available within the app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Restricting background data is possible only when you\'ve set a mobile data limit."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Turn auto-sync data on?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Any changes you make to your accounts on the web will be automatically copied to your tablet."\n\n"Some accounts may also automatically copy any changes you make on the tablet to the web. A Google Account works this way."\n\n"To choose which kinds of information to sync within each account, go to Settings &gt; Accounts."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Any changes you make to your accounts on the web will be automatically copied to your phone."\n\n"Some accounts may also automatically copy any changes you make on the phone to the web. A Google Account works this way."\n\n"To choose which kinds of information to sync within each account, go to Settings &gt; Accounts."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Turn auto-sync data off?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"This will conserve data and battery usage, but you\'ll need to sync each account manually to collect recent information. And you won\'t receive notifications when updates occur."</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_warning_editor_title" msgid="3704136912240060339">"Set data usage warning"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Set data usage limit"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limiting data usage"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Your <xliff:g id="NETWORKS">%1$s</xliff:g> data connection will be disabled when the specified limit is reached."\n\n"Since data usage is measured by your tablet and your carrier may account for usage differently, consider using a conservative limit."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Your <xliff:g id="NETWORKS">%1$s</xliff:g> data connection will be disabled when the specified limit is reached."\n\n"Since data usage is measured by your phone and your carrier may account for usage differently, consider using a conservative limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Your mobile data connection will be disabled when the specified limit is reached."\n\n"Since data usage is measured by your tablet, and your carrier may account for usage differently, consider using a conservative limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Your mobile data connection will be disabled when the specified limit is reached."\n\n"Since data usage is measured by your phone, and your carrier may account for usage differently, consider using a conservative limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restrict background data?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: about <xliff:g id="TOTAL">%1$s</xliff:g> used"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: about <xliff:g id="TOTAL">%1$s</xliff:g> used."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: about <xliff:g id="TOTAL">%1$s</xliff:g> used, as measured by your tablet. Your carrier\'s data usage accounting may differ."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: about <xliff:g id="TOTAL">%1$s</xliff:g> used, as measured by your phone. Your carrier\'s data usage accounting may differ."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobile hotspots"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Select the WiFi networks which are mobile hotspots. Apps can be restricted from using these networks when in the background. Apps may also warn before using these networks for large downloads."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobile networks"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WiFi networks"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"To select mobile hotspots, turn WiFi on."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Edit VPN profile"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Connect to <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Add VPN profile"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Edit profile"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Delete profile"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"There is no network connection. Please try again later."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"A certificate is missing. Please edit the profile."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"After you\'ve turned on Explore by Touch, you can touch the screen to learn what\'s under your finger. For example, the current screen contains app 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="3973201880357468747">"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="8764686624055084454">"To scroll through a list, you can slide two fingers along the screen. For example, the current screen contains a list of app 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="3055831259260848004">"You have completed the tutorial. To exit, find and touch the <xliff:g id="FINISH">%s</xliff:g> button."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Spelling correction"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Spell checker"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Type your current full backup password here"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Type a new password for full backups here"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Retype your new full backup password here"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Additional system updates"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Users &amp; restrictions"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Users"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Edit details"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"User information"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Name"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Content restrictions"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Require PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Content rating"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"System app"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installed apps"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Discard"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Remove user"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Remove user?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Are you sure you want to remove the user and all associated data from the device?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Show notifications"</string>
+    <string name="help_label" msgid="1107174367904110532">"Help"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 54b97ab..7ab6588 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Desconectando…"</item>
     <item msgid="1634960474403853625">"Desconectado"</item>
     <item msgid="746097431216080650">"Incorrecto"</item>
+    <item msgid="6367044185730295334">"Bloqueada"</item>
+    <item msgid="503942654197908005">"Desactivando mala conexión  temporalmente"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Desconectando de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Desconectado"</item>
     <item msgid="8578370891960825148">"Incorrecto"</item>
+    <item msgid="5660739516542454527">"Bloqueada"</item>
+    <item msgid="1805837518286731242">"Desactivando mala conexión  temporalmente"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Presionar botón"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ninguno"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN del punto de acceso"</item>
-    <item msgid="7364462169350112617">"PIN de este dispositivo"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Estático"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Tarjeta SD desmontable"</item>
     <item msgid="4498124044785815005">"Dejar que el sistema decida"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Desactivado"</item>
-    <item msgid="4804571292609523335">"Vibrar"</item>
-    <item msgid="595707141547423573">"Silenciar"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
     <item msgid="2560532955514699713">"Medio"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Escala de animación 5x"</item>
     <item msgid="6660750935954853365">"Escala de animación 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animación desactivada"</item>
+    <item msgid="1138649021950863198">"Escala de animación .5x"</item>
+    <item msgid="4394388961370833040">"Escala de animación 1x"</item>
+    <item msgid="8125427921655194973">"Escala de animación 1.5x"</item>
+    <item msgid="3334024790739189573">"Escala de animación 2x"</item>
+    <item msgid="3170120558236848008">"Escala de animación 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 31df4e9..f5740bc 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
+    <string name="create" msgid="3578857613172647409">"Crear"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir el uso de Bluetooth del dispositivo cuando la pantalla esté bloqueada."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nombre del dispositivo"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Configuración del dispositivo"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Configuración del perfil"</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_rename_device" product="tablet" msgid="787970073150631155">"Cambiar el nombre de tableta"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Vinculando..."</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="5655704645616731277">"Tocar para sincronizar"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"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="1931617700075106801">"Toca para sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toca para realizar una sincronización 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="device_picker" msgid="8398232791303186677">"Selector de dispositivos Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Una aplicación desea activar el Bluetooth. ¿Lo permites?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Una aplicación de tu tableta desea hacerla visible para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Lo permites?"</string>
@@ -148,14 +150,14 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Una aplicación en tu dispositivo desea activar Bluetooth y hacer que tu dispositivo sea visible para otros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Lo permites?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Una aplicación de tu tableta desea activar Bluetooth y hacer visible tu tableta para otros dispositivos. ¿Lo permites?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Una aplicación en tu dispositivo desea activar Bluetooth y hacer que tu dispositivo sea visible para otros dispositivos. ¿Lo permites?"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"¿Activar Bluetooth?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"¿Desactivar Bluetooth?"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"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="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%1$s desea acceder a tus contactos y a tu historial de llamadas. ¿Deseas darle 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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Aceptar"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"El nombre del host que has escrito no es válido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"La lista de exclusión que escribiste no está debidamente formateada. Escribe 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_port" msgid="5539106187558215246">"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="2671425042711054494">"El puerto que has escrito no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador usa el proxy HTTP pero tal vez las demás aplicaciones no lo usen."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Establecer"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Incorrecto"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Correcto"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Los cambios se aplican cuando se vuelve a conectar el cable USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Los cambios entran en vigencia cuando se vuelve a conectar el cable USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activar el espacio de almacenamiento masivo USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total de bytes:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Almacenamiento USB no montado"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"No hay tarjeta SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Almacenamiento USB desactivado"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Sin tarjeta SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponibles:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"El almacenamiento USB se utiliza como dispositivo de almacenamiento masivo"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La tarjeta SD se utiliza como dispositivo de almacenamiento masivo"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Es seguro extraer USB."</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Ahora es seguro extraer la tarjeta SD."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB como almacenamiento masivo"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"La tarjeta SD se usa como dispositivo de almacenamiento masivo."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Puedes extraer el almac. USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Ya puedes extraer la tarjeta SD."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"¡El almacenamiento USB se extrajo mientras se encontraba en uso!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"¡Se ha extraído la tarjeta SD mientras se encontraba en uso!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes utilizados:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Explorando almacenamiento USB para obtener medios..."</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB en modo de solo lectura"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"La tarjeta SD se activó como un dispositivo de solo lectura."</string>
     <string name="skip_label" msgid="47510779345218297">"Omitir"</string>
     <string name="next_label" msgid="4693520878012668114">"Siguiente"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Idioma"</string>
@@ -255,7 +257,7 @@
     <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_label_launcher" msgid="8344735489639482340">"Configuración"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Configuración"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo de avión"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Más..."</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Conectar a servicios de datos en roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Has perdido la conectividad de los datos porque has dejado la red doméstica con roaming de datos desactivado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Enciéndelo"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"¿Deseas permitir el roaming de datos? Ten en cuenta que podrás incurrir en gastos significativos."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Atención"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Al permitir el roaming de datos, puedes incurrir en gastos de roaming importantes."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"¿Deseas permitir el roaming de datos?"</string>
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Elige un operador de red"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Fecha y hora"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Establecer la hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar zona horaria"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Establecer fecha"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Formato de fecha"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Elegir el 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="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Mejorar el reconocimiento facial"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Reconocimiento facial"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Solicitar parpadeo"</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>
@@ -306,26 +310,27 @@
     <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 dispositivo cada vez que lo enciendes"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"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 desencriptarla cada vez que la enciendas: no puedes desencriptar tu tableta salvo que restablezcas los datos 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 tus datos total o parcialmente."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Puedes encriptar tus cuentas, configuración, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Cuando encriptas tu dispositivo, debes ingresar un PIN numérico o una contraseña para descifrarlo cada vez que lo enciendas: no puedes desencriptarlo salvo que restablezcas los datos 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 dispositivo enchufado hasta que se complete la encriptación. Si interrumpes el proceso de encriptación, perderás tus datos total o parcialmente"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, medios, parámetros de configuración, las aplicaciones que descargaste y sus datos y otros archivos. Luego de encriptar tu tableta, tienes que escribir un PIN o contraseña numéricos cada vez que la enciendes para desencriptarla. No puedes desencriptar tu tableta a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos."\n\n"La encriptación demora al menos una hora. La batería debe estar cargada y tu tableta debe permanecer enchufada hasta que la encriptación se complete. Si interrumpes el proceso de encriptación, perderás algunos o todos tus datos."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puedes encriptar tus cuentas, medios, parámetros de configuración, las aplicaciones que descargaste y sus datos y otros archivos. Luego de encriptar tu dispositivo, tienes que escribir un PIN o contraseña numéricos cada vez que lo enciendes para desencriptarlo. No puedes desencriptar tu dispositivo a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos."\n\n"La encriptación demora al menos una hora. La batería debe estar cargada y tu dispositivo debe permanecer enchufado hasta que la encriptación se complete. Si interrumpes el proceso de encriptación, perderás algunos 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 dispositivo"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga tu batería e inténtalo nuevamente."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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 dispositivo? 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 dispositivo se encenderá varias veces."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"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="5100339496381875522">"¿Deseas encriptar el dispositivo?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, la tableta se reiniciará varias veces."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, el dispositivo se reiniciará varias veces."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptando"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Espera mientras se encripta tu tableta. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Espera mientras se encripta tu dispositivo. <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="2223340178473871064">"Escribe 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="6891198717505120682">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tableta. "\n\n" Para reanudar el uso de tu tableta, debes restablecer los datos de fábrica. Cuando configures tu tableta luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu dispositivo. "\n\n" Para reanudar el uso de tu dispositivo, debes restablecer los datos de fábrica. Cuando configures tu dispositivo luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Elegir bloqueo pant."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tableta. "\n\n" Para reanudar el uso de tu tableta, debes restablecer los datos de fábrica. Cuando configures tu tableta luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu dispositivo. "\n\n"Para reanudar el uso de tu dispositivo, debes restablecer los datos de fábrica. Cuando configures tu dispositivo luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar método de introducción"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir bloqueo pant."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</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>
@@ -348,9 +353,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Activar seguridad"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueo facial"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Patrón"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe tener al menos %d caracteres."</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"El PIN debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"El PIN debe tener dígitos entre el 0 y el 9 únicamente."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"El administrador del dispositivo no permite el uso de un PIN utilizado recientemente."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"La contraseña posee un carácter no permitido."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"La contraseña debe tener al menos una letra."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"La contraseña debe tener al menos un dígito."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"La contraseña debe tener 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>
+    <item quantity="one" msgid="3063853802158131458">"La contraseña debe tener al menos una letra."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"La contraseña debe tener al menos una letra minúscula."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"La contraseña debe tener al menos una letra mayúscula."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"La contraseña debe tener al menos un dígito numérico."</item>
+    <item quantity="other" msgid="4703982391407595924">"La contraseña debe tener al menos %d dígitos numéricos."</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>
+    <item quantity="one" msgid="8456579939292408631">"La contraseña debe tener al menos un símbolo especial."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"La contraseña debe tener al menos un carácter que no sea una letra."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"El administrador del dispositivo no permite el uso de una contraseña utilizada recientemente."</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="lock_setup" msgid="1759001157415978959">"Configuración completa"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Se completó la configuración."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administración del 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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Para sincronizar con:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe la clave de acceso requerida 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_enter_pin_other_device" msgid="4637977124526813470">"Puede que también tengas que escribir este PIN en el otro dispositivo."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Puede que también tengas que escribir esta clave de acceso en 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="2796550001376088433">"Para sincronizar con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe allí:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> y luego presiona Volver o Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No se pudo sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> debido a que el PIN o la clave de acceso son incorrectos."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"No se puede establecer la comunicación con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"No se pudo 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">"Búsqueda de dispositivos"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Buscando..."</string>
@@ -440,7 +445,7 @@
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"Para ver los dispositivos, activa Bluetooth."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar a..."</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimedia"</string>
     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio del dispositivo"</string>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Permitir el intercambio de datos cuando el dispositivo toque otro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir el intercambio de datos cuando la tableta entre en contacto con otro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el dispositivo toque otro dispositivo"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Listo para transmitir el contenido de la aplicación a través de NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivada"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible porque NFC está desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Cuando esta función está activada, puedes transmitir el contenido de las aplicaciones a otro dispositivo con la función NFC al juntar los dispositivos. Por ejemplo, puedes transmitir páginas del navegador, videos de YouTube, contactos y mucho más."\n\n"Solo tienes que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, tocar la pantalla de tu dispositivo. La aplicación determina el contenido que se transmite."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detección del servicio de red"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir a las aplicaciones de otros dispositivos ver las de este"</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="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_setup_wizard_title" msgid="70277346338812325">"Seleccionar Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"No se pueden buscar las redes."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificación de red"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notificarme cuando se encuentre disponible una red abierta"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Mala conexión inhabilitada"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"No usar una red Wi-Fi a menos que cuente con una buena conexión a Internet"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar malas conexiones"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"No usar una red Wi-Fi a menos que cuente con una buena conexión a Internet"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Mantener Wi-Fi durante la suspensión"</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_wps_pbc" msgid="2668564692207863017">"Pulsador WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Ingreso PIN WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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">"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_empty_list_wifi_off" msgid="4722299515264875943">"Para ver las redes disponibles, activa Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Buscando redes Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</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="8242979682530043184">"Escribe el PIN del punto de acceso"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Configuración del WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Escribe 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_wps_setup_title" msgid="6034518116333042484">"Configuración Wi-Fi protegida"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando la WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pulsa el botón Configuración Wi-Fi protegida del router. Es posible que se denomine \"WPS\" o que incluya este símbolo:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Ingresa el PIN <xliff:g id="NUMBER">%1$s</xliff:g> en tu enrutador Wi-Fi. La configuración puede demorar hasta dos minutos en completarse."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"La WPS se inició correctamente. Estableciendo conexión con la red…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Se estableció conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configuración de WPS está en curso y puede demorar hasta dos minutos en completarse."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"No se pudo iniciar la WPS. Vuelve a intentarlo en unos minutos."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"No se admite la configuración de la seguridad del enrutador inalámbrico (WEP)."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"No se admite la configuración de seguridad del enrutador inalámbrico (TKIP)."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Se produjo un error al realizar la autenticación. Vuelve a intentarlo."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Se detectó otra sesión WPS. Vuelve a intentarlo en unos minutos."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Red SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Potencia de la señal"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitadas"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mala conexión inhabilitada"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Se inhabilitó la red debido a una mala conexión. Ve a la pantalla Configuración &gt; Wi-Fi del menú Avanzadas."</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_wps_available_first_item" msgid="3538912605343585226">"Red protegida disponible"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (red protegida disponible)"</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_failed_connect_message" msgid="8491902558970292871">"No se pudo establecer conexión con la red."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"No se pudo borrar la red."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"No se pudo guardar la red."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Se detectó otra 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Acceso"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefijo de red"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Configurar conectividad entre pares"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Información del dispositivo"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Configuración Wi-Fi protegida (WPS)"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Escribir 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_remove_group" msgid="4844634506540667517">"Eliminar un grupo"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avanzado"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Dispositivos disponibles"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Buscar dispositivos"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Buscando…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Cambiar el nombre del dispositivo"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Otros dispositivos"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"No se pudo establecer conexión."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Error al cambiar nombre del dispositivo"</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"¿Deseas desconectarte?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Si te desconectas, tu conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g> finalizará."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Si te desconectas, tu conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g> y con otros <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispositivos finalizará."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para conectarte con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona Wi-Fi portátil de <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error en la zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Configurar zona Wi-Fi portátil"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurar la zona Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">" Zona 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="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencioso"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono de llamada"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos de la música"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencioso"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrar y sonar"</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="incoming_call_volume_title" msgid="8073714801365904099">"Tono de llamada"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Silenciar tono y notificaciones"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Silenciar música y otros archivos multimedia"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Silenciar notificaciones"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Silenciar alarmas"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar al sonar"</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>
@@ -623,14 +651,15 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"El dispositivo 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" product="tablet" msgid="9015625921245904495">"Debes acoplar la tableta antes de configurar el audio del conector."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Debes acoplar el dispositivo antes de configurar el audio del conector."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Debes acoplar la tableta antes de configurar el audio del conector."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Debes acoplar el dispositivo antes de configurar el audio del conector."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sonido al insertar el conector"</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 dispositivo 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 dispositivo de la base."</string>
-    <string name="sync_settings" msgid="9186125469300013491">"Cuentas y sincronización"</string>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <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="7965901687241669598">"Pantalla"</string>
@@ -702,7 +731,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mi número de teléfono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Versión de PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -806,9 +835,9 @@
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se ha restablecido la configuración predeterminada de APN."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer valores de fábrica"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos del tablet"</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos de la tableta"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borra todos los datos del dispositivo"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tableta, por ejemplo:"\n\n<li>"tu cuenta de Google,"</li>\n<li>"los datos y la configuración del sistema y la aplicación,"</li>\n<li>"las aplicaciones descargadas"</li>"."</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tableta, por ejemplo:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de las aplicaciones"</li>\n<li>"las aplicaciones descargadas"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del dispositivo, por ejemplo:"\n\n<li>"tu cuenta de Google,"</li>\n<li>"datos de aplicaciones y ajustes del sistema,"</li>\n<li>"las 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>
@@ -818,12 +847,12 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Eliminar la tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Borra todos los datos del almacenamiento USB, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos los datos de la tarjeta SD, como música o fotos."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tablet"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer la tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer dispositivo"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Deseas eliminar toda tu información personal y aplicaciones descargadas? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Eliminar todo"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Extrae tu patrón de desbloqueo"</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_gesture_explanation" msgid="826193821455182780">"Debes crear tu patrón de desbloqueo para confirmar que quieres restablecer los datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No se realizó ningún restablecimiento debido a que el servicio \"Eliminar sistema\" no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Eliminar almacenamiento USB"</string>
@@ -838,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"¿Deseas borrar la tarjeta SD y todos los archivos almacenados allí? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Eliminar todo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Extrae tu patrón de desbloqueo"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar el almacenamiento USB"</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar el almacenamiento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Debes crear tu patrón de desbloqueo para confirmar que deseas borrar 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="6688416425801386511">"Anclaje a red USB"</string>
@@ -862,7 +891,7 @@
     <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 dispositivo 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 conex. a Internet de dispositivo"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"No compartir conexión a Internet del dispositivo"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"No anclado a red"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"No se puede anclar a red a 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>
@@ -870,14 +899,14 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Servicio ubicación de Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Permite que las aplicaciones usen datos de fuentes como redes Wi-Fi y móviles para establecer tu ubicación aproximada."</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Permite que los datos anónimos de ubicación se envíen a Google. Permite también que las aplicaciones utilicen datos de fuentes como Wi-Fi y redes móviles 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="use_location_title" msgid="5206937465504979977">"Localización y búsqueda de Google"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"Búsqueda de Google y ubicación"</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 dispositivo"</string>
@@ -911,12 +940,12 @@
     <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>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Inténtalo de nuevo:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Extraer un patrón de desbloqueo"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dibuja un patrón de desbloqueo"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Presiona Menú para obtener ayuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Levanta el dedo cuando termines."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conectar al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Vuelve a intentarlo."</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"¡Patrón grabado!"</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Extrae el patrón nuevamente para confirmar:"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conecta al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Vuelve a intentarlo."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Se grabó el patrón."</string>
+    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Dibuja el patrón nuevamente para confirmar:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Tu nuevo patrón de desbloqueo:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmar"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Revisar"</string>
@@ -937,7 +966,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</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 dispositivo"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Protege tu tableta contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Usa el dedo para unir los puntos en cualquier orden en la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protege tu tableta contra usos no autorizados al crear un patrón de desbloqueo de pantalla personal. Usa el dedo para unir en cualquier orden los puntos de la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protege tu dispositivo contra el uso no autorizado creando un patrón de desbloqueo de pantalla personal. Usa el 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="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
@@ -945,7 +974,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrar aplicaciones, configurar accesos directos de inicio rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuración de aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fuentes desconocidas"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Permitir instalar aplicaciones que no estén en Android Market."</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Permitir la instalación de aplicaciones provenientes de fuentes desconocidas"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tu tableta y datos personales son más vulnerables a los ataques de aplicaciones de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño a tu tableta o pérdida de datos que puedan producirse por el uso de estas aplicaciones."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Tu dispositivo y datos personales son más vulnerables a los ataques de aplicaciones de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño a tu dispositivo o pérdida de datos que pueda producirse por el uso de estas aplicaciones."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
@@ -953,6 +982,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Información de la 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="auto_launch_label_generic" msgid="3230569852551968694">"Valores predeterminados"</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>
@@ -972,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Eliminar datos"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Desinstalar las actualizaciones"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Has elegido lanzar esta aplicación de manera predeterminada para algunas acciones."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Decidiste permitir que esta aplicación pueda crear widgets y acceder a sus datos."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No hay configuraciones predeterminadas establecidas."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Eliminar configuraciones predeterminadas"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"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>
@@ -982,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar los servicios en ejecución"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos almacenados en la memoria caché"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablec. preferencias?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Se restablecerán las preferencias de:"\n\n" "<li>"aplicaciones desactivadas,"</li>\n" "<li>"notificaciones de aplicaciones desactivadas,"</li>\n" "<li>"aplicaciones predeterminadas para diferentes acciones,"</li>\n" "<li>"restricciones de datos de referencia para las aplicaciones."</li>\n\n" No perderás los datos de ninguna aplicación."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar el espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Elegir opciones de filtro"</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicación puede acceder a los siguientes elementos de tu tableta:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Esta aplicación puede acceder a los siguientes elementos del dispositivo:"</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="invalid_size_value" msgid="7563537715280712285">"No se pudo calcular el tamaño del paquete."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Cambiar la ubicación de instalación preferida para nuevas aplicaciones"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"¿Inhabilitar aplic. incorp.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Si inhabilitas una aplicación incorporada, otras aplicaciones podrían funcionar incorrectamente."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"¿Desactivar notificaciones?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactivas las notificaciones de esta aplicación, es posible que no recibas actualizaciones y alertas importantes."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso del almacenamiento"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ver el almacenamiento que usan las aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -1056,7 +1093,7 @@
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Servicios"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Procesos"</string>
     <string name="service_stop" msgid="6369807553277527248">"Detener"</string>
-    <string name="service_manage" msgid="1876642087421959194">"Config."</string>
+    <string name="service_manage" msgid="1876642087421959194">"Configuración"</string>
     <string name="service_stop_description" msgid="9146619928198961643">"Servicio iniciado por su aplicación. Si se detiene, se puede producir un error en la aplicación."</string>
     <string name="heavy_weight_stop_description" msgid="2979218727598321095">"Esta aplicación no puede detenerse de forma segura. Si la detienes, puedes perder parte de tu trabajo actual."</string>
     <string name="background_process_stop_description" msgid="5034773197139654588">"Es un proceso de aplicación anterior que aún se ejecuta en caso de que sea necesario nuevamente. En general, no hay razón para detenerlo."</string>
@@ -1082,21 +1119,40 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Presionar la tecla de espacio dos veces para insertar \".\""</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="4135828934735934248">"El método de introducción 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 introducción de texto?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"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>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Este corrector ortográfico 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="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas usar este corrector ortográfico?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuración"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Se produjo un error al abrir la configuración de <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>."</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidad del puntero"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de juegos"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibración"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redireccionar la vibración al controlador de juegos cuando se haya establecido una conexión"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Elegir el diseño de teclado"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configurar diseños de teclado"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para cambiar, presiona Ctrl+espacio."</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminado"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Diseños de teclado"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionario personal"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionarios personales"</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_add_screen_title" msgid="742580720124344291">"Frase"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Más opciones"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Menos opciones"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"Aceptar"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Palabra:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Acceso directo:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Idioma:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Para todos los idiomas"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Más idiomas..."</string>
     <string name="testing" msgid="6584352735303604146">"Probando"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Información del tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Información del dispositivo"</string>
@@ -1119,7 +1175,7 @@
     <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="1317429869771850228">"Configurar métodos de introducción"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"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>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID del dispositivo de desarrollo"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"La información del dispositivo no está disponible."</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer activo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca quedará inactiva mientras se realiza la carga"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir ubic. de prueba"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubic. de prueba"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración de USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"La depuración USB solo está indicada para actividades de desarrollo. Úsala para copiar datos entre tu computadora y el dispositivo, para instalar aplicaciones en el dispositivo sin recibir notificaciones y para leer datos de registro."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"¿Permitir configuración de desarrollo?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Estos parámetros de configuración están destinados únicamente a los programadores. Pueden hacer que el dispositivo o sus aplicaciones no funcionen correctamente."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger almacenamiento USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Las aplicaciones deben pedir permiso para leer el USB."</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"¿Proteger almacenamiento USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Cuando el almacenamiento USB está protegido, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger tarjeta SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Las aplicaciones deben pedir permiso para leer la tarjeta SD."</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"¿Proteger tarjeta SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Elegir gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Elegir control"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"¿Deseas crear el widget y permitir el acceso?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Después de crear el widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> podrá acceder a todos los datos que muestre."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permitir siempre que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> pueda crear widgets y acceder a sus datos"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>días <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>min <xliff:g id="SECONDS">%4$d</xliff:g>seg"</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>min <xliff:g id="SECONDS">%3$d</xliff:g>seg"</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> seg"</string>
@@ -1160,12 +1227,9 @@
     <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 activado finaliza la llamada."</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Decir contraseñas"</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="3264723681038625967">"Instalar sec. de comandos web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Mejorar accesibilidad web"</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>
@@ -1176,18 +1240,16 @@
     <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> puede recopilar todo el texto que ingresas, a excepción de las contraseñas. Esto incluye datos personales como números de tarjetas de crédito. También puede recopilar datos acerca de tu interacción con la tableta."</string>
     <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> puede recopilar todo el texto que ingresas, a excepción de las contraseñas. Esto incluye datos personales como números de tarjetas de crédito. También puede recopilar datos acerca de tu interacción con el dispositivo."</string>
     <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"¿Deseas detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Si tocas ACEPTAR, se detendrá <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Si tocas Aceptar, se detendrá <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No se instaló ningún servicio."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"¿Necesitas un lector de pantalla?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack permite que los usuarios con baja visión y no videntes oigan en voz alta las acciones que realizan. ¿Deseas instalarlo gratis desde Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"¿Deseas instalar secuencias de comandos web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"¿Deseas que las aplicaciones instalen los scripts de Google que mejoran el acceso al contenido web de estas?"</string>
-    <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="1072730037861494125">"No se proporcionó ninguna descripción."</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_not_available" msgid="3214000535532434353">"Sin datos de uso de batería"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1347,7 @@
     <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_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" msgid="3305141107104670703">"No se puede ejecutar el motor que elegiste."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Elegir otro motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Es posible que este motor de síntesis de voz pueda recopilar todo el texto que se hablará, incluidos los datos personales como las contraseñas y los números de tarjetas de crédito. Proviene del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. ¿Deseas activar el uso de este motor de síntesis de voz?"</string>
@@ -1301,7 +1363,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Femenino"</string>
     <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">"Activar nuevo motor antes de usar"</string>
+    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Habilita el motor para usarlo."</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>
@@ -1318,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Crea tu patrón de desbloqueo."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes crear tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escribe la contraseña para el almacenamiento de credenciales."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"El almacenamiento de credenciales se ha borrado."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Imposible borrar almac credenc"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"El almacenamiento de credenciales está activado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Debes establecer un PIN o contraseña de la pantalla de bloqueo antes de usar el almacenamiento de credenciales."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Debes establecer un PIN o contraseña de la pantalla de bloqueo antes de usar el almacenamiento de credenciales."</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="5446972770562918934">"Copia de seguridad y restablecer"</string>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurar automáticamente"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Al reinstalar se restablece la configuración 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="4780151366296088113">"Las copias de seguridad completas de escritorio no están 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="local_backup_password_summary_none" msgid="393503434408227110">"En este momento, las copias de seguridad completas de tu escritorio no se encuentran protegidas."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca para cambiar o eliminar la contraseña de las copias de seguridad completas de tu escritorio."</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"¿Deseas dejar de crear copias de seguridad de tus contraseñas Wi-Fi, de tus marcadores, de otros parámetros de configuración y de datos de distintas aplicaciones, y eliminar 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>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Sistema"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Vibración y tono de llamada"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Conectándose a la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1457,10 @@
     <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_failed" msgid="1696499856374109647">"Error de sincronización"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sincronización activada"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <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="background_data" msgid="5779592891375473817">"Datos de fondo"</string>
@@ -1404,6 +1471,10 @@
     <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>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <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>
@@ -1411,9 +1482,9 @@
     <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_calendar" msgid="9056527206714733735">"Calendar"</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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync"</font>"  "\n"Con este software de Google, puedes sincronizar tus datos y acceder a tus contactos, citas y más desde cualquier lugar."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Conf. de sincronización de aplicación"</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>
@@ -1427,7 +1498,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Esta cuenta se requiere en algunas aplicaciones. Solo puedes eliminarla si restableces los valores predeterminados de fábrica de la tableta (esta acción borra todos tus datos personales). Para ello, accede a Configuración &gt; Hacer copia de seguridad y restablecer."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Algunas aplicaciones requieren esta cuenta. Solo puedes eliminarla si restableces el dispositivo a los valores predeterminados de fábrica (esta acción elimina todos tus datos personales). Para ello, accede a Configuración &gt; Hacer copia de seguridad y restablecer."</string>
     <string name="provider_label" msgid="7724593781904508866">"Suscripciones de inserción"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"Sincronizar <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"No se puede sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento actualmente está desactivada. Para cambiar tu configuración, activa momentáneamente los datos de referencia y la sincronización automática."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Configuración de 4G"</string>
@@ -1435,7 +1507,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC de 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Escribe la contraseña para desencriptar el almacenamiento"</string>
     <string name="try_again" msgid="4272075051293936921">"Inténtalo de nuevo."</string>
-    <string name="service_busy" msgid="2325014135156127705">"El servicio está ocupado. Inténtalo de nuevo."</string>
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6720680815969643497">"Archivos variados"</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>
@@ -1443,21 +1514,46 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Depuración"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Seleccionar la aplicación de depuración"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"No se configuró ninguna aplicación de depuración."</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplicación de depuración: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Seleccionar la aplicación"</string>
+    <string name="no_application" msgid="2813387563129153880">"Ninguna"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Aguarda a que el depurador se una al proceso."</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"La aplic. aguarda el depurador para ejecutarse."</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Entrada"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Dibujo"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitoreo"</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 conversación 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_screen_updates" msgid="5470814345876056420">"Ver actualiz. superficie"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Mostrar superficies de vent. cuando se actualizan"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Ver actualiz. vistas GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Mostrar vistas de ventanas procesadas con GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Desactivar superpos. HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar GPU para combinar pantallas"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Activar seguimientos"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Selec. seguim. activados"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"No se activó ningún seguimiento."</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Se activaron <xliff:g id="NUM">%1$d</xliff:g> seguimientos."</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Se activaron todos los seguimientos."</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <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="force_hw_ui" msgid="6426383462520888732">"Forzar representación GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Usar aceleración por hardware 2D en aplicaciones"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forzar uso de GPU para dibujar en 2d"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Represent. GPU del perfil"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tiempo de repr. en adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Escala duración animador"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1567,15 @@
     <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_menu_metered" msgid="5056695223222541863">"Zonas Wi-Fi móviles"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Medición de tu tableta. Los cálculos del uso de datos realizados por tu proveedor pueden ser diferentes."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Medición de tu dispositivo. Los cálculos del uso de datos realizados por tu proveedor pueden ser diferentes."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"Restringido"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"¿Desactivar datos móviles?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Establecer límite datos móviles"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Establecer límite de datos en 4G"</string>
@@ -1488,33 +1586,50 @@
     <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_list_mobile" msgid="5588685410495019866">"Celulares"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Ver config. de la aplicación"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringir los datos de referencia"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Inhabilitar datos ref. en redes móviles. Wi-Fi, si es posible."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desactivar datos ref. en redes móviles (usará redes no móviles)"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para limitar datos de ref. de esta aplic., limita datos móviles."</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="5651588785118290771">"Esta función puede detener el funcionamiento de una aplicación que dependa de datos de referencia cuando no se disponga de Wi-Fi."\n\n"Puedes buscar controles de uso de datos más adecuados en la configuración disponible dentro de la aplicación."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar datos de referencia cuando solo estén disponibles redes móviles."\n\n"Puedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Solo se pueden restringir los datos de referencia si estableciste un límite de datos móviles."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <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_warning_editor_title" msgid="3704136912240060339">"Configurar advertencia acerca del uso de datos"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Establecer el límite de uso de datos"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar el uso de datos"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Tu conexión de datos <xliff:g id="NETWORKS">%1$s</xliff:g> se inhabilitará cuando se alcance el límite especificado."\n\n"Debido a que tu tableta mide el uso de datos, y a que los cálculos del uso realizados por tu proveedor pueden ser diferentes, considera establecer un límite prudente."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Tu conexión de datos <xliff:g id="NETWORKS">%1$s</xliff:g> se desactivará cuando se alcance el límite especificado."\n\n"Debido a que tu dispositivo mide el uso de datos, y a que los cálculos del uso realizados por el proveedor pueden ser diferentes, considera establecer un límite prudente."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu tableta puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu teléfono puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</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="6387252645350792955">"Si restringes los datos para celulares de referencia, algunas aplicaciones y servicios no funcionarán a menos que te conectes a una red Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: se usó <xliff:g id="TOTAL">%1$s</xliff:g> aproximadamente"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g> según tu tableta. La medición de tu proveedor puede diferir."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g> según tu teléfono. La medición de tu proveedor puede diferir."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Zonas Wi-Fi móviles"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecciona las redes Wi-Fi que sean zonas Wi-Fi móviles. Se puede impedir que las aplicaciones usen estas redes cuando se ejecuten en segundo plano. Asimismo, las aplicaciones pueden mostrar un mensaje de advertencia antes de usar estas redes para descargar archivos de gran tamaño."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Para seleccionar zonas Wi-Fi móviles, activa Wi-Fi."</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>
@@ -1540,12 +1655,14 @@
     <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_edit" msgid="8647191407179996943">"Editar perfil de VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar a <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Agregar perfil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Modificar perfil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Eliminar perfil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"No hay conexión de red. Inténtalo de nuevo más tarde."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"No se encuentra un certificado. Modifica el perfil."</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>
@@ -1554,25 +1671,7 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"¿Deseas activar el certificado de CA del sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"¿Deseas desactivar 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="477937585801538951">"Luego de activar Exploración táctil, puedes tocar la pantalla para saber qué hay debajo de tu dedo. Por ejemplo, la pantalla actual contiene íconos de la aplicación. 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 desplazando el dedo por la pantalla hasta encontrar, al menos, otro ícono más."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"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>. Luego 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="8764686624055084454">"Para desplazarte por una lista, puedes deslizar dos dedos por la pantalla. Por ejemplo, en la pantalla hay una lista de íconos de nombres de aplicaciones que puedes desplazar hacia arriba y hacia abajo. Primero 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 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="3055831259260848004">"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="spellcheckers_settings_title" msgid="399981228588011501">"Corrector ortográfico"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Escribe tu contraseña actual de copia de seguridad completa aquí"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Escribe una nueva contraseña para copias de seguridad completas."</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Vuelve a escribir aquí tu nueva contraseña de copia de seguridad completa"</string>
@@ -1580,4 +1679,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualizaciones del sistema adicionales"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Usuarios y restricciones"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Usuarios"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Agregar usuario"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Modificar detalles"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Información del usuario"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nombre"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restricciones de contenido"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Solicitar PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Calificación contenido:"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicaciones del sistema"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicaciones instaladas"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Descartar"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Eliminar usuario"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Niño molesto"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"¿Eliminar usuario?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"¿Seguro que quieres eliminar el usuario y todos los datos asociados del dispositivo?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
+    <string name="help_label" msgid="1107174367904110532">"Ayuda"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 4d77c5b..beddc81 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Desconectando..."</item>
     <item msgid="1634960474403853625">"Desconectada"</item>
     <item msgid="746097431216080650">"Con error"</item>
+    <item msgid="6367044185730295334">"Bloqueada"</item>
+    <item msgid="503942654197908005">"Inhabilitando conexión inestable temporalmente..."</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Desconectando de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"Desconectada"</item>
     <item msgid="8578370891960825148">"Con error"</item>
+    <item msgid="5660739516542454527">"Bloqueada"</item>
+    <item msgid="1805837518286731242">"Inhabilitando conexión inestable temporalmente..."</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Botón push"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ninguno"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN de punto de acceso"</item>
-    <item msgid="7364462169350112617">"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>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Tarjeta SD extraíble"</item>
     <item msgid="4498124044785815005">"Selección del sistema"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Desactivar"</item>
-    <item msgid="4804571292609523335">"Vibrar"</item>
-    <item msgid="595707141547423573">"Silenciar"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
     <item msgid="2560532955514699713">"Medio"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Escala de animación 5x"</item>
     <item msgid="6660750935954853365">"Escala de animación 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animación desactivada"</item>
+    <item msgid="1138649021950863198">"Escala de animación 0,5x"</item>
+    <item msgid="4394388961370833040">"Escala de animación 1x"</item>
+    <item msgid="8125427921655194973">"Escala de animación 1,5x"</item>
+    <item msgid="3334024790739189573">"Escala de animación 2x"</item>
+    <item msgid="3170120558236848008">"Escala de animación 5x"</item>
+    <item msgid="1069584980746680398">"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">"Sin procesos en segundo plano"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d7276ae..9bbb3a2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
+    <string name="create" msgid="3578857613172647409">"Crear"</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>
@@ -111,6 +112,8 @@
     <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>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nombre del dispositivo"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Ajustes del dispositivo"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Ajustes de perfil"</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_rename_device" product="tablet" msgid="787970073150631155">"Cambiar nombre del tablet"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Sincronizando..."</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="5655704645616731277">"Toca uno"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"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="1931617700075106801">"Toca para sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toca para sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar archivos recibidos"</string>
-    <string name="device_picker" msgid="8721012448931226323">"Elige un dispositivo Bluetooth"</string>
+    <string name="device_picker" msgid="8398232791303186677">"Selector de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Una aplicación quiere activar el Bluetooth. ¿Quieres permitirlo?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Una aplicación del tablet quiere hacerlo visible para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres permitirlo?"</string>
@@ -148,14 +150,14 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Una aplicación del teléfono quiere activar el Bluetooth y hacer el teléfono visible para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres permitirlo?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Una aplicación del tablet quiere activar el Bluetooth y hacerlo visible para otros dispositivos. ¿Quieres permitirlo?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Una aplicación del teléfono quiere activar el Bluetooth y hacer el teléfono visible para otros dispositivos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"¿Activar Bluetooth?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"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="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Aceptar"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"El nombre de host introducido no es válido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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_port" msgid="5539106187558215246">"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="2671425042711054494">"El puerto que has introducido no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utiliza el proxy HTTP, pero no puede utilizarlo otras aplicaciones."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Establecer"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Con error"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Correcto"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Los cambios se aplican cuando se vuelve a conectar el cable USB."</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Los cambios se aplicarán cuando se vuelva a conectar el cable USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Habilitar almacenamiento masivo USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Bytes totales:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Almacenamiento USB no activado"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Falta la tarjeta SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB no activado"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Falta la tarjeta SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponibles:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB como almacenamiento masivo"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La tarjeta SD se está utilizando como dispositivo de almacenamiento masivo."</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Es seguro extraer el almacenamiento USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Es seguro extraer la tarjeta SD"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB como almacenamiento masivo"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"La tarjeta SD se está usando como dispositivo de almacenamiento masivo."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Es seguro extraer el almacenamiento USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Es seguro extraer la tarjeta SD."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB extraído en uso"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La tarjeta SD se ha extraído mientras estaba en uso."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes usados:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Buscando archivos almac USB…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Almacenamiento USB activado como solo lectura"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"La tarjeta SD está 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="5349877711342869319">"Idioma"</string>
@@ -256,7 +258,7 @@
     <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="3936651951364030415">"Acceso directo a Ajustes"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Acceso a Ajustes"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</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>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Establecer conexión con servicios de datos en itinerancia"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Has perdido la conectividad de datos porque has dejado desactivada la itinerancia de datos de tu red doméstica."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activarla"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"¿Quieres permitir la itinerancia de datos? Los costes de itinerancia que deberás asumir pueden ser muy altos."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Atención"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Al permitir la itinerancia de datos, es posible que te facturen cargos adicionales elevados."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"¿Permitir itinerancia de datos?"</string>
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Seleccionar un operador de red"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Fecha y hora"</string>
@@ -283,14 +285,16 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Establecer hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar zona horaria"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Establecer fecha"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Formato de fecha"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"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="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Mejorar el reconocimiento facial"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Reconocimiento facial"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Solicitar parpadeo"</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="lock_after_timeout_summary" msgid="6128431871360905631">"Tras <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después de suspender"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar datos del propietario en la pantalla de bloqueo"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Información del propietario"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"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 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 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="3504519024884099702">"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_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el tablet, debes introducir un PIN 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 tablet."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el tablet conectado hasta que acabe. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"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, debes introducir un PIN 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 aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que acabe. 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="2029407131227814893">"Carga la batería y vuelve a intentarlo."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"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="5100339496381875522">"¿Encriptar dispositivo?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"La operación de encriptación no se puede deshacer y, si la interrumpes, perderás datos. La encriptación tarda aproximadamente una hora y el tablet se reinicia varias veces durante este proceso."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"La operación de encriptación no se puede deshacer y, si la interrumpes, perderás datos. La encriptación tarda aproximadamente una hora 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="6689952371032099350">"Espera mientras se encripta el tablet. <xliff:g id="PERCENT">^1</xliff:g>% completado"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"Escribe 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="6891198717505120682">"El proceso de encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del tablet. "\n\n"Debes restablecer los datos de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"La encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del teléfono. "\n\n"Debes restablecer los datos de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Elegir pantalla bloqueo"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"El proceso de encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del tablet. "\n\n"Debes restablecer los datos de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del teléfono. "\n\n"Debes restablecer los datos de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar método de entrada"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir pantalla de bloqueo"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Desbloqueo facial"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Patrón"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe contener al menos %d caracteres."</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"El PIN debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"El PIN solo debe contener dígitos comprendidos entre el 0 y el 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"El administrador de dispositivos no permite usar un PIN reciente."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"La contraseña contiene un carácter no permitido."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"La contraseña debe tener al menos una letra."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"La contraseña debe tener al menos un dígito."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"La contraseña debe tener 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>
+    <item quantity="one" msgid="3063853802158131458">"La contraseña debe tener al menos una letra."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"La contraseña debe tener al menos una letra minúscula."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"La contraseña debe tener al menos una letra mayúscula."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"La contraseña debe tener al menos un dígito numérico."</item>
+    <item quantity="other" msgid="4703982391407595924">"La contraseña debe tener al menos %d dígitos numéricos."</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>
+    <item quantity="one" msgid="8456579939292408631">"La contraseña debe tener al menos un símbolo especial."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"La contraseña debe tener al menos un carácter no alfabético."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"El administrador de dispositivos no permite usar 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="lock_setup" msgid="1759001157415978959">"Configuración completada"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Se ha completado la configuración."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administración 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>
@@ -413,9 +418,9 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Para sincronizar con:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe la clave de acceso solicitada por el 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_enter_pin_other_device" msgid="4637977124526813470">"Es posible que tengas que introducir este PIN en el otro dispositivo."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Es posible que tengas que introducir la 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; 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="2796550001376088433">"Para sincronizar con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> en el dispositivo y, a continuación, pulsa la tecla Intro o de retorno."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sincronizar"</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No se ha podido sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque la clave de acceso o el PIN son incorrectos."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"No se puede establecer comunicación con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"No se ha podido 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>
@@ -470,53 +475,70 @@
     <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_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acceder 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="5237208142892767592">"Permitir el intercambio de datos cuando el teléfono toque otro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir intercambio de datos cuando el tablet toque otro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el teléfono toque otro dispositivo"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Listo para compartir contenido de aplicaciones por NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivada"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible porque la función NFC está desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Si la función Android Beam está activada, puedes juntar tu dispositivo con otro compatible con la tecnología NFC para compartir el contenido de las aplicaciones. Por ejemplo, puedes transmitir páginas del navegador, vídeos de YouTube, contactos y mucho más."\n\n"Solo tienes que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, tocar la pantalla de tu dispositivo. Las aplicaciones determinan el contenido que puede compartirse."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Si la función Android Beam está activada, puedes juntar tu dispositivo con otro compatible con la tecnología NFC para compartir el contenido de las aplicaciones. Por ejemplo, puedes transferir páginas del navegador, vídeos de YouTube, contactos y mucho más."\n\n"Solo tienes que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, tocar la pantalla de tu dispositivo. Las aplicaciones determinan el contenido que puede compartirse."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detección de aplicaciones"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir que las aplicaciones de otros dispositivos puedan ver las aplicaciones de este dispositivo"</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="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_setup_wizard_title" msgid="70277346338812325">"Seleccionar Wi-Fi"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"Activando Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="244864762599017659">"Desactivando Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Modo avión"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"No se puede buscar redes."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificación de red"</string>
-    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Informarme cuando haya una red abierta disponible"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Solo conexiones buenas"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notificarme cuando haya una red abierta disponible"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Solo conexiones buenas"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Usar Wi-Fi en suspensión"</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_wps_pbc" msgid="2668564692207863017">"Botón WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"PIN WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ajustes avanzados"</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 la conexión Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Buscando redes Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</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="8242979682530043184">"Escribir PIN del punto de acceso"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Configuración WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Introducir 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_wps_setup_title" msgid="6034518116333042484">"Configuración WPS"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando configuración WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pulsa el botón Configuración WPS del router. Es posible que se llame WPS o que incluya este símbolo:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Introduce el código PIN <xliff:g id="NUMBER">%1$s</xliff:g> en el router Wi-Fi. El proceso de configuración puede tardar hasta dos minutos."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"La configuración WPS se ha iniciado correctamente. Estableciendo conexión con la red…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Conexión establecida con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"El proceso WPS ya se ha iniciado y tiene una duración aproximada de dos minutos."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Se ha producido un error en la configuración WPS. Inténtalo de nuevo en unos minutos."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"No se admite el ajuste de seguridad del router inalámbrico (protocolo WEP)."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"No se admite el ajuste de seguridad del router inalámbrico (protocolo TKIP)."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Se ha producido un error de autenticación. Inténtalo de nuevo."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Se ha detectado otra configuración WPS. Inténtalo de nuevo en unos minutos."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Guardado"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitado"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mala conexión inhabilitada"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Se ha inhabilitado la red porque la conexión es inestable. Desactiva esta opción en Ajustes &gt; Wi-Fi, dentro de Ajustes avanzados."</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_wps_available_first_item" msgid="3538912605343585226">"Red protegida disponible"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (red protegida disponible)"</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_failed_connect_message" msgid="8491902558970292871">"Error al conectar a la red"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Error al eliminar la red"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Error al guardar la red"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Se ha detectado otra 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>
@@ -567,34 +589,35 @@
     <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_network_prefix_length" msgid="3028785234245085998">"Longitud prefijo de red"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Configurar conectividad punto a punto"</string>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud del prefijo de red"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Información del dispositivo"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"WPS"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Eliminar grupo"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avanzados"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Dispositivos disponibles"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Buscar dispositivos"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Buscando…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Cambiar nombre del dispositivo"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Otros dispositivos"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"No se ha podido conectar."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Error al cambiar nombre del dispositivo"</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"¿Desconectar?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Si desconectas el dispositivo, finalizará la conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Si desconectas el dispositivo, finalizará la conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g> y con otros dispositivos de <xliff:g id="PEER_COUNT">%2$s</xliff:g>."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para establecer conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Configurar zona Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"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="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencio"</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="4296957391257836961">"Volumen"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos de música"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencio"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrar y sonar"</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="incoming_call_volume_title" msgid="8073714801365904099">"Tono"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Silenciar tono y notificaciones"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Silenciar música y otros archivos multimedia"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Silenciar notificaciones"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Silenciar alarmas"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar al sonar"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Para configurar el audio del conector, debes insertar el tablet en el conector."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Para configurar el audio del conector, debes insertar el teléfono en el conector."</string>
-    <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sonido al insertar dispositivo en conector"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Para configurar el audio del conector, debes insertar el tablet en el conector."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Para configurar el audio del conector, debes insertar el teléfono en el conector."</string>
+    <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sonido al insertar dispositivo"</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="account_settings" msgid="6403589284618783461">"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="7965901687241669598">"Pantalla"</string>
@@ -641,7 +669,7 @@
     <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="4351334843529712571">"Apagar"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Apagar después de"</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="519078346877860129">"Seleccionar fondo de pantalla de..."</string>
@@ -687,7 +715,7 @@
     <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
     <string name="model_number" msgid="3765737700545384794">"Número de modelo"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versión de banda base"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"Versión de kernel"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Versión del kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilación"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
@@ -702,11 +730,11 @@
     <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_prl_version" msgid="1007470446618081441">"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_data_state" msgid="5503181397066522950">"Estado de la red móvil"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado del servicio"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Intensidad de la señal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Itinerancia"</string>
@@ -727,7 +755,7 @@
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imágenes, vídeos"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tonos, podcasts, etc.)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tonos, 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>
@@ -741,7 +769,7 @@
     <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="6331905044907914603">"Borrar todos los datos de la tarjeta SD del teléfono, como la música y las fotos"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Borrar todos los datos del almacenamiento USB del teléfono, 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">" (Solo lectura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"¿Desactivar almacenamiento USB?"</string>
@@ -756,13 +784,13 @@
     <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="storage_menu_usb" msgid="5708207885333243384">"Conexión USB al ordenador"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Conexión USB a ordenador"</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_mtp_summary" msgid="4617321473211391236">"Permitir 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_ptp_summary" msgid="7673397474756664929">"Permitir 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>
@@ -808,8 +836,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer datos de fábrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos del tablet."</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borrar todos los datos del teléfono"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, por ejemplo:"\n\n<li>"tu cuenta de Google,"</li>\n<li>"los ajustes y los datos de aplicaciones y del sistema,"</li>\n<li>"las aplicaciones descargadas."</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, por ejemplo:"\n\n<li>"tu cuenta de Google,"</li>\n<li>"los ajustes y los datos de aplicaciones y del sistema,"</li>\n<li>"las aplicaciones descargadas."</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:"\n\n<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:"\n\n<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las 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="7744115866662613411">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Quieres borrar toda tu información personal y las aplicaciones descargadas? 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">"Dibuja tu patrón de desbloqueo"</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_gesture_explanation" msgid="826193821455182780">"Debes dibujar un patrón de desbloqueo para confirmar que quieres restablecer los datos de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"¿Restablecer?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Borrar almacenamiento USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"¿Quieres borrar la tarjeta SD y eliminar todos sus archivos? Esta acción no se puede deshacer."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Borrar todo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dibuja tu patrón de desbloqueo"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar el almacenamiento USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Debes dibujar el patrón de desbloqueo para confirmar que quieres borrar el almacenamiento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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 llamadas"</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="6688416425801386511">"Anclaje de USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Ubicación de Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Permitir que las aplicaciones usen datos de fuentes como redes Wi-Fi y móviles para determinar tu ubicación aproximada"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Permitir que se envíen a Google datos de ubicación anónimos y que aplicaciones permitidas usen datos de fuentes (p. ej. redes móviles y Wi-Fi) para determinar ubicaciones"</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>
@@ -880,7 +908,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"Ubicación en búsquedas"</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" product="default" msgid="1743378368185371685">"Información 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>
@@ -906,7 +934,7 @@
     <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="335025124489630932">"Pantalla de seguridad"</string>
+    <string name="lock_settings_title" msgid="335025124489630932">"Seguridad de la pantalla"</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">"Confirma el patrón guardado"</string>
@@ -915,9 +943,9 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pulsa la tecla de menú para obtener ayuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Levanta el dedo cuando termines"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Une al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Inténtalo de nuevo:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Patrón grabado"</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Vuelve a dibujar el patrón para confirmarlo:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Tu patrón de desbloqueo nuevo:"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Patrón grabado"</string>
+    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Vuelve a dibujar el patrón para confirmarlo"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Tu nuevo patrón de desbloqueo"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmar"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Crear un patrón nuevo"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Repetir"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</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="1075370160667458122">"Protege el tablet contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Desliza el dedo para unir los puntos en cualquier orden en la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protege el tablet contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Desliza el dedo para unir los puntos en cualquier orden en la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protege tu teléfono contra usos no autorizados creando un patrón de desbloqueo de pantalla. Usa el dedo para unir los 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="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrar aplicaciones y configurar accesos directos de inicio rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ajustes de aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Orígenes desconocidos"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Permitir instalar aplicaciones que no estén en Android Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Permitir la instalación de aplicaciones de origen desconocido"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"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="8113734576826384682">"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>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Información de la aplicación"</string>
     <string name="storage_label" msgid="8700867073480107253">"Almacenamiento"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Abrir de forma predeterminada"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Valores predeterminados"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Borrar datos"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Desinstalar actualizaciones"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Has elegido iniciar esta aplicación de forma predeterminada para algunas acciones."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Has permitido que esta aplicación pueda crear widgets y acceder a sus datos."</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="1616155457673106022">"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>
@@ -980,8 +1010,12 @@
     <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>
-    <string name="show_running_services" msgid="5736278767975544570">"Mostrar servicios en ejecución"</string>
-    <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos en caché"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Servicios en ejecución"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Procesos en caché"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer preferencias?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Se restablecerán todas las preferencias de:"\n\n" "<li>"Aplicaciones inhabilitadas"</li>\n" "<li>"Notificaciones de aplicaciones inhabilitadas"</li>\n" "<li>"Aplicaciones para acciones predeterminadas"</li>\n" "<li>"Restricciones de datos en segundo plano para aplicaciones"</li>\n\n"No perderás los datos de las aplicaciones."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Seleccionar opciones de filtrado"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicación puede acceder a los siguientes elementos del tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"No se ha podido calcular el tamaño del paquete."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Modificar la ubicación de instalación preferida para nuevas aplicaciones"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"¿Inhabilitar aplicación integrada?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Si inhabilitas una aplicación integrada, es posible que otras aplicaciones no funcionen correctamente."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"¿Desactivar notificaciones?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactivas las notificaciones de esta aplicación, es posible que no recibas actualizaciones y alertas importantes."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso de almacenamiento"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ver almacenamiento usado por aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -1070,7 +1106,7 @@
     <string name="language_settings" msgid="5292716747264442359">"Idioma y entrada de texto"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma y entrada de texto"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Ajustes de idioma"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado y métodos de introducción"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado y métodos de entrada"</string>
     <string name="phone_language" msgid="8870144109924299673">"Idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Corrección automática"</string>
@@ -1082,21 +1118,40 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pulsa la barra espaciadora dos veces para insertar el carácter \".\""</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="4135828934735934248">"Este método de introducción 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>. ¿Quieres usar este método de introducción?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Este método de entrada 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>. ¿Quieres usar este método de entrada?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Este corrector ortográfico 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="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. ¿Quieres usar este corrector ortográfico?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Ajustes"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Error al abrir los ajustes de <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Ratón/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidad del puntero"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Mandos de videojuegos"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibración"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redireccionar vibración al controlador de videojuego cuando esté conectado"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Elige un tipo de teclado"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configurar diseños de teclado"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para cambiar, pulsa Ctrl+espacio."</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminado"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Diseños de teclado"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionario personal"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionarios personales"</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_add_screen_title" msgid="742580720124344291">"Frase"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Más opciones"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Menos opciones"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"Aceptar"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Palabra:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Texto de sustitución:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Idioma:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Para todos los idiomas"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Más idiomas..."</string>
     <string name="testing" msgid="6584352735303604146">"Prueba"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Información del tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Información sobre el teléfono"</string>
@@ -1112,37 +1167,48 @@
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Cancelar"</string>
     <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"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_method" msgid="5434026103176856164">"Introducción de texto"</string>
+    <string name="input_methods_settings_title" msgid="6800066636850553887">"Entrada de texto"</string>
+    <string name="input_method" msgid="5434026103176856164">"Entrada de texto"</string>
     <string name="current_input_method" msgid="234072873286056438">"Predeterminado"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"Selector de método de introducción"</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á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="1317429869771850228">"Configurar métodos de introducción"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"Configurar métodos de entrada"</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="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 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="4421813273170250462">"Seleccionar métodos introducción activos"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Elegir métodos entrada activos"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ajustes de teclado en pantalla"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Teclado físico"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Ajustes del teclado físico"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opciones de desarrollo"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"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 el dispositivo está conectado por USB"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID del dispositivo de desarrollo"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Información de dispositivo no disponible"</string>
+    <string name="enable_adb_summary" msgid="4881186971746056635">"Activar el modo de depuración cuando el dispositivo está conectado por USB"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pantalla activa"</string>
-    <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca entra en modo de suspensión durante la carga"</string>
+    <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca entra en modo de suspensión si el dispositivo se está cargando"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"La depuración USB solo está indicada para actividades de desarrollo. Puedes utilizarla para intercambiar datos entre el ordenador y el dispositivo, para instalar aplicaciones en el dispositivo sin recibir notificaciones y para leer datos de registro."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"¿Permitir ajustes de desarrollo?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Estos ajustes están destinados únicamente a los desarrolladores. Pueden provocar que el dispositivo o las aplicaciones no funcionen correctamente."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger almacenamiento USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Las aplicaciones deben solicitar permiso para leer el almacenamiento USB."</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"¿Proteger almacenamiento USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Cuando el almacenamiento USB está protegido, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger tarjeta SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Las aplicaciones deben solicitar permiso para leer la tarjeta SD."</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"¿Proteger tarjeta SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Seleccionar gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Seleccionar widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"¿Crear widget y permitir acceso?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Después de crear el widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> podrá acceder a todos los datos que muestre."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permitir que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> pueda crear widgets y acceder a sus datos siempre"</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> 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> h <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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Botón encendido cuelga"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Decir contraseñas"</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 pulsación prolongada"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Instalar scripts web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Mejorar accesibilidad web"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No se ha instalado ningún servicio."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"¿Necesitas un lector de pantalla?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ofrece mensajes de voz para usuarios con discapacidades visuales. ¿Quieres instalarlo de forma gratuita desde Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"¿Instalar scripts web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"¿Quieres que las aplicaciones instalen scripts de Google para mejorar la accesibilidad de su contenido?"</string>
-    <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="1072730037861494125">"No se ha especificado ninguna descripción."</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_not_available" msgid="3214000535532434353">"Los datos de uso de la batería no están disponibles"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"El motor seleccionado no se puede ejecutar."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Seleccionar otro motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Es posible que este motor de síntesis de voz recopile todo el texto hablado, incluidos datos personales, como contraseñas y números de tarjeta de crédito. Procede del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. ¿Quieres habilitar el uso de este motor de síntesis de voz?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Mujer"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Habilita el nuevo motor para usarlo."</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>
@@ -1314,14 +1375,16 @@
     <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" msgid="3239382277144980418">"Eliminar certificados"</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" msgid="4266945289534242402">"Certificados de confianza"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuja tu patrón de desbloqueo."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes dibujar tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escribe la contraseña del almacenamiento de credenciales."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
-    <string name="credentials_reset_hint" msgid="6297256880896133631">"¿Eliminar todos los comentarios?"</string>
+    <string name="credentials_reset_hint" msgid="6297256880896133631">"¿Seguro que quieres eliminar todos los certificados?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener un mínimo de ocho caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Contraseña incorrecta"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contraseña incorrecta. Tienes una oportunidad más antes de que se borre el almacenamiento de credenciales."</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Almacenamiento credenciales borrado"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"No se ha podido borrar el almacenamiento de credenciales."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Almacenamiento de credenciales habilitado"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Para poder usar el almacenamiento de credenciales, debes establecer una contraseña o un PIN para la pantalla de bloqueo."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para poder usar el almacenamiento de credenciales, debes establecer una contraseña o un PIN para la pantalla de bloqueo."</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="5446972770562918934">"Copia de seguridad"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cuando vuelvas a instalar una aplicación, restaurar la configuración y los datos incluidos en la copia"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contraseña copias ordenador"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Las copias de seguridad completas de ordenador no están protegidas"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocar para cambiar o eliminar la contraseña para copias de seguridad completas de ordenador"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"¿Quieres dejar de crear copias de seguridad de las contraseñas Wi-Fi, de los marcadores y de otros ajustes y datos de aplicaciones, además de 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>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Sistema"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Tono de llamada y vibración"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Estableciendo conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Error de sincronización"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sincronización activa"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Sincronización"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"En este momento hay incidencias con la sincronización. Se restablecerá en breve."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Añadir cuenta"</string>
     <string name="background_data" msgid="5779592891375473817">"Datos de referencia"</string>
@@ -1402,8 +1467,10 @@
     <string name="background_data_dialog_message" msgid="6981661606680941633">"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 usando la conexión de datos de referencia."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Sincronizar datos aplicaciones autom."</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_disabled" msgid="8511659877596511991">"La sincronización está desactivada"</string>
     <string name="sync_error" msgid="5060969083117872149">"Error de sincronización"</string>
+    <string name="last_synced" msgid="4242919465367022234">"Última sincronización: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Sincronizando…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Hacer copia de seguridad de configuración"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Hacer copia de seguridad de mi configuración"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronizar ahora"</string>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync,"</font>" "\n"un servicio de Google que te permite sincronizar datos para que puedas acceder a tus contactos, a tus citas, etc., desde cualquier ubicación."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Ajustes de sincronización de la 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>
@@ -1422,12 +1489,13 @@
     <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="8800653398717172460">"¿Eliminar cuenta?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Si eliminas esta cuenta, se eliminarán todos sus mensajes, sus contactos y otros datos del tablet."</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Si eliminas esta cuenta, se eliminarán todos sus mensajes, sus contactos y otros datos del teléfono."</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Si eliminas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos del tablet."</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Si eliminas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos del teléfono."</string>
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Algunas aplicaciones necesitan esta cuenta. Para eliminarla, debes restablecer los valores de fábrica del tablet (esta acción elimina todos tus datos personales). Para ello, accede a Ajustes &gt; Copia de seguridad."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Algunas aplicaciones necesitan esta cuenta. Para eliminarla debes restablecer los valores de fábrica del teléfono (esta acción elimina todos tus datos personales). Para ello, accede a Ajustes &gt; Copia de seguridad."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"No se puede hacer la sincronización de forma manual."</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"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="wimax_settings" msgid="1574837328738396794">"Ajustes de 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduce la contraseña para descifrar el almacenamiento."</string>
     <string name="try_again" msgid="4272075051293936921">"Inténtalo de nuevo."</string>
-    <string name="service_busy" msgid="2325014135156127705">"El servicio está ocupado. Inténtalo de nuevo."</string>
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,27 +1510,51 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Depuración"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Aplicación para depurar"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Aplicación de depuración no configurada"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplicación de depuración: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Seleccionar aplicación"</string>
+    <string name="no_application" msgid="2813387563129153880">"Ninguna"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Esperar al depurador"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"La aplicación de depuración espera a que se conecte el depurador para ejecutarse"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Entrada"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Dibujo"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Supervisión"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modo estricto"</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">"Superponer los datos de las pulsaciones en la pantalla"</string>
-    <string name="show_touches" msgid="1356420386500834339">"Mostrar toques"</string>
+    <string name="show_touches" msgid="1356420386500834339">"Mostrar pulsaciones"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Mostrar la ubicación de las pulsaciones en la pantalla"</string>
-    <string name="show_screen_updates" msgid="8282711794220426931">"Ver cambios 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_screen_updates" msgid="5470814345876056420">"Cambios de superficie"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Actualizar superficies de ventana al actualizarse"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Actualizaciones GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Actualizar vistas de las ventanas creadas con GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Inhabilitar superposiciones HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar siempre GPU para combinar pantallas"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Habilitar seguimientos"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Elegir seguimientos habilitados"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"No hay seguimientos habilitados en este momento."</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> seguimientos habilitados en este momento"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Todos los seguimientos habilitados"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de vídeo, márgenes, etc."</string>
+    <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar uso de la CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suporponer el uso de la CPU en la pantalla"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forzar aceleración GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Usar aceleración de hardware 2D en aplicaciones"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forzar uso de GPU para dibujos en 2D"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Representación GPU perfil"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tiempo representación en adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala de animación ventana"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala de transición-animación"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala duración animador"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicaciones"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Destruir actividades"</string>
-    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir 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="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir actividades cuando el usuario deje de usarlas"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Límitar procesos en 2.º plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Errores sin respuesta"</string>
-    <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostrar error de que la aplicación no responde para aplicaciones en segundo plano"</string>
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"Informar de que una aplicación en segundo plano no responde"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo de uso"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Itinerancia de datos"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Puntos de acceso móviles"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizar datos automáticamente"</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="8621855507876539282">"Ninguna aplicación ha usado datos en 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_disclaimer" product="tablet" msgid="2591250607795265503">"Calculado por el tablet. El cálculo del consumo de datos que hace tu operador puede variar."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Calculado por el teléfono. El cálculo del consumo de datos que hace tu operador puede variar."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"con restricción"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"¿Inhabilitar datos móviles?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Limitar datos móviles"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Limitar datos 4G"</string>
@@ -1488,33 +1580,45 @@
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Móviles"</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_list_mobile" msgid="5588685410495019866">"Móvil"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Ninguna"</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="8430240158135453271">"Ver ajustes de la aplicación"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringir datos de referencia"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Inhabilitar datos de referencia en redes móviles. Se usará Wi-Fi si está disponible."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Inhabilitar datos referencia en redes móviles (si es posible, se usarán otras)."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir los datos de referencia, establece un límite de datos móviles."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿Restringir datos de referencia?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Es posible que esta función detenga el funcionamiento de una aplicación que dependa de los datos de referencia cuando la conexión Wi-Fi no esté disponible."\n\n"Puedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar datos de referencia cuando solo haya disponibles redes móviles."\n\n"Puedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Solo puedes restringir los datos de referencia si estableces un límite de datos móviles."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"¿Activar sincronización automática?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Los cambios que hagas en tus cuentas en la Web se copiarán automáticamente en el tablet."\n\n"Algunas cuentas como, por ejemplo, las cuentas de Google, también copiarán en la Web los cambios que hagas en el tablet. "\n\n"Para seleccionar qué tipo de información se sincronizará con cada cuenta, accede a Ajustes &gt; Cuentas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Los cambios que hagas en tus cuentas en la Web se copiarán automáticamente en el teléfono."\n\n"Algunas cuentas como, por ejemplo, las cuentas de Google, también copiarán en la Web los cambios que hagas en el teléfono. "\n\n"Para seleccionar qué tipo de información se sincronizará con cada cuenta, accede a Ajustes &gt; Cuentas."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"¿Desactivar sincronización automática?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Así podrás ahorrar uso de datos y batería, pero tendrás que sincronizar cada cuenta de forma manual para recopilar información reciente y no recibirás notificaciones cuando se produzcan actualizaciones."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Elige el día en el que empezará cada ciclo"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Día de cada mes:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Establecer"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Establecer advertencia de uso de datos"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limitar uso de datos"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar uso de datos"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Tu conexión de datos <xliff:g id="NETWORKS">%1$s</xliff:g> se inhabilitará cuando se alcance el límite especificado."\n\n"Como el tablet es el que calcula el uso de los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Tu conexión de datos <xliff:g id="NETWORKS">%1$s</xliff:g> se inhabilitará cuando se alcance el límite especificado."\n\n"Como el teléfono es el que calcula los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos se inhabilitará cuando se alcance el límite especificado."\n\n"Como el tablet es el que calcula el uso de los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos se inhabilitará cuando se alcance el límite especificado."\n\n"Como el teléfono es el que calcula los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir datos de referencia?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si restringes los datos móviles de referencia, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: unos <xliff:g id="TOTAL">%1$s</xliff:g> usados"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: unas <xliff:g id="TOTAL">%1$s</xliff:g> usadas"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: unas <xliff:g id="TOTAL">%1$s</xliff:g> usadas (según el cálculo del tablet). El cálculo del uso de datos del operador puede variar."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: unas <xliff:g id="TOTAL">%1$s</xliff:g> usadas (según el cálculo del teléfono). El cálculo del uso de datos del operador puede variar."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Puntos de acceso móviles"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecciona las redes Wi-Fi que sean puntos de acceso móviles. Se puede impedir que las aplicaciones usen estas redes cuando se ejecuten en segundo plano. Asimismo, las aplicaciones pueden mostrar un mensaje de advertencia antes de usar estas redes para descargar archivos de gran tamaño."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Para seleccionar puntos de acceso móviles, activa el Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Editar perfil de VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar a <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Añadir perfil de VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Editar perfil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Eliminar perfil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"No hay conexión de red. Inténtalo de nuevo más tarde."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Falta un certificado. Edita el perfil."</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>
@@ -1554,30 +1660,30 @@
     <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="477937585801538951">"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 actual 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="3973201880357468747">"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="8764686624055084454">"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="3055831259260848004">"Has completado el tutorial. Para salir, toca 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="7735254412051914576">"Introduce aquí la contraseña actual de copia de seguridad completa"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Corrector ortográfico"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Introduce aquí la contraseña actual de copia de seguridad completa."</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introduce una contraseña nueva para copias de seguridad completas."</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Vuelve a escribir aquí la nueva contraseña de copia de seguridad completa"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Vuelve a escribir aquí la nueva contraseña de copia de seguridad completa."</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Establecer contraseña"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Otras actualizaciones del sistema"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Usuarios y restricciones"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Usuarios"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Añadir usuario"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Editar detalles"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Información del usuario"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nombre"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restricciones de contenido"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Solicitar PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Clasificación de contenido"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicaciones del sistema"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicaciones instaladas"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Descartar"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Eliminar usuario"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Pesado"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"¿Eliminar usuario?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"¿Seguro que quieres eliminar el usuario y todos los datos asociados del dispositivo?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
+    <string name="help_label" msgid="1107174367904110532">"Ayuda"</string>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 1c0ef04..d58b48a 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Ühenduse katkestamine…"</item>
     <item msgid="1634960474403853625">"Ühendus katkestatud"</item>
     <item msgid="746097431216080650">"Ebaõnnestus"</item>
+    <item msgid="6367044185730295334">"Blokeeritud"</item>
+    <item msgid="503942654197908005">"Kehva ühenduse ajutine vältimine"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Ühenduse katkestamine võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Ühendus katkestatud"</item>
     <item msgid="8578370891960825148">"Ebaõnnestus"</item>
+    <item msgid="5660739516542454527">"Blokeeritud"</item>
+    <item msgid="1805837518286731242">"Kehva ühenduse ajutine vältimine"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Vajutusnupp"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Puudub"</item>
@@ -171,12 +177,6 @@
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
     <item msgid="8651992560135239389">"GTC"</item>
   </string-array>
-  <string-array name="wifi_network_setup">
-    <item msgid="3318069057130819160">"Väljas"</item>
-    <item msgid="3564693183575724416">"Nupuvajutus"</item>
-    <item msgid="7468724146672456026">"PIN-kood pääsupunktist"</item>
-    <item msgid="7364462169350112617">"PIN-kood sellest seadmest"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Staatiline"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Eemaldatav SD-kaart"</item>
     <item msgid="4498124044785815005">"Lase süsteemil otsustada"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Väljas"</item>
-    <item msgid="4804571292609523335">"Vibreeri"</item>
-    <item msgid="595707141547423573">"Summuta"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lühike"</item>
     <item msgid="2560532955514699713">"Keskmine"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animatsiooni skaala 5 korda"</item>
     <item msgid="6660750935954853365">"Animatsiooni skaala 10 korda"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animatsioon väljas"</item>
+    <item msgid="1138649021950863198">"0,5-kordne animatsiooni skaala"</item>
+    <item msgid="4394388961370833040">"1-kordne animatsiooni skaala"</item>
+    <item msgid="8125427921655194973">"1,5-kordne animatsiooni skaala"</item>
+    <item msgid="3334024790739189573">"2-kordne animatsiooni skaala"</item>
+    <item msgid="3170120558236848008">"5-kordne animatsiooni skaala"</item>
+    <item msgid="1069584980746680398">"10-kordne animatsiooni skaala"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardpiir"</item>
     <item msgid="4071574792028999443">"Taustaprotsessideta"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 1d2acba..526005b 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Jah"</string>
     <string name="no" msgid="6731231425810196216">"Ei"</string>
+    <string name="create" msgid="3578857613172647409">"Loo"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tundmatu"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRAADITA ÜHENDUS JA VÕRGUD"</string>
     <string name="header_category_device" msgid="5781174212691167553">"SEADE"</string>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Vältige Bluetoothi valija kasutamist, kui ekraan on lukustatud"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-seadmed"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Seadme nimi"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Seadme seaded"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profiili seaded"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Nimi on määramata, konto nime kasutamine"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Otsi seadmeid"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Nimeta tahvelarvuti ümber"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Sidumine ..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Nimetu Bluetooth-seade"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Otsimine"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Puudutage sidumiseks"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Läheduses ei leitud Bluetooth-seadmeid."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetoothi sidumisettepanek"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sidumistaotlus"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"Puudutage seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sidumiseks"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Puudutage seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühildamiseks."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näita vastuvõetud faile"</string>
-    <string name="device_picker" msgid="8721012448931226323">"Bluetoothi seadme valija"</string>
+    <string name="device_picker" msgid="8398232791303186677">"Bluetooth-seadme valija"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetoothi loa taotlus"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Rakendus soovib Bluetoothi sisse lülitada. Kas lubada?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Tahvelarvutis olev rakendus soovib tahvelarvuti muuta teistele Bluetooth-seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks. Kas lubada?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Puudutage seadmega „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” ühendamiseks."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Kas soovite ühendada seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefoniraamatu taotlus"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s sooviks juurdepääsu teie kontaktidele ja kõneajaloole. Kas anda juurdepääs kasutajale %2$s?"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s soovib juurdepääsu teie kontaktisikutele ja kõneajaloole. Kas lubate juurdepääsu kasutajale %2$s?"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ära enam küsi"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Kuupäeva ja kellaaja seaded"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Sisestatud hosti nimi on kehtetu."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Sisestatud välistusloend ei ole õigesti vormindatud. Sisestage välistatud domeenide komadega eraldatud loend."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Peate täitma pordi välja."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Peate täitma pordi välja."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pordi väli peab olema tühi, kui hosti väli on tühi."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Sisestatud port on kehtetu."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Määra"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Ebaõnnestus"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Õnnestunud"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Muudatused jõustuvad siis, kui USB-kaabel on uuesti ühendatud"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Muudatused jõustuvad siis, kui USB-kaabel on uuesti ühendatud."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB massmälu lubamine"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Baite kokku:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-mäluseade pole paigaldatud"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"SD-kaart puudub"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB-mäluseade on paigaldamata."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Puudub SD-kaart."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Saadaolevad baidid:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-mäl. kasut. massmälus.-na"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-kaart on kasutusel massmäluseadmena"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"USB-seadme eemaldam. on ohutu"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"SD-kaardi eemaldamine on nüüd ohutu"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB on kasutusel massmäluna."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD-kaart on kasutusel massmäluseadmena."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"USB eemaldamine on nüüd ohutu."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"SD-kaardi eemaldamine on nüüd ohutu."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB eemaldati kasutamise ajal"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-kaart eemaldati kasutamise ajal."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Kasutatud baite:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB-st meediumi skaneering ..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD-kaardi skannimine meediumi jaoks ..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-mälus. paig. kirj.kaitsega"</string>
-    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"SD-kaart on paigaldatud kirjutuskaitstuna"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB-mälu on kirjutuskaitsega."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD-kaart on paigaldatud kirjutuskaitstuna."</string>
     <string name="skip_label" msgid="47510779345218297">"Edasi"</string>
     <string name="next_label" msgid="4693520878012668114">"Järgmine"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Keel"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Ühenda rändluse ajal andmesideteenustega"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Kaotasite andmesideühenduse, kuna jätsite oma koduvõrgu andmerändluse väljalülitatuks."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Lülita sisse"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Kas lubada andmerändlus? Teilt võidakse küsida suuri rändlustasusid."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Tähelepanu"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Kui lubate andmeside rändluse, siis võidakse teilt küsida suuri rändlustasusid."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Kas lubada andmeside rändlus?"</string>
     <string name="networks" msgid="6333316876545927039">"Operaatori valik"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Võrguoperaatori valimine"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Kuupäev ja kellaaeg"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Kellaaja määramine"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Valige ajavöönd"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Kuupäeva määramine"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Kuupäeva vormingu valimine"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Valige kuupäevavorming"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sordi tähestiku järgi"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sordi ajavööndi alusel"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Kuupäev"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Kellaaeg"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Paranda näosobitust"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Elavuse kontroll"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Nõutav silmapilgutus"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Lukusta automaatselt"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pärast unerežiimi"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Kuva lukustusekraanil teave omaniku kohta"</string>
@@ -306,26 +310,27 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Igal telefoni sisselülitamisel on vaja numbrilist PIN-koodi või parooli tahvelarvuti dekrüpteerimiseks"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Igal telefoni sisselülitamisel on vaja numbrilist PIN-koodi või parooli telefoni dekrüpteerimiseks"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krüpteeritud"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Krüpteerida saate kontosid, seadeid, allalaaditud rakendusi ja nende andmeid, meedia- ja muid faile. Kui olete tahvelarvuti krüpteerinud, tuleb teil selle sisselülitamisel iga kord sisestada numbriline PIN-kood või parool: tahvelarvuti saate dekrüpteerida ainult tehaseandmetele lähtestamisega, mis kustutab kõik teie andmed."\n\n"Krüpteerimine võtab tunni või rohkem. Peate alustama laetud akuga ja hoidma tahvelarvuti ühendatuna, kuni krüpteerimine on lõpetatud. Kui krüpteerimise katkestate, siis kaotate osa andmetest või kõik andmed."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meedia- ja muid faile. Kui olete oma telefoni krüpteerinud, peate selle dekrüpteerimiseks igal sisselülitamisel sisestama numbrilise PIN-koodi või parooli: krüpteerimise mahavõtmiseks tuleb telefon tehaseandmetele lähtestada, mis kustutab kõik teie andmed."\n\n"Krüpteerimine võtab tunni või rohkem. Peate alustama laetud akuga ja hoidma telefoni vooluvõrku ühendatuna, kuni krüpteerimine on lõpetatud. Kui katkestate krüpteerimise, kaotate osa andmetest või kõik andmed."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui tahvelarvuti on krüpteeritud, peate iga kord seadet sisse lülitades selle dekrüpteerimiseks sisestama numbrilise PIN-koodi või parooli. Tahvelarvuti krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed."\n\n"Krüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja tahvelarvuti sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa või kõik oma andmed."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui telefon on krüpteeritud, peate iga kord seda sisse lülitades sisestama dekrüpteerimiseks numbrilise PIN-koodi või parooli. Telefoni krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed."\n\n"Krüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja telefon sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa andmeid või kõik andmed."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krüpteeri tahvelarvuti"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krüpteeri telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laadige akut ja proovige uuesti."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Ühendage laadija ja proovige uuesti."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ekraaniluku PIN-koodi või parooli ei ole"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Enne krüpteerimisega alustamist peate määrama ekraaniluku PIN-koodi või parooli."</string>
-    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Krüpteerimise kinnitamine"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Kas krüpteerida tahvelarvuti? See toiming on pöördumatu ja katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, selle aja jooksul taaskäivitub tahvelarvuti mitu korda."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Kas krüpteerida telefon? See toiming on pöördumatu ja katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, selle aja jooksul taaskäivitub telefon mitu korda."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Enne krüpteerimist peate määrama lukustusekraani PIN-koodi või parooli."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Kas krüpteerida?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krüpteerimistoiming on pöördumatu ja katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, mille jooksul tahvelarvuti taaskäivitub mitu korda."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Krüpteerimistoiming on pöördumatu ja selle katkestamisel kaotate andmed. Krüpteerimiseks kulub tund või rohkem, selle aja jooksul taaskäivitub telefon mitu korda."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Krüpteerimine"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Oodake, kuni teie tahvelarvutit krüpteeritakse. <xliff:g id="PERCENT">^1</xliff:g>% valmis."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Oodake, kuni teie telefon krüpteeritakse. <xliff:g id="PERCENT">^1</xliff:g>% valmis."</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Proovige uuesti <xliff:g id="DELAY">^1</xliff:g> sekundi pärast."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Sisestage parool"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krüptimine ebaõnnestus"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Krüpteerimine katkestati ja seda ei saa lõpuni viia. Seetõttu ei pääse te enam oma tahvelarvutis olevatele andmetele juurde. "\n\n" Tahvelarvuti kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate tahvelarvutit pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontol."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Krüpteerimine katkestati ja seda ei saa lõpuni viia. Seetõttu ei pääse te enam oma telefonis olevatele andmetele juurde. "\n\n"Telefoni kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate telefoni pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontol."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Ekraaniluku valimine"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma tahvelarvutis olevatele andmetele juurde. "\n\n" Tahvelarvuti kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate tahvelarvutit pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma telefonis olevatele andmetele juurde. "\n\n"Telefoni kasutamise jätkamiseks peate selle lähtestama tehaseseadetele. Kui seadistate telefoni pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Sisestusmeetodi vahetamine"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekraaniluku valimine"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valige varukoopia lukk"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekraanilukk"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ekraaniluku muutmine"</string>
@@ -348,9 +353,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Puudub"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Lohistamine"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Mustriga turvatud"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PIN-koodiga turvatud"</string>
-    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Parooliga turvatud"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Muster"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kood"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parool"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Lülita ekraanilukk välja"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eemalda avamismuster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eemalda avamise PIN-kood"</string>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koodis peab olema vähemalt %d tähemärki"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Puudutage käsku Jätka, kui olete lõpetanud"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jätka"</string>
-    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Parool peab olema lühem kui <xliff:g id="NUMBER">%d</xliff:g> tähemärki"</string>
-    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN-kood peab olema lühem kui <xliff:g id="NUMBER">%d</xliff:g> numbrit"</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-kood peab sisaldama ainult numbreid 0–9"</string>
-    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Seadme ülem keelab hiljutise PIN-koodi kasutamise"</string>
-    <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Parool sisaldab lubamatut tähemärki"</string>
-    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Parool peab sisaldama vähemalt ühte tähte"</string>
-    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Parool peab sisaldama vähemalt ühte numbrit"</string>
-    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Parool peab sisaldama vähemalt ühte sümbolit"</string>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parool peab olema lühem kui <xliff:g id="NUMBER">%d</xliff:g> märki."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-kood peab olema lühem kui <xliff:g id="NUMBER">%d</xliff:g> numbrit."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN-kood tohib sisaldada ainult numbreid 0–9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Seadme administraator ei luba kasutada viimast PIN-koodi."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Parool sisaldab lubamatut tähemärki."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Parool peab sisaldama vähemalt üht tähte."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Parool peab sisaldama vähemalt üht numbrit."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Parool peab sisaldama vähemalt üht sümbolit."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"Parool peab sisaldama vähemalt üht tähte"</item>
-    <item quantity="other" msgid="7278096339907683541">"Parool peab sisaldama vähemalt %d tähte"</item>
+    <item quantity="one" msgid="3063853802158131458">"Parool peab sisaldama vähemalt üht tähte."</item>
+    <item quantity="other" msgid="8186027808415585970">"Parool peab sisaldama vähemalt %d tähte."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"Parool peab sisaldama vähemalt ühte väiketähte"</item>
-    <item quantity="other" msgid="588499075580432178">"Parool peab sisaldama vähemalt %d väiketähte"</item>
+    <item quantity="one" msgid="5583986519662091001">"Parool peab sisaldama vähemalt üht väiketähte."</item>
+    <item quantity="other" msgid="2693910942679679225">"Parool peab sisaldama vähemalt %d väiketähte."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"Parool peab sisaldama vähemalt üht suurtähte"</item>
-    <item quantity="other" msgid="2183090598541826806">"Parool peab sisaldama vähemalt %d suurtähte"</item>
+    <item quantity="one" msgid="2611909966725502768">"Parool peab sisaldama vähemalt üht suurtähte."</item>
+    <item quantity="other" msgid="3030801209112209245">"Parool peab sisaldama vähemalt %d suurtähte."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"Parool peab sisaldama vähemalt üht numbrit"</item>
-    <item quantity="other" msgid="995673409754935278">"Parool peab sisaldama vähemalt %d numbrit"</item>
+    <item quantity="one" msgid="3820355568839621231">"Parool peab sisaldama vähemalt üht numbrit."</item>
+    <item quantity="other" msgid="4703982391407595924">"Parool peab sisaldama vähemalt %d numbrit."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"Parool peab sisaldama vähemalt ühte erisümbolit"</item>
-    <item quantity="other" msgid="3047460862484105274">"Parool peab sisaldama vähemalt %d erisümbolit"</item>
+    <item quantity="one" msgid="8456579939292408631">"Parool peab sisaldama vähemalt üht erisümbolit."</item>
+    <item quantity="other" msgid="1221290525051187757">"Parool peab sisaldama vähemalt %d erisümbolit."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"Parool peab sisaldama vähemalt ühte mittetähelist märki"</item>
-    <item quantity="other" msgid="5574191164708145973">"Parool peab sisaldama vähemalt %d mittetähelist märki"</item>
+    <item quantity="one" msgid="4594051152085925921">"Parool peab sisaldama vähemalt üht mittetähelist märki."</item>
+    <item quantity="other" msgid="3952508584649046404">"Parool peab sisaldama vähemalt %d mittetähelist märki."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Seadme ülem keelab hiljutise parooli kasutamise"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Seadme administraator ei luba viimast parooli kasutada."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Tühista"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Tühista"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Järgmine"</string>
-    <string name="lock_setup" msgid="1759001157415978959">"Seadistus on lõpule viidud"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Seadistamine on lõpetatud."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Seadme haldamine"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Seadme ülemad"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Seadme ülemate kuvamine või desaktiveerimine"</string>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Siduda seadmega:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Sisestage seadme nõutav parool:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN-kood sisaldab tähti või sümboleid"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Tavaliselt 0000 või 1234"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Võib-olla peate selle PIN-koodi sisestama ka teise seadmesse."</string>
-    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Võib-olla peate selle parooli sisestama ka teise seadmesse."</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Võib-olla peate selle PIN-koodi sisestama ka teise seadmesse."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Võib-olla peate selle parooli sisestama ka teise seadmesse."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Sidumine seadmega&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Veenduge, et see kuvaks järgmist parooli:&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">"Seadmelt: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Kas siduda seadmega?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Siduda seadmega:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Sisestage:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, seejärel vajutage naasmis- või sisestusklahvi."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Ei saanud seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> siduda vale PIN-koodi või parooli tõttu."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei saa sidet luua."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> hülgas sidumise."</string>
-    <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühendamisel ilmnes probleem."</string>
+    <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei saanud ühendust."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Otsi seadmeid"</string>
     <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Otsi seadmeid"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Otsimine ..."</string>
@@ -478,19 +483,23 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muusika ja meediumi jaoks"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Jäta seaded meelde"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="5237208142892767592">"Lubab andmete vahetust, kui telefon puudutab teist seadet"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Lubab andmete vahetust, kui tahvelarvuti puudutab teist seadet"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lubab andmete vahetust, kui telefon puudutab teist seadet"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Valmis edastama rakenduse sisu NFC kaudu"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Väljas"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Pole saadaval, kuna NFC on välja lülitatud"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Kui see funktsioon on sisse lülitatud, saate rakenduse sisu teise NFC-suutlikku seadmesse kiirega saata, hoides seadmeid üksteise lähedal. Nii saate edastada näiteks brauserilehti, YouTube\'i videoid, inimeste kontakte ja muud."\n\n"Lihtsalt hoidke seadmeid lähestikku (tavaliselt tagused koos) ja siis puudutage seadme ekraani. Rakendus otsustab, mida kiirega edastatakse."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Võrguteenuse avastus"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Luba muudes seadmetes olevatel rakendustel selle seadme rakendusi leida"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Lülitage WiFi sisse"</string>
     <string name="wifi_settings" msgid="1277428034634973011">"WiFi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"WiFi-seaded"</string>
     <string name="wifi_settings_title" msgid="4351120897298124250">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Määra ja halda traadita pääsupunkte"</string>
+    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"WiFi valimine"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"WiFi sisselülitamine ..."</string>
     <string name="wifi_stopping" msgid="244864762599017659">"WiFi väljalülitamine ..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Viga"</string>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Võrke ei saa kontrollida"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Võrguteatis"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Teata mulle, kui avatud võrk on saadaval"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Väldi halba ühendust"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Ära kasuta WiFi-võrku, kui selle Interneti-ühendus on halb"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Väldi halbu ühendusi"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Ära kasuta WiFi-võrku, kui selle Interneti-ühendus on halb"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Sisselülitatud WiFi unerežiimis"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Seade muutmisel tekkis probleem"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Võrgu lisamine"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"WiFi-võrgud"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-nupp"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-i PIN-koodi kirje"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Otsene WiFi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skannimine"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Täpsemalt"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Loo võrguühendus"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unusta võrk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Võrgu muutmine"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Saadavate võrkude kuvamiseks lülitage WiFi sisse."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"WiFi-võrkude otsimine ..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Muu võrk ..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Rohkem"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaatseadistus (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Kuva täpsemad valikud"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"Sisestage PIN-kood pääsupunktist"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS-i seadistamine"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Sisestage PIN-kood <xliff:g id="WPS_PIN">%1$s</xliff:g> pääsupunkti"</string>
-    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS juba käib ja lõpetamiseks võib kümneid sekundeid kuluda"</string>
-    <string name="wifi_wps_failed" msgid="1648418410092969300">"WPS-i käivitamine ebaõnnestus, proovige uuesti."</string>
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Kaitstud WiFi seadistamine"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS-i käivitamine …"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Vajutage marsruuteril nuppu Kaitstud Wi-Fi seadistamine. Selle nimi võib olla ka „WPS” või see võib sisaldada sellist sümbolit:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Sisestage WiFi-ruuteril PIN-kood <xliff:g id="NUMBER">%1$s</xliff:g>. Seadistuse lõpetamiseks võib kuluda kuni kaks minutit."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS õnnestus. Võrguga ühenduse loomine …"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Ühendatud WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS on juba käimas ja selle lõpuleviimiseks võib kuluda kuni kaks minutit"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ebaõnnestus. Proovige mõne minuti pärast uuesti."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Ruuteri turvaseadet (WEP) ei toetata"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Ruuteri turvaseadet (TKIP) ei toetata"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentimine ebaõnnestus. Proovige uuesti."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Tuvastati teine WPS-i seanss. Proovige mõne minuti pärast uuesti."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Võrgu SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Turvalisus"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signaali tugevus"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Salvestatud"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Keelatud"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Halba Interneti-ühendust välditi"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Võrku välditi halva ühenduse tõttu. Funktsiooni väljalülitamiseks tehke jaotises Seaded oleval WiFi-kuval valik Täpsem."</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentimise probleem"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Pole vahemikus"</string>
-    <string name="wifi_wps_available_first_item" msgid="3538912605343585226">"Saadaval on kaitstud võrk"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (kaitstud võrk on saadaval)"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS on saadaval"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS on saadaval"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Puudub"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ühenda"</string>
+    <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Võrguga ühenduse loomine ebaõnnestus"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unusta"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Võrgu unustamine ebaõnnestus"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvesta"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Võrgu säilitamine ebaõnnestus"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Tühista"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Tuvastati teine kaitstud WiFi-seanss. Proovige mõne minuti pärast uuesti."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Täpsemad WiFi-seaded"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"WiFi sagedusriba"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tegevuse sagedusvahemiku määramine"</string>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Lüüs"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Võrgu prefiksi pikkus"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Otsene WiFi"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Partnervõrgu ühenduse seadistamine"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"WiFi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Seadme teave"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Kaitstud WiFi seadistamine"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Sisestage PIN-kood"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Pea see ühendus meeles"</string>
-    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Otsing"</string>
-    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Loo rühm"</string>
-    <string name="wifi_p2p_menu_remove_group" msgid="4844634506540667517">"Eemalda grupp"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Täpsemalt"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Saadaolevad seadmed"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Otsi seadmeid"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Otsing …"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Nimeta seade ümber"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Võrdõigusvõrgu seadmed"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Ühenduse loomine ebaõnnestus."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Seadme ümbernimetamine ebaõnnestus."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Kas katkestada ühendus?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Kui katkestate ühenduse, siis katkeb ühendus seadmega <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Kui katkestate ühenduse, siis lõpeb ühendus seadmega <xliff:g id="PEER_NAME">%1$s</xliff:g> ja veel <xliff:g id="PEER_COUNT">%2$s</xliff:g> seadmega."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kas tühistada kutse?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Kas soovite tühistada kutse kasutajaga <xliff:g id="PEER_NAME">%1$s</xliff:g> ühenduse loomiseks?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kantav WiFi-tööpunkt"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Kantav tööpunkt <xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivne"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kantava WiFi-tööpunkti viga"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Seadistage WiFi-tööpunkt"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"WiFi leviala seadistamine"</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> kantav WiFi-tööpunkt"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Kuva"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Hääletu režiim"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefoni helin"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Helitugevused"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muusikaefektid"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Helina helitugevus"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreeri hääletus režiimis"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibreerimine ja helin"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Vaikimisi teade"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuv teatise tuli"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Helin"</string>
@@ -614,6 +637,11 @@
     <string name="volume_ring_description" msgid="5936851631698298989">"Helin ja teated"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Teated"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmid"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Helinate ja teatiste summutamine"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Muusika ja muude meediumide summutamine"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Teatiste summutamine"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Äratuste summutamine"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibreerimine helina ajal"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dokk"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Doki seaded"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Heli"</string>
@@ -623,14 +651,14 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon dokkimata"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ühendatud doki seaded"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dokki ei leitud"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="9015625921245904495">"Peate enne doki heli seadistamist tahvelarvuti dokkima."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Peate enne doki heli seadistamist telefoni dokkima."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Enne doki heli seadistamist peate tahvelarvuti dokkima."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Enne doki heli seadistamist peate telefoni dokkima."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dokki sisestamise heli"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Esita heli tahvelarvuti sisestamisel dokki või sellest eemaldamisel"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Esita heli telefoni sisestamisel dokki või sellest eemaldamisel"</string>
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ära esita heli tahvelarvuti sisestamisel dokki või sellest eemaldamisel"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ära esita heli telefoni sisestamisel dokki või sellest eemaldamisel"</string>
-    <string name="sync_settings" msgid="9186125469300013491">"Kontod ja sünkroonimine"</string>
+    <string name="account_settings" msgid="6403589284618783461">"Kontod"</string>
     <string name="search_settings" msgid="1910951467596035063">"Otsing"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Otsinguseadete ja -ajaloo haldamine"</string>
     <string name="display_settings" msgid="7965901687241669598">"Kuva"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Minu telefoninumber"</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-i versioon"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL-versioon"</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">"Mobiilsidevõrgu tüüp"</string>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Kas kustutada kogu teie isiklik teave ja allalaaditud rakendused? Seda toimingut ei saa tagasi võtta."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Kustuta kõik"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Joonistage oma avamismuster"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Tehaseandmete lähtestamise kinnitamiseks peate koostama avamismustri."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Tehaseandmetele lähtestamise kinnitamiseks peate joonistama avamismustri."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Lähtestust ei tehtud, sest süsteemi kustutamise teenus pole saadaval."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Kas lähtestada?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Kustuta USB-mäluseade"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Kas soovite SD-kaardi tühjendada, kustutades kõik sinna salvestatud failid? Toimingut ei saa tagasi võtta."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Kustuta kõik"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Joonistage oma avamismuster"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"USB-mäluseadme kustutamise kinnitamiseks peate koostama avamismustri."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"SD-kaardi kustutamise kinnitamiseks peate koostama avamismustri."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB-salvestusruumi kustutamise kinnitamiseks peate joonistama avamismustri."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD-kaardi kustutamise kinnitamiseks peate joonistama avamismustri."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Kõneseaded"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Seadista kõnepost, kõne edastamine, ootel kõne, helistaja ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB jagamine"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiilsidevõrgud"</string>
     <string name="location_title" msgid="1029961368397484576">"Minu asukoht"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google\'i asukohateenus"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Rakendustel teie ligilähedase asukoha määramiseks WiFi ja mobiilsidevõrkude andmete kasutamise lubamine"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Lubage saata Google\'ile anon. andmed. Lubage rakend. kasut. andmeid allikatest, nagu WiFi- ja mobiilsidev., et määr. oma asukoht."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"WiFi määratud asukoht"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-i satelliidid"</string>
     <string name="location_street_level" msgid="4244496898967415234">"Lubage rakendustel teie täpse asukoha määramiseks kasutada GPS-i"</string>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Abi saamiseks vajutage valikut Menüü."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Tõsta sõrm, kui on valmis."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Ühendage vähemalt <xliff:g id="NUMBER">%d</xliff:g> punkti. Proovige uuesti:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Muster on salvestatud."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Muster on salvestatud."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Koosta muster kinnitamiseks uuesti:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Teie uus avamismuster:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Kinnita"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Järgmine"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tahvelarvuti turvaliseks muutmine"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Telefoni turvaliseks muutmine"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Kaitske oma tahvelarvutit volitamata kasutamise eest, luues ekraani avamiseks isikliku mustri. Järgmisel ekraanil ühendage sõrmega punktid mis tahes järjekorras. Peate ühendama vähemalt neli punkti. "\n\n"Kas olete valmis alustama? Puudutage valikut Järgmine."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Kaitske oma tahvelarvutit volitamata kasutamise eest, luues ekraani isikliku avamismustri. Järgmisel ekraanil ühendage sõrmega punktid mis tahes järjekorras. Peate ühendama vähemalt neli punkti. "\n\n"Kas olete valmis alustama? Puudutage valikut Järgmine."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Kaitske oma telefoni volitamata kasutamise eest, luues ekraani isikliku avamismustri. Järgmisel ekraanil ühendage sõrmega mis tahes järjekorras vähemalt neli punkti. "\n\n"Kas olete valmis alustama? Puudutage valikut Järgmine."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Halda rakendusi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installitud rakenduste haldamine ja eemaldamine"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Rakenduste haldamine, kiirkäivituse otseteede seadistamine"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Rakenduse seaded"</string>
     <string name="install_applications" msgid="4872012136210802181">"Tundmatud allikad"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Luba mitte-Marketi rakenduste installimine"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Luba tundmatutest allikatest pärinevate rakenduste installimine"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Teie tahvelarvuti ja isikuandmed on haavatavamad rünnakutele rakenduste kaudu, mis pärinevad tundmatutest allikatest. Nõustute, et olete ainuisikuliselt vastutav tahvelarvuti kahjustuste või andmekao eest, mis võivad tuleneda nende rakenduste kasutamisest."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefon ja isiklikud andmed on rünnakute suhtes haavatavamad tundmatutest allikatest pärit rakenduste kaudu. Nõustute, et olete ainuisikuliselt vastutav telefoni kahjustuste või andmekao eest, mis võivad tuleneda nende rakenduste kasutusest."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Täpsemad seaded"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Rakenduse teave"</string>
     <string name="storage_label" msgid="8700867073480107253">"Mäluruum"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Vaikekäivitus"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Vaikeseaded"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Ekraani ühilduvus"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Load"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Vahemälu"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Kustuta andmed"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Desinstalli värskendused"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Olete otsustanud selle rakenduse mõne toimingu puhul käivitada vaikimisi."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Olete lubanud sellel rakendusel vidinaid luua ja nende andmetele juurde pääseda."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Vaikeväärtused pole määratud."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Kustuta vaikeväärtused"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"See rakendus ei pruugi teie ekraanile sobida. Sobivust saate kontrollida siin."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sordi suuruse järgi"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Kuva töötavad teenused"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Kuva vahemällu salvestatud protsessid"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Läht. rakend. eelistused"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Läht. rakend. eelistused?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"See lähtestab kõik eelistused rakendusele:"\n\n" "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduste teatised"</li>\n" "<li>"Vaikerakendused toimingutele"</li>\n" "<li>"Taustaandmete piirangud rakendustele"</li>\n\n" Te ei kaota mingeid rakenduse andmeid."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Lähtesta rakendused"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Halda ruumi"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtrivalikute valimine"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"See rakendus pääseb teie tahvelarvutis juurde järgmisele:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Sel rakendusel on teie telefonis järgmised juurdepääsuõigused:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Arvutamine ..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"Paketi suurust ei saa arvutada"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"Paketi suurust ei saanud arvutada."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Teil pole ühtegi kolmanda osapoole rakendust installitud."</string>
     <string name="version_text" msgid="9189073826278676425">"versioon <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Teisalda"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Muutke uute rakenduste eelistatud installiasukohta"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Kas keelata sisseeh. rakendus?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Kui keelate sisseehitatud rakenduse, võivad muud rakendused valesti käituda."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Kas lülitada teatised välja?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Kui lülitate selle rakenduse teatised välja, võivad olulised märguanded ja värskendused märkamata jääda."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Kasutatud mälu"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vaadake rakenduste kasutatavat mälu"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Käitatud teenused"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"See sisestusmeetod võib koguda kogu teie sisestatava teksti, sh isikuandmed (nt paroolid ja krediitkaardinumbrid). See pärineb rakendusest <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Kas soovite seda sisestusmeetodit kasutada?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"See õigekirjakontrollija võib koguda kogu sisestatava teksti, sh isiklikud andmed (nt paroolid ja krediitkaardinumbrid). See pärineb rakendusest <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Kas soovite seda õigekirjakontrolli kasutada?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Seaded"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Keel"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Rakenduse <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> seadete avamine ebaõnnestus"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Hiir/puuteplaat"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kursori kiirus"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Mängukontroller"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Kasuta värinat"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Suunab värina mängukontrollerisse, kui see on ühendatud."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Klaviatuuri paigutuse valimine"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Seadista klaviatuuri paigutus"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Vahetamiseks vajutage Ctrl+tühikut"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Vaikepaigutus"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klaviatuuri paigutused"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kasutajasõnastik"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Isiklik sõnastik"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Isiklikud sõnastikud"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lisa"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lisa sõnastikku"</string>
+    <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"Fraas"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Rohkem valikuid"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Vähem valikuid"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Sõna:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Otsetee:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Keel:"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Muuda sõna"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Muuda"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Kustuta"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"Teie kasutajasõnastikus ei ole ühtegi sõna. Sõna saate lisada, puudutades nuppu Lisa (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Kõik keeled"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Kõikides keeltes"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Rohkem keeli ..."</string>
     <string name="testing" msgid="6584352735303604146">"Testimine"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Teave tahvelarvuti kohta"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoni andmed"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Rakenduse arenduse valikute määramine"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB silumine"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Silumisrežiim, kui USB on ühendatud"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Arendusseadme ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Seadme teave ei ole saadaval"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Jää sisselülitatuks"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekraan ei lähe kunagi laadimise ajal unerežiimi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Luban USB silumise?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-silumine on mõeldud ainult arendamiseks. Kasutage seda andmete kopeerimiseks oma arvuti ja seadme vahel, seadmesse rakenduste installimiseks ilma teatisteta ning logiandmete lugemiseks."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Kas lubada arendajaseaded?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Need seaded on mõeldud ainult arendajatele. Need võivad põhjustada seadme ja seadmes olevate rakenduste rikkeid või valesti toimimist."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Kaitse USB-salvestusruumi"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Rakendused peavad USB-salvestusruumi lugemiseks loa taotlema"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Kas kaitsta USB-salvestusruumi?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kui USB-salvestusruum on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema."\n\n"Mõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Kaitse SD-kaarti"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Rakendused peavad SD-kaardi lugemiseks loa taotlema"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Kas kaitsta SD-kaarti?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kui SD-kaart on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema."\n\n"Mõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Valige vidin"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Valige vidin"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Kas luua vidin ja lubada juurdepääs?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Pärast vidina loomist saab <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> juurdepääsu kõikidele kuvatavatele andmetele."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Luba rakendusel <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> alati vidinaid luua ja nende andmetele juurdepääs hankida"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> p <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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Suur tekst"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Toitenupp lõpetab kõne"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Öelge paroolid"</string>
-    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Puudutusega uurimine"</string>
-    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"Kui teenus Explore by Touch on sisse lülitatud, kuulete või näete kirjeldust selle kohta, mis on teie sõrme all."\n\n" See funktsioon on mõeldud kehva nägemisega kasutajatele."</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Puudutage ja hoidke viivitust"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Veebiskriptide installimine"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Veebijuurdepääsu täiustamine"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Seaded"</string>
-    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Õpetused"</string>
     <string name="accessibility_service_state_on" msgid="8791337599927106344">"Sees"</string>
     <string name="accessibility_service_state_off" msgid="2458594460762620776">"Väljas"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Lubatud"</string>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ühtki teenust pole installitud"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Kas vajate ekraanilugejat?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack esitab tagasiside suulise kõnena, mis aitab pimedaid ja vaegnägijaid. Kas soovite selle Android Marketist tasuta installida?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Kas soovite veebiskriptid installida?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Kas lubate rakendustel installida Google\'ist pärinevaid skripte, mis muudavad veebisisu kättesaadavamaks?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Funktsioon muudab seda, kuidas seade puudutustele reageerib. Kas soovite sisse lülitada?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Kirjeldust ei ole sisestatud."</string>
     <string name="settings_button" msgid="3006713718908152930">"Seaded"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Aku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mis on akut kasutanud"</string>
-    <string name="power_usage_not_available" msgid="3583407442633768046">"Aku kasutusandmed pole saadaval"</string>
+    <string name="power_usage_not_available" msgid="3214000535532434353">"Aku andmed pole saadaval."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akukasutus alates lahutamisest"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Akukasutus alates lähtestamisest"</string>
@@ -1285,7 +1346,7 @@
     <string name="tts_install_data_summary" msgid="5742135732511822589">"Installi kõnesünteesi jaoks vajalikud hääleandmed"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Kõnesünteesi jaoks vajalikud hääled on juba installitud."</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Teie seadeid on muudetud. See on näide, kuidas need võiks kõlada."</string>
-    <string name="tts_engine_error" msgid="5513288178403066867">"Valitud mootor ei käivitu"</string>
+    <string name="tts_engine_error" msgid="3305141107104670703">"Valitud mootorit ei saa käitada."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Seadista"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vali teine ​​mootor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"See kõnesünteesimootor võib koguda kogu kõneldud teksti, sh isiklikke andmeid, nagu paroolid ja krediitkaardinumbrid. Selle aluseks on mootor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Kas lubada kõnesünteesimootori kasutamine?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Naine"</string>
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mees"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Kõnesünteesimootor on installitud"</string>
-    <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Luba uus mootor enne kasutamist"</string>
+    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"Lubage enne kasut. uus mootor."</string>
     <string name="tts_engine_settings_button" msgid="1030512042040722285">"Käivita mootori seaded"</string>
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Eelistatud mootor"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Üldine"</string>
@@ -1318,6 +1379,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Kõikide sertifikaatide eemaldamine"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Usaldusväärsed mandaadid"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Usaldusväärsete CA-sertifikaatide kuvamine"</string>
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Joonistage oma luku avamise muster"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Mandaadi installimise kinnitamiseks tuleb teil joonistada luku avamise muster."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Sisestage mandaadi salvestamise parool."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kehtiv parool:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Mandaatide mälu kustutatakse."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Mand. mälu ei saanud kustut."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Mandaadi mälu on lubatud."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Peate enne mandaadi mälu kasutamist määrama lukustusekraani PIN-koodi või parooli."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Enne mandaatide salvestusruumi kasutamist peate määrama lukustusekraani PIN-koodi või parooli."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Hädaabitoon"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Määra käitumine hädaabikõne korral"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Varundamine ja lähtestamine"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaatne taastamine"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Rakenduse uuesti installimisel taasta varundatud seaded ja andmed"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Arvutivarunduse parool"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Täielikud arvuti varundused ei ole praegu kaitstud."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Valige see täielike arvutivarunduste parooli muutmiseks või eemaldamiseks"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Täielikud arvutivarundused pole praegu kaitstud"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Puudutage, et muuta või eemaldada täielike arvutivarunduste parool"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Kas soovite WiFi paroolide, järjehoidjate, muude seadete ja rakenduste andmete varundamise lõpetada ja kõik Google\'i serverites olevad koopiad kustutada?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Seadme haldusseaded"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"See administraator on aktiivne ja lubab rakendusel <xliff:g id="APP_NAME">%1$s</xliff:g> teha järgmisi toiminguid:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Pealkirjata"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Üldine"</string>
-    <string name="sound_category_calls_and_notification_title" msgid="4703470169010662085">"Helin ja teated"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Teatised"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Süsteem"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Kõne helin ja vibratsioon"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"Süsteem"</string>
     <string name="wifi_setup_title" msgid="661074868726906436">"WiFi seadistamine"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g> ühenduse loomine"</string>
     <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g> ühenduse loomine ..."</string>
@@ -1393,7 +1456,9 @@
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sünkroonimine lubatud"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sünkroonimine keelatud"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sünkroonimise viga"</string>
-    <string name="account_sync_settings_title" msgid="4578227872921044660">"Sünkroonimisseaded"</string>
+    <string name="sync_failed" msgid="1696499856374109647">"Sünkroonimine ebaõnnestus"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sünkroonimine on aktiivne"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Sünkroonimine"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Sünkroonimisega on praegu probleeme. See on varsti tagasi."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Lisa konto"</string>
     <string name="background_data" msgid="5779592891375473817">"Taustaandmed"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Sünkroonim. on SEES"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sünkroonimine VÄLJAS"</string>
     <string name="sync_error" msgid="5060969083117872149">"Sünkroonimise viga"</string>
+    <string name="last_synced" msgid="4242919465367022234">"Viimati sünkroonitud <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Sünkroonimine ..."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Varunda seaded"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Minu seadete varundamine"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sünkrooni kohe"</string>
@@ -1413,7 +1480,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontaktid"</string>
-    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Tere tulemast Google Synci!"</font>" "\n"See on Google\'i meetod andmete sünkroonimiseks, et pääseksite kontaktidele, kokkusaamistele ja enamale kõikjalt juurde."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Tere tulemast Google Synci!"</font>" "\n"See on Google\'i meetod andmete sünkroonimiseks, mis tagab teile kõikjal juurdepääsu kontaktisikutele, kokkusaamistele ja muule."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Rakenduse sünkroonimisseaded"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Andmed ja sünkroonimine"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Parooli muutmine"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"See konto on mõne rakenduse jaoks vajalik. Saate selle eemaldada vaid siis, kui lähtestate tahvelarvuti tehaseseadetele (sel juhul kustutatakse kõik teie isikuandmed) asukohas Seaded &gt; Varundamine ja lähtestamine."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"See konto on mõne rakenduse jaoks vajalik. Saate selle eemaldada vaid siis, kui lähtestate telefoni tehaseseadetele (sel juhul kustutatakse kõik teie isikuandmed) asukohas Seaded &gt; Varundamine ja lähtestamine."</string>
     <string name="provider_label" msgid="7724593781904508866">"Vajutage tellimusi"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"Sünkroonimine: <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Ei saa käsitsi sünkroonida"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Selle üksuse sünkroonimine on praegu keelatud. Seade muutmiseks lülitage ajutiselt sisse taustaandmed ja automaatne sünkroonimine."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G seaded"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-aadress"</string>
     <string name="enter_password" msgid="4131758584074246224">"Mälu dekrüpteerimiseks sisestage parool"</string>
     <string name="try_again" msgid="4272075051293936921">"Proovige uuesti."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Teenus on hõivatud. Proovige uuesti."</string>
     <string name="delete" msgid="4219243412325163003">"Kustuta"</string>
     <string name="misc_files" msgid="6720680815969643497">"Mitmesugused failid"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"valitud <xliff:g id="NUMBER">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"Vali kõik"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontrollimine"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP käitumise määramine"</string>
-    <string name="debug_ui_category" msgid="9023948280291055349">"Kasutajaliides"</string>
+    <string name="debug_debugging_category" msgid="6781250159513471316">"Silumine"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Valige silumisrakendus"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Ühtegi silumisrakendust pole määratud"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Silumisrakendus: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Rakenduse valimine"</string>
+    <string name="no_application" msgid="2813387563129153880">"Mitte ühtegi"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Oodake silurit"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Silutud rakendus ootab toimimiseks siluri lisamist"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Sisend"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Joonis"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Jälgimine"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Range režiim on lubatud"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Ekr. vilgub, kui rakend. teevad peateemal toiming."</string>
     <string name="pointer_location" msgid="6084434787496938001">"Kursori asukoht"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Praegusi puuteandmeid kuvav ekraani ülekate"</string>
     <string name="show_touches" msgid="1356420386500834339">"Näita puuteid"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Kuva visuaalset tagasisidet puudete kohta"</string>
-    <string name="show_screen_updates" msgid="8282711794220426931">"Kuva ekraanivärskendused"</string>
-    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Värskendamisel nende ekraani alade vilgutamine"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Näita pinna värskendusi"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Akna pinna värskendam. kirjuta kogu akna pind üle"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Näita GPU kuva värskend."</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU-ga joonistades kirjuta akende kuvad üle"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Keela HW ülekatted"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Kasuta alati GPU-d kuva koostamisel"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Luba jälgimine"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Vali lubatud jälgimised"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Praegu pole lubatud ükski jälgimine"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> jälgimist on praegu lubatud"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Kõik jälgimised on praegu lubatud"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Näita paigutuse piire"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Kuva klipi piirid, veerised jms"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-kasutuse kuvamine"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Praegust CPU-kasutust kuvav ekraani ülekate"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Jõusta GPU renderdamine"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Rakenda rakendustes 2D-riistvarakiirendust"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Jõusta GPU kasutam. kahemõõtmeliste jooniste puhul"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profiili GPU renderdamine"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mõõda renderdusaega adb-kestas: dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Akna animatsiooni skaala"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Ülemineku animats. skaala"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animaatori kestuse skaala"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Rakendused"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ära hoia tegevusi alles"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Kõigi tegev. hävit. kohe, kui kasutaja neist lahk."</string>
@@ -1471,13 +1562,14 @@
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Eraldi 4G kasutamine"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"WiFi kasutamise kuvamine"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Kuva Etherneti-kasutus"</string>
+    <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobiilside leviala"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Andmete automaatne sünkroonimine"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Tsükli muutmine ..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Kuupäev andmekasutustsükli lähtestamiseks:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Sel perioodil ei kasut. andmeid ükski rakendus."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Esiplaan"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Taust"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Mõõdab teie tahvelarvuti. Teie teenusepakkuja andmekasut. arvestus võib erineda."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Mõõdab teie telefon. Teie teenusepakkuja andmekasutuse arvestus võib erineda."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"piiratud"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Kas soovite mobiilse andmeside keelata?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Seadke mobiilandmeside piirang"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Määrake 4G andmemahupiirang"</string>
@@ -1488,33 +1580,45 @@
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobiil"</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">"mobiil"</string>
-    <string name="data_usage_list_none" msgid="2899530183512542206">"puudub"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobiilne"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Mitte ükski"</string>
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobiiliandmed"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G–3G-andmeside"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G-andmeside"</string>
     <string name="data_usage_app_settings" msgid="8430240158135453271">"Kuva rakenduse seadeid"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Piira taustaandmeid"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Keela taustandmed vaid mobiilse andmeside võrgus. Võimalusel kasutatakse WiFit."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Keelab mobiilsidevõrkude taustaandmed. Võimalusel kasutatakse muid võrke."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Rakend. taustandm. piiramiseks määrake mob. andmeside piirang."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Kas soovite taustandmeid piirata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Funktsiooni tõttu võivad WiFi puudumisel lakata töötamast rakendused, mis sõltuvad taustandmetest."\n\n"Täpsemad andmekasutuse valikud leiate rakenduse seadetest."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Funktsiooni tõttu võivad taustaandmetel põhinev rakendus töötamast lakata, kui saadaval on ainult mobiilsidevõrgud."\n\n"Andmekasutuse täpsemad juhtelemendid leiate rakenduse seadetest."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Taustandmete piiramine on võimalik vaid juhul, kui olete määranud mobiilse andmeside piirangu."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Kas lülitan andmete automaatse sünkroonimise sisse?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Veebis kontodel tehtud muudatused kopeeritakse automaatselt teie tahvelarvutisse."\n\n"Mõned kontod võivad ka kõik tahvelarvutis tehtud muudatused automaatselt veebi kopeerida. Google\'i konto töötab nii."\n\n"Igal kontol sünkroonitava teabe valimiseks avage jaotis Seaded &gt; Kontod."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Veebis kontodel tehtud muudatused kopeeritakse automaatselt teie telefoni."\n\n"Mõned kontod võivad ka kõik telefonis tehtud muudatused automaatselt veebi kopeerida. Google\'i konto töötab nii."\n\n"Igal kontol sünkroonitava teabe valimiseks avage jaotis Seaded &gt; Kontod."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Kas lülitan andmete automaatse sünkroonimise välja?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"See säästab andmemahu ja aku kasutust, kuid teil tuleb hiljutise teabe hankimiseks sünkroonida iga konto eraldi ja värskenduste ilmumisel ei kuvata teatist."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Kasutustsükli lähtestuskuupäev"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Igakuine kuupäev:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Määra"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Andmekasutuse hoiatuse määramine"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Andmekasutuse piirangu määramine"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Andmekasutuse piiramine"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Määratud limiidi saavutamisel keelatakse võrgu (<xliff:g id="NETWORKS">%1$s</xliff:g>) andmeühendus."\n\n"Kaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie tahvelarvuti ja teenusepakkuja võib arvestada kasutust teisiti."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Määratud limiidi saavutamisel keelatakse võrgu (<xliff:g id="NETWORKS">%1$s</xliff:g>) andmeühendus."\n\n"Kaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie telefon ja teenusepakkuja võib arvestada kasutust teisiti."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Määratud limiidi saavutamisel keelatakse mobiilne andmesideühendus."\n\n"Kaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie tahvelarvuti ja teenusepakkuja võib arvestada kasutust teisiti."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Määratud limiidi saavutamisel keelatakse mobiilne  andmesideühendus."\n\n"Kaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie telefon ja teenusepakkuja võib arvestada kasutust teisiti."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Kas soovite taustandmeid piirata?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Kui piirate mobiilside taustandmed, siis WiFi-võrgu puudumisel mõned rakendused ja teenused ei tööta."</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">"hoiatus"</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">"piir"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Eemaldatud rakendused"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> vastu võetud, <xliff:g id="SENT">%2$s</xliff:g> saadetud"</string>
-    <string name="data_usage_total_during_range" msgid="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: kasutatud umbes <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: kasutatud umbes <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: tahvelarvuti mõõdetud kasutus u <xliff:g id="TOTAL">%1$s</xliff:g>. Oper. andmekasutuse arvestus võib erineda."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: telef. mõõdetud kasutus on u <xliff:g id="TOTAL">%1$s</xliff:g>. Operaatori andmekasutuse arvestus võib erineda."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobiilside leviala"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Valige WiFi-võrgud, mis töötavad mobiilside levialadena. Taustarakendusi on võimalik takistada neid võrke kasutamast. Teid võidakse enne hoiatada, kui rakendused laadivad võrkude kaudu alla mahukaid üksusi."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiilsidevõrgud"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WiFi-võrgud"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Mobiilside levialade valimiseks lülitage WiFi sisse."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hädaabikõne"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tagasi kõne juurde"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nimi"</string>
@@ -1540,12 +1644,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Tühista"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Salvesta"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Ühenda"</string>
-    <string name="vpn_edit" msgid="1111459297288136079">"VPN-võrgu muutmine"</string>
-    <string name="vpn_connect_to" msgid="7328758950427515753">"Ühenduse loomine võrguga <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"VPN-i profiili muutmine"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Profiiliga <xliff:g id="PROFILE">%s</xliff:g> ühendamine"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <string name="vpn_create" msgid="8966010925994175306">"VPN-võrgu lisamine"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Muuda võrku"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Kustuta võrk"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"VPN-i profiili lisamine"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Muuda profiili"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Kustuta profiil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Võrguühendus puudub. Proovige hiljem uuesti."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Sertifikaat on puudu. Muutke profiili."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Süsteem"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Kasutaja"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Keela"</string>
@@ -1554,25 +1660,7 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Kas lubada süsteemi CA-sertifikaat?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Kas keelata süsteemi CA-sertifikaat?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Kas eemaldada kasutaja CA-sertifikaat jäädavalt?"</string>
-    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Hõlbustuse õpetused"</string>
-    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Järgmine"</string>
-    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Tagasi"</string>
-    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Lõpeta"</string>
-    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Jäta õpet."</string>
-    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Õppetund 1: ekraaniga tutvumine"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Pärast valiku „Puudutusega uurimine” sisselülitamist saate ekraanil puudutatu kohta teavet. Näiteks praegusel ekraanil on rakenduste ikoonid. Leidke üks neist, puudutades ekraani ja libistades sõrme."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Väga hea. Libistage sõrme ekraanil ringi, kuni leiate veel vähemalt ühe ikooni."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Kui soovite aktiveerida seda, mida puudutate, siis koputage sellel. Libistage sõrme, kuni leiate rakenduse <xliff:g id="APP_NAME">%s</xliff:g> ikooni. Seejärel puudutage ikooni üks kord selle aktiveerimiseks."</string>
-    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Teie sõrm puudutab rakenduse <xliff:g id="APP_NAME">%s</xliff:g> ikooni. Ikooni aktiveerimiseks puudutage üks kord."</string>
-    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Teie sõrm liikus üle rakenduse <xliff:g id="APP_NAME">%s</xliff:g> ikooni ja seejärel eemale. Libistage oma sõrme aeglaselt ekraanil, kuni leiate uuesti brauseriikooni."</string>
-    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Väga hea. Järgmisele õppetunnile liikumiseks leidke ja aktiveerige nupp <xliff:g id="NEXT">%s</xliff:g>, mis asub ekraani paremas alanurgas."</string>
-    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Õppetund 2: kahe sõrme abil kerimine"</string>
-    <string name="accessibility_tutorial_lesson_2_text_1" msgid="8764686624055084454">"Loendis sirvimiseks võite libistada kaht sõrme üle ekraani. Näiteks sisaldab praegune ekraan rakenduste nimede loendit, mida saab kerida üles või alla. Kõigepealt püüdke loendis leida mõned üksused, libistades üht sõrme ümberringi."</string>
-    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Väga hea. Libistage sõrmega edasi ringi, et leida veel vähemalt üks üksus."</string>
-    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Nüüd asetage kaks sõrme loendis olevale üksusele ja libistage sõrmi ülespoole. Kui jõuate ekraani ülaossa, tõstke sõrmed üles, asetage loendis allapoole ja korrake üleslibistamist."</string>
-    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Väga hea. Libistage sõrmi ülespoole, et veel veidi kerida."</string>
-    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3055831259260848004">"Jõudsite õpetustega lõpule. Väljumiseks puudutage nuppu <xliff:g id="FINISH">%s</xliff:g>."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Õigekirjakontroll"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Õigekirjakontroll"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Sisestage oma täieliku varukoopia praegune parool siia"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Sisestage täielike varukoopiate uus parool siia"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Sisestage siia uuesti oma täieliku varukoopia uus parool"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Tühista"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Süsteemi lisavärskendused"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Kasutajad ja piirangud"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Kasutajad"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Kasutaja lisamine"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Üksikasjade muutmine"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Kasutaja teave"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nimi"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Sisu piirangud"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Nõuab PIN-koodi"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Sisu hinnang"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Süsteemi rakendused"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installitud rakendused"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Loobumine"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Kasutaja eemaldamine"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Tüütu laps"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Kas eemaldada kasutaja?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Kas soovite kindlasti eemaldada seadmest kasutaja ja kõik seotud andmed?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Kuva teatised"</string>
+    <string name="help_label" msgid="1107174367904110532">"Abi"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index d71d5d7..4c6b973 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"در حال قطع اتصال..."</item>
     <item msgid="1634960474403853625">"اتصال قطع شد"</item>
     <item msgid="746097431216080650">"ناموفق"</item>
+    <item msgid="6367044185730295334">"مسدود شده"</item>
+    <item msgid="503942654197908005">"جلوگیری موقت از اتصال ضعیف"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"اتصال قطع شد از <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"اتصال قطع شد"</item>
     <item msgid="8578370891960825148">"ناموفق"</item>
+    <item msgid="5660739516542454527">"مسدود شده"</item>
+    <item msgid="1805837518286731242">"جلوگیری موقت از اتصال ضعیف"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"فشار دکمه"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"هیچکدام"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"پین از نقطه دسترسی"</item>
-    <item msgid="7364462169350112617">"پین از این دستگاه"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"آمار"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"کارت SD جدا شدنی"</item>
     <item msgid="4498124044785815005">"سیستم تصمیم بگیرد"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"خاموش"</item>
-    <item msgid="4804571292609523335">"لرزش"</item>
-    <item msgid="595707141547423573">"بیصدا کردن"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"کوتاه"</item>
     <item msgid="2560532955514699713">"متوسط"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"مقیاس انیمیشن 5x"</item>
     <item msgid="6660750935954853365">"مقیاس انیمیشن 10X"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"انیمیشن خاموش"</item>
+    <item msgid="1138649021950863198">"مقیاس انیمیشن 0.5 برابر"</item>
+    <item msgid="4394388961370833040">"مقیاس انیمیشن 1 برابر"</item>
+    <item msgid="8125427921655194973">"مقیاس انیمیشن 1.5 برابر"</item>
+    <item msgid="3334024790739189573">"مقیاس انیمیشن 2 برابر"</item>
+    <item msgid="3170120558236848008">"مقیاس انیمیشن 5 برابر"</item>
+    <item msgid="1069584980746680398">"مقیاس انیمیشن 10 برابر"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"حد استاندارد"</item>
     <item msgid="4071574792028999443">"بدون پردازش در پس‌زمینه"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7b1d710..9d0a7be 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"بله"</string>
     <string name="no" msgid="6731231425810196216">"خیر"</string>
+    <string name="create" msgid="3578857613172647409">"ایجاد"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ممانعت از استفاده شماره گیر بلوتوث هنگام قفل شدن صفحه"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"دستگاه های بلوتوث"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"نام دستگاه"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"تنظیمات دستگاه"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"تنظیمات نمایه"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"نامی تنظیم نشده، از نام حساب استفاده کنید"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"اسکن برای دستگاه ها"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"تغییر نام رایانه لوحی"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"در حال جفت سازی..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"دستگاه بلوتوث بدون نام"</string>
     <string name="progress_scanning" msgid="192587958424295789">"در حال جستجو"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"لمس برای مرتبط‌سازی"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"هیچ دستگاه بلوتوثی در این نزدیکی یافت نشد."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"درخواست جفت سازی"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"درخواست جفت سازی"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"لمس کردن برای مرتبط‌سازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"لمس کردن برای مرتبط‌سازی با <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="device_picker" msgid="8398232791303186677">"انتخاب‌گر دستگاه بلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"درخواست مجوز بلوتوث"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"برنامه‌ای می‌خواهد بلوتوث را روشن کند. اجازه می‌دهید؟"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"برنامه‌ای در رایانه لوحی شما می‌خواهد رایانه شما را به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه توسط دستگاه‌های بلوتوث دیگر قابل شناسایی کند. اجازه می‌دهید؟"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"برای اتصال به \"<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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"تأیید"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"نام میزبانی که وارد کرده‌اید معتبر نیست."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"لیست موارد استثنایی که تایپ کردید به نحو صحیح قالب‌بندی نشده است. لطفاً لیستی از دامنه‌های استثنای جدا شده با کاما را تایپ کنید."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"باید قسمت درگاه را پر کنید."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"باید قسمت درگاه را پر کنید."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"اگر قسمت میزبان خالی است، قسمت درگاه باید خالی باشد."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"درگاهی که وارد کردید معتبر نیست."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"از پروکسی HTTP توسط مرورگرها استفاده می‌شود اما ممکن است توسط برنامه‌های دیگر استفاده نشود."</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"تغییرات با اتصال مجدد USB اعمال می شوند"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"تغییرات با اتصال مجدد کابل 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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"حافظه USB متصل نیست."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"کارت 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="6691584887397909775">"اکنون می‌توانید حافظه USB را با امنیت کامل جدا کنید"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"اکنون می‌توانید کارت SD را با امنیت کامل جدا کنید"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"حافظه USB در حال استفاده بعنوان دستگاه حافظه انبوه است."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"کارت SD در حال استفاده بعنوان دستگاه ذخیره سازی انبوه است."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"اکنون می‌توانید حافظه USB را با امنیت کامل خارج کنید."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"اکنون می‌توانید کارت 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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"حافظه USB به عنوان فقط خواندنی متصل شد."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"کارت SD به صورت فقط خواندنی نصب شد."</string>
     <string name="skip_label" msgid="47510779345218297">"رد شدن"</string>
     <string name="next_label" msgid="4693520878012668114">"بعدی"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"زبان"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"هنگام انجام رومینگ داده، ممکن است هزینه‌های رومینگ قابل توجهی را متحمل شوید!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"رومینگ داده مجاز است؟"</string>
     <string name="networks" msgid="6333316876545927039">"انتخاب اپراتور"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"انتخاب یک اپراتور شبکه"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"تاریخ و ساعت"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"فرمت تاریخ را انتخاب کنید"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"بهبود مطابقت چهره"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"بررسی پخش واقعی و زنده چهره"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"به چشمک نیاز دارد"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آنها، رسانه‌ها و سایر فایل‌ها را رمزگذاری کنید. پس از رمزگذاری رایانه لوحی خود، هر بار که آن را روشن می‌کنید باید پین عددی یا گذرواژه را برای رمزگشایی آن وارد کنید: امکان لغو رمزگذاری رایانه لوحی وجود ندارد مگر آنکه آن را به داده‌های کارخانه بازنشانی کنید، که تمام داده‌های شما را حذف می‌کند."\n\n"رمزگذاری یک ساعت یا بیشتر طول می‌کشد. برای شروع باید باتری کاملاً شارژ شده باشد و رایانه لوحی تا زمانی که رمزگذاری کامل شود همچنان به برق وصل باشد. در صورت متوقف کردن فرآیند رمزگذاری، برخی از داده‌ها یا تمام داده‌های خود را از دست خواهید داد."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آنها، رسانه‌ها و سایر فایل‌ها را رمزگذاری کنید. پس از رمزگذاری گوشی خود، در هر بار روشن کردن آن باید یک پین عددی یا گذرواژه را برای رمزگشایی آن وارد کنید: امکان لغو رمزگذاری گوشی وجود ندارد مگر آنکه آن را به داده‌های کارخانه بازنشانی کنید، که تمام داده‌های شما را حذف می‌کند."\n\n"رمزگذاری یک ساعت یا بیشتر طول می‌کشد. برای شروع باید باتری کاملاً شارژ شده باشد و تلفن تا زمانی که رمزگذاری کامل شود همچنان به برق وصل باشد. در صورت متوقف کردن فرآیند رمزگذاری، برخی یا همه داده‌های خود را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آن‌ها، رسانه و فایل‌های دیگر خود را رمزگذاری کنید. هنگامی که رایانه لوحی خود را رمزگذاری کردید، هر بار که آن را روشن می‌کنید باید یک پین عددی یا یک گذرواژه را وارد کنید تا رمزگشایی شود. به هیچ وجه نمی‌توانید رمزگذاری رایانه لوحی خود را لغو کنید مگر اینکه به تنظیمات کارخانه بازنشانی کنید که این کار هم تمام داده‌های شما را حذف می‌کند."\n\n"عملیات رمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری دارای شارژ کامل باشد و رایانه لوحی باید تا پایان کار رمزگذاری به برق وصل باشد. اگر در روند رمزگذاری تداخلی به وجود بیاورید، تمام یا بعضی از داده‌های خود را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آن‌ها، رسانه و فایل‌های دیگر خود را رمزگذاری کنید. هنگامی که گوشی خود را رمزگذاری کردید، هر بار که آن را روشن می‌کنید باید یک پین عددی یا یک گذرواژه را وارد کنید تا رمزگشایی شود. به هیچ وجه نمی‌توانید رمزگذاری گوشی خود را لغو کنید مگر اینکه به تنظیمات کارخانه بازنشانی کنید که این کار هم تمام داده‌های شما را حذف می‌کند."\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="2029407131227814893">"باتری خود را شارژ کرده و دوباره امتحان کنید."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"شارژر خود را متصل کرده و دوباره امتحان کنید."</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_dialog_need_password_message" msgid="4071395977297369642">"قبل از شروع به رمزگذاری باید یک پین قفل صفحه یا گذرواژه تنظیم کنید."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"رمزگذاری؟"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"عملیات رمزگذاری غیر قابل بازگشت است و در صورت ایجاد وقفه در آن، داده‌های خود را از دست خواهید داد. رمزگذاری یک ساعت یا بیشتر طول می‌کشد که در طول آن، رایانه لوحی چندین بار راه‌اندازی مجدد می‌شود."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"عملیات رمزگذاری غیر قابل بازگشت است و در صورت ایجاد وقفه در آن، داده‌های خود را از دست خواهید داد. رمزگذاری یک ساعت یا بیشتر طول می‌کشد که در طول آن، تلفن چندین بار راه‌اندازی مجدد می‌شود."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"رمزگذاری"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"هنگام رمزگذاری رایانه لوحی خود، منتظر بمانید. <xliff:g id="PERCENT">^1</xliff:g> کامل شد."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"هنگام رمزگذاری گوشی خود، منتظر بمانید. <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="2223340178473871064">"گذرواژه خود را تایپ کنید"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"رمزگذاری ناموفق"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در رایانه لوحی شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از رایانه لوحی خود، باید تنظیمات کارخانه را مجدداً بازنشانی کنید. با تنظیم کردن رایانه لوحی پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخه پشتیبان تهیه شده بازیابی کنید."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در تلفن شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از تلفن خود، باید تنظیمات کارخانه را مجدداً بازنشانی کنید. با راه‌اندازی تلفن پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخه پشتیبان تهیه شده بازیابی کنید."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"انتخاب قفل صفحه"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در رایانه لوحی شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از رایانه لوحی خود، باید تنظیمات کارخانه را بازنشانی کنید. با تنظیم کردن رایانه لوحی پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخه پشتیبان تهیه شده بازیابی کنید."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"رمزگذاری متوقف شد و امکان تکمیل آن وجود ندارد. در نتیجه، داده‌های موجود در تلفن شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از تلفن خود، باید تنظیمات کارخانه را بازنشانی کنید. با راه‌اندازی تلفن پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخه پشتیبان تهیه شده بازیابی کنید."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"تغییر روش ورودی"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"قفل صفحه نمایش را انتخاب کنید"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"قفل پشتیبان را انتخاب کنید"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"قفل صفحه"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغییر قفل صفحه"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"الگو"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"پین"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"گذرواژه"</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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"پین باید حداقل %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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"گذرواژه باید کمتر از <xliff:g id="NUMBER">%d</xliff:g> نویسه باشد."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"پین باید کمتر از <xliff:g id="NUMBER">%d</xliff:g> رقم باشد."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"پین باید فقط دارای رقم‌های 0 تا 9 باشد."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"سرپرست دستگاه اجازه استفاده از پین اخیر را نمی‌دهد."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"گذرواژه دارای یک نویسه غیرقانونی است."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"گذرواژه باید حداقل دارای یک حرف باشد."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"گذرواژه باید دارای حداقل یک رقم باشد."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"گذرواژه باید دارای حداقل یک نماد باشد."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"رمز ورود باید دارای حداقل 1 حرف باشد"</item>
-    <item quantity="other" msgid="7278096339907683541">"رمز ورود باید دارای حداقل %d حرف باشد"</item>
+    <item quantity="one" msgid="3063853802158131458">"گذرواژه باید دارای حداقل 1 حرف باشد."</item>
+    <item quantity="other" msgid="8186027808415585970">"گذرواژه باید دارای حداقل %d حرف باشد."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"رمز ورود باید دارای حداقل 1 حرف کوچک باشد"</item>
-    <item quantity="other" msgid="588499075580432178">"رمز ورود باید دارای حداقل %d حرف کوچک باشد"</item>
+    <item quantity="one" msgid="5583986519662091001">"گذرواژه باید دارای حداقل 1 حرف کوچک باشد."</item>
+    <item quantity="other" msgid="2693910942679679225">"گذروازه باید دارای حداقل %d حرف کوچک باشد."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"رمز ورود باید دارای حداقل 1 حرف بزرگ باشد"</item>
-    <item quantity="other" msgid="2183090598541826806">"رمز ورود باید دارای حداقل %d حرف بزرگ باشد"</item>
+    <item quantity="one" msgid="2611909966725502768">"گذرواژه باید دارای حداقل 1 حرف بزرگ باشد."</item>
+    <item quantity="other" msgid="3030801209112209245">"گذرواژه باید دارای حداقل %d حرف بزرگ باشد."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"رمز ورود باید دارای حداقل 1 رقم باشد"</item>
-    <item quantity="other" msgid="995673409754935278">"رمز ورود باید دارای حداقل %d عدد باشد"</item>
+    <item quantity="one" msgid="3820355568839621231">"گذرواژه باید دارای حداقل 1 رقم باشد."</item>
+    <item quantity="other" msgid="4703982391407595924">"گذرواژه باید دارای حداقل %d رقم باشد."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"رمز ورود باید دارای حداقل 1 نماد ویژه باشد"</item>
-    <item quantity="other" msgid="3047460862484105274">"رمز ورود باید دارای حداقل %d نماد ویژه باشد"</item>
+    <item quantity="one" msgid="8456579939292408631">"گذرواژه باید دارای حداقل 1 نماد ویژه باشد."</item>
+    <item quantity="other" msgid="1221290525051187757">"گذرواژه باید دارای حداقل %d نماد ویژه باشد."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"رمز ورود باید دارای حداقل 1 نویسه غیر حرفی باشد"</item>
-    <item quantity="other" msgid="5574191164708145973">"رمز ورود باید دارای حداقل %d نویسه غیر حرفی باشد"</item>
+    <item quantity="one" msgid="4594051152085925921">"گذرواژه باید حداقل دارای 1 نویسه غیرحرفی باشد."</item>
+    <item quantity="other" msgid="3952508584649046404">"گذرواژه باید دارای حداقل %d نویسه غیرحرفی باشد."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"سرپرست دستگاه اجازه استفاده از رمز ورود اخیر را نمی دهد"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"سرپرست دستگاه اجازه استفاده از گذرواژه اخیر را نمی‌دهد."</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="lock_setup" msgid="1759001157415978959">"تنظیم کامل شد"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"راه‌اندازی کامل شد."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"برای مرتبط‌سازی با:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>کلید عبور ضروری دستگاه را وارد کنید:"</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_enter_pin_other_device" msgid="4637977124526813470">"ممکن است لازم باشد که این پین را در دستگاه دیگری وارد کنید."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"ممکن است لازم باشد این کلید عبور را نیز در دستگاه دیگر وارد کنید."</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="2796550001376088433">"برای مرتبط‌سازی با:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>روی آن تایپ کنید:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>، سپس Return یا Enter را فشار دهید."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"به دلیل یک پین یا کلید عبور نادرست، مرتبط‌‌سازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> امکان‌پذیر نیست."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ارتباط با <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_connecting_error_message" msgid="229861986106185022">"اتصال به <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"اجازه برای تبادل داده‌ها هنگامی که تلفن دستگاه دیگری را لمس میکند"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"تبادل داده هنگامیکه رایانه لوحی در تماس با دستگاه دیگر است مجاز باشد"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"اجازه برای تبادل داده‌ها هنگامی که تلفن دستگاه دیگری را لمس میکند"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"آماده برای انتقال محتوای برنامه از طریق NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"خاموش"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"در دسترس نیست زیرا NFC خاموش است"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"در صورت روشن بودن این ویژگی، می‌توانید با نگهداشتن دستگاه‌ها نزدیک به یکدیگر، محتوای برنامه کاربردی را به دستگاه دارای قابلیت NFC دیگری مخابره کنید. به عنوان مثال، می‌توانید صفحات مرورگر، ویدیوهای YouTube، تماس‌های افراد و موارد دیگر را مخابره کنید."\n\n" کافیست دستگاه‌ها را نزدیک هم بگذارید (معمولاً پشت به پشت) و سپس صفحه نمایش خود را لمس کنید. برنامه‌ کاربردی آنچه را مخابره می‌شود تعیین می‌کند."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"کاوش سرویس شبکه"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"به برنامه‎های دستگاه‌های دیگر اجازه داده شود برنامه‎های این دستگاه را ببینند"</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="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_setup_wizard_title" msgid="70277346338812325">"انتخاب Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"اسکن شبکه‌ها امکان‌پذیر نیست"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"اعلان شبکه"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"هنگام در دسترس بودن یک شبکه باز، به من اعلام شود"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"اجتناب از اتصال ضعیف"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"از شبکه Wi-Fi استفاده نکنید، مگر آنکه اتصال اینترنتی مناسب باشد"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"اجتناب از اتصالات ضعیف"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"تنها در صورتی که اتصال اینترنت خوب باشد از شبکه Wi-Fi استفاده شود"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"هنگام خواب، 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_wps_pbc" msgid="2668564692207863017">"دکمه ارسال WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"ورودی پین WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"در حال جستجوی شبکه‌های Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"شبکه دیگر…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"بیشتر"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"تنظیم خودکار (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"نمایش گزینه‌های پیشرفته"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"پین را از نقطه دستیابی تایپ کنید"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"راه‌اندازی WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"پین <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_wps_setup_title" msgid="6034518116333042484">"نصب Wi-Fi حفاظت شده"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"راه‌اندازی WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"دکمه تنظیم محافظت شده Wi-Fi را در مسیریاب خود فشار دهید. این دکمه ممکن است «WPS» نامیده شود یا دارای این نماد باشد:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"پین <xliff:g id="NUMBER">%1$s</xliff:g> را در مسیریاب Wi-Fi خود وارد کنید. تکمیل نصب ممکن است چند دقیقه طول بکشد."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS انجام شد. درحال اتصال به شبکه…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> متصل شد"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS در حال انجام کار است و تکمیل آن حداکثر دو دقیقه طول می‌کشد"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS انجام نشد. لطفاً چند دقیقه دیگر دوباره امتحان کنید."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"تنظیمات امنیتی روتر بیسیم (WEP) پشتیبانی نمی‌شود"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"تنظیمات امنیتی روتر بیسیم (TKIP) پشتیبانی نمی‌شود"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"تأیید اعتبار انجام نشد. لطفاً دوباره امتحان کنید."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"یک جلسه WPS دیگر شناسایی شد. لطفاً پس از چند دقیقه دوباره امتحان کنید."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID شبکه"</string>
     <string name="wifi_security" msgid="6603611185592956936">"امنیت"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"قدرت سیگنال"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"ذخیره شد"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیرفعال شد"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"از اتصال به اینترنت ضعیف اجتناب شد"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"به دلیل اتصال ضعیف، اتصال به شبکه برقرار نشد. این عملکرد را از صفحه تنظیمات &gt; Wi-Fi، مورد منوی پیشرفته، غیرفعال کنید."</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="3538912605343585226">"شبکه محافظت شده موجود است"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (شبکه محافظت شده موجود است)"</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_failed_connect_message" msgid="8491902558970292871">"اتصال به شبکه برقرار نشد"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"فراموش کردن"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"شبکه فراموش نشد"</string>
     <string name="wifi_save" msgid="3331121567988522826">"ذخیره"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"شبکه ذخیره نشد"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"لغو"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"یک Wi-Fi محافظت شده دیگر شناسایی شد. چند دقیقه دیگر دوباره امتحان کنید."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"دروازه"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"طول پیشوند شبکه"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"تنظیم اتصال رایانه به رایانه"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"اطلاعات دستگاه"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"راه‌اندازی Wi-Fi حفاظت شده"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"پین را تایپ کنید"</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_remove_group" msgid="4844634506540667517">"حذف گروه"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"پیشرفته"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"دستگاه‌های موجود"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"جستجوی دستگاه‌ها"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"در حال جستجو…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"تغییر نام دستگاه"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"دستگاه‌های مشابه"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"متصل نشد."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"تغییر نام دستگاه انجام نشد."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"اتصال قطع شود؟"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"اگر اتصال شما قطع شود، اتصال شما با <xliff:g id="PEER_NAME">%1$s</xliff:g> به پایان خواهد رسید."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"اگر اتصال شما قطع شود، اتصال شما با <xliff:g id="PEER_NAME">%1$s</xliff:g> و سایر دستگاه‌های <xliff:g id="PEER_COUNT">%2$s</xliff:g> به پایان خواهد رسید."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"دعوتنامه لغو شود؟"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"آیا می‌خواهید دعوت برای ارتباط با <xliff:g id="PEER_NAME">%1$s</xliff:g> را لغو کنید؟"</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_ap_text" msgid="61237027772641155">"تنظیم نقطه اتصال 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="display_settings_title" msgid="1708697328627382561">"نمایش"</string>
     <string name="sound_settings" msgid="5534671337768745343">"صدا"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"حالت ساکت"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"آهنگ زنگ تلفن"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"میزان صدا"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"جلوه‌های موسیقی"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"میزان صدای زنگ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"لرزش در حالت بیصدا"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"لرزش و زنگ"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"بی‌صدا کردن آهنگ زنگ و اعلان‌ها"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"بی‌صدا کردن موسیقی و سایر رسانه‌ها"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"بی‌صدا کردن اعلان‌ها"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"بی‌صدا کردن زنگ هشدار"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"لرزش هنگام زنگ زدن"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"قبل از تنظیم صدای جایگاه اتصال باید رایانه لوحی را وصل کنید."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"قبل از تنظیم صدای جایگاه اتصال باید گوشی را وصل کنید."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"قبل از تنظیم صدای جایگاه اتصال، باید رایانه لوحی را به آن وصل کنید."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"قبل از تنظیم صدای جایگاه اتصال، باید گوشی را به آن وصل کنید."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"صدای اتصال جایگاه"</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="account_settings" msgid="6403589284618783461">"حساب‌ها"</string>
     <string name="search_settings" msgid="1910951467596035063">"جستجو"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"مدیریت تنظیمات جستجو و سابقه"</string>
     <string name="display_settings" msgid="7965901687241669598">"نمایش"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"نسخه 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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"همه اطلاعات شخصی و برنامه‌های دانلود شده پاک شود؟ این عملکرد دیگر قابل بازگشت نیست!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"پاک کردن همه موارد"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"الگوی بازگشایی قفل خود را بکشید"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"برای تأیید بازنشانی به داده های کارخانه، باید الگوی قفل گشایی خود را بکشید."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"برای تأیید بازنشانی به داده‌های کارخانه، باید الگوی قفل گشایی خود را بکشید."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"هیچ بازنشانی انجام نشد زیرا سرویس پاکسازی سیستم در دسترس نیست."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"بازنشانی؟"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"پاک کردن حافظه USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"با پاک کردن کارت 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="nosdcard" msgid="2192044794228379224">"برای تأیید پاک کردن حافظه USB، باید الگوی قفل گشایی خود را بکشید."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"برای تأیید پاک کردن کارت 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="6688416425801386511">"اتصال داده با سیم USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"شبکه های تلفن همراه"</string>
     <string name="location_title" msgid="1029961368397484576">"موقعیت مکانی من"</string>
     <string name="location_network_based" msgid="5569673665032992664">"سرویس مکان Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"برنامه‌ها در استفاده از منابعی مانند شبکه‌های Wi-Fi و تلفن همراه برای مشخص کردن موقعیت مکانی تقریبی شما مجاز باشند"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"به داده‌های ناشناس مکان اجازه دهید به Google ارسال شوند. همچنین به برنامه‌های مجاز امکان دهید تا از داده‌های منابعی مانند 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"برای دریافت راهنمایی روی منو فشار دهید."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"پس از انجام کار، انگشت را رها کنید."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"حداقل <xliff:g id="NUMBER">%d</xliff:g> نقطه را متصل کنید. دوباره امتحان کنید:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"الگو ضبط شد!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"الگو ضبط شد."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"مجدداً الگو را برای تأیید بکشید:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"الگوی بازگشایی قفل جدید شما:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"تأیید"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"بعدی"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"محافظت از رایانه لوحی خود"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"حفظ امنیت تلفن شما"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"با ایجاد یک الگوی باز کردن قفل صفحه شخصی، از رایانه لوحی خود در برابر استفاده غیر مجاز محافظت کنید. با استفاده از انگشت خود، در صفحه بعدی نقاط را با ترتیب دلخواه متصل کنید. حداقل باید چهار نقطه را به هم متصل کنید. "\n\n"آماده هستید؟ \"بعدی\" را لمس کنید."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"با ایجاد یک الگوی شخصی باز کردن قفل صفحه، از رایانه لوحی خود در برابر استفاده غیر مجاز محافظت کنید. با کشیدن انگشت خود، در صفحه بعدی نقاط را با ترتیب دلخواه متصل کنید. حداقل باید چهار نقطه را به هم متصل کنید. "\n\n"آماده هستید؟ \"بعدی\" را لمس کنید."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"با ایجاد یک الگوی باز کردن قفل صفحه شخصی، از گوشی خود در برابر استفاده غیر مجاز محافظت کنید. با استفاده از انگشت خود، در صفحه بعدی حداقل 4 نقطه را با ترتیب دلخواه متصل کنید. "\n\n"آماده شروع هستید؟ \"بعدی\" را لمس کنید."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"مدیریت برنامه‌ها"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"مدیریت و حذف برنامه‌های نصب شده"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"مدیریت برنامه‌ها، تنظیم میانبرهای راه‌اندازی سریع"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"تنظیمات برنامه"</string>
     <string name="install_applications" msgid="4872012136210802181">"منبع ناشناس"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"اجازه به نصب برنامه‌های دریافت شده از غیر از Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"اجازه نصب برنامه‌ها از منابع ناشناخته"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"رایانه لوحی و داده‌های شخصی شما بیشتر در معرض خطر حمله برنامه‌های منابع ناشناس می‌باشند. شما موافقت می‌کنید که در قبال هر گونه آسیب وارده به رایانه لوحی خود یا از دست دادن داده که در نتیجه استفاده از این برنامه‌ها روی دهد تنها خودتان مسئول می‌باشید."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"گوشی و داده‌های شخصی شما بیشتر در معرض خطر حمله برنامه‌های منابع ناشناس می‌باشند. شما موافقت می‌کنید که در قبال هر گونه آسیبی که در نتیجه استفاده از این برنامه‌ها به گوشی شما وارد شود فقط خودتان مسئول می‌باشید."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"تنظیمات پیشرفته"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"اطلاعات برنامه"</string>
     <string name="storage_label" msgid="8700867073480107253">"ذخیره سازی"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"راه اندازی به صورت پیش فرض"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"پیش‌فرض‌ها"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"سازگاری با صفحه نمایش"</string>
     <string name="permissions_label" msgid="2605296874922726203">"مجوزها"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"حافظه پنهان"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"پاک کردن داده ها"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"حذف نصب نسخه های به روز"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"شما انتخاب کرده‌اید که این برنامه را به طور پیش‌فرض برای برخی از عملکردها راه‌اندازی کنید."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"شما انتخاب کردید تا به این برنامه برای ایجاد ابزارک و دسترسی به اطلاعات آنها اجازه دهید."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"تنظیم پیش فرضی موجود نیست."</string>
     <string name="clear_activities" msgid="7408923511535174430">"پاک کردن پیش فرض ها"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"ممکن است این برنامه برای صفحه شما طراحی نشده باشد، نحوه تنظیم آن برای صفحه را می‌توانید از این قسمت کنترل کنید."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"ترتیب بر اساس اندازه"</string>
     <string name="show_running_services" msgid="5736278767975544570">"نمایش سرویس های در حال اجرا"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"فرآیندهای ذخیره شده در حافظه پنهان"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"بازنشانی تنظیمات برگزیده برنامه"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"تنظیمات برگزیده برنامه بازنشانی شوند؟"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"این کار همه تنظیمات برگزیده این موارد را بازنشانی می‌کند:"\n\n" "<li>"برنامه‌های غیرفعال شده"</li>\n" "<li>"اعلان‌های برنامه غیرفعال شده"</li>\n" "<li>"برنامه‌های پیش‌فرض برای عملیات"</li>\n" "<li>"محدودیت‌های داده پس‌زمینه برای برنامه‌ها"</li>\n\n" داده برنامه را از دست نمی‌دهید."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"بازنشانی برنامه‌ها"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"مدیریت فضا"</string>
     <string name="filter" msgid="2018011724373033887">"فیلتر"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"انتخاب گزینه‌های فیلتر"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"این برنامه می‌تواند به موارد زیر در رایانه لوحی شما دسترسی داشته باشد:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"این برنامه می‌تواند به موارد زیر در گوشی شما دسترسی داشته باشد:"</string>
     <string name="computing_size" msgid="1599186977475211186">"در حال محاسبه..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"محاسبه اندازه بسته امکان پذیر نیست"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"اندازه بسته قابل محاسبه نیست."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"شما هیچ برنامه شخص ثالثی را نصب نکرده‌اید."</string>
     <string name="version_text" msgid="9189073826278676425">"نسخه <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"انتقال"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"تغییر مکان نصب دلخواه برای برنامه‌های جدید"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"برنامه داخلی غیرفعال شود؟"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"در صورت غیر فعال کردن یک برنامه داخلی، سایر برنامه‌ها ممکن است عملکرد نادرستی از خود نشان دهند."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"خاموش کردن اعلان‌ها؟"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"اگر اعلانی را برای این برنامه خاموش کنید، ممکن است هشدارها و به‌روزرسانی‌های مهم را از دست بدهید."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"استفاده از حافظه"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"مشاهده حافظه مورد استفاده برنامه‌ها"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"سرویس های در حال اجرا"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"این روش ورودی ممکن است بتواند تمام متنی را که تایپ می‌کنید جمع‌آوری کند، از جمله اطلاعات شخصی مانند گذرواژه‌ها و شماره‌های کارت اعتباری. این روش توسط برنامه <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> ارائه می‌شود. از این روش ورودی استفاده می‌کنید؟"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"این غلط‌‌گیر ممکن است بتواند همه متنی را که شما وارد می‌کنید از جمله، داده‌های شخصی مانند گذرواژه‌ها و شماره‌های کارت اعتباری را جمع‌آوری کند. این ویژگی توسط برنامه <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> ارائه می‌شود. از این غلط‌گیر استفاده شود؟"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"تنظیمات"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"زبان"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"تنظیمات <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> بازنشد"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"ماوس/پد لمسی"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"سرعت اشاره گر"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"دسته کنترل بازی"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"استفاده از لرزاننده"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"هنگامی که لرزاننده وصل شد، برای دسته کنترل بازی تنظیم شود."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"انتخاب طرح‌بندی صفحه کلید"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"تنظیم طرح‌بندی‌های صفحه کلید"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"برای تغییر، Control-کلید فاصله را فشار هید"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"پیش‌فرض"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"طرح‌بندی‌های صفحه کلید"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"فرهنگ لغت کاربر"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"فرهنگ لغت شخصی"</string>
     <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_add_screen_title" msgid="742580720124344291">"عبارت"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"گزینه‌های بیشتر"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"گزینه‌های کمتر"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"تأیید"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"کلمه:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"میانبر:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"زبان:"</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="8165273379942105271">"کلمه‌ای در فرهنگ لغت کاربر شما موجود نیست. می‌توانید با لمس کردن دکمه بعلاوه (+) یک کلمه را اضافه کنید."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"همه زبان ها"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"برای همه زبان‌ها"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"زبان‌های بیشتر…"</string>
     <string name="testing" msgid="6584352735303604146">"تست کردن"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"اطلاعات رایانه لوحی"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"اطلاعات تلفن"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"تنظیم گزینه‌های مربوط به طراحی برنامه"</string>
     <string name="enable_adb" msgid="7982306934419797485">"رفع عیب USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"با اتصال USB حالت رفع عیب فعال شود"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"شناسه برنامه‌نویسی دستگاه"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"اطلاعات دستگاه در دسترس نیست"</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="7316799925425402244">"رفع عیب USB فقط برای اهداف برنامه‌نویسی در نظر گرفته شده است. از آن برای رونوشت‌برداری داده بین رایانه و دستگاه خود، نصب برنامه‌ها در دستگاه خود بدون اعلان و خواندن داده‌های گزارش استفاده کنید."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"تنظیمات برنامه‌نویسی مجاز باشد؟"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"این تنظیمات فقط برای برنامه‌نویسی در نظر گرفته شده است. ممکن است استفاده از این تنظیمات موجب خرابی یا عملکرد نادرست دستگاه یا برنامه‌های شما شود."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"حفاظت از حافظه USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"برنامه باید برای خواندن حافظه USB اجازه بگیرد"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"حافظه USB حفاظت شود؟"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"وقتی حافظه USB محافظت شده است٬ برنامه‌ها باید اجازه بگیرند تا داده‌های حافظه خارجی را بخوانند."\n\n"برخی از برنامه‌ها ممکن است تا توسط برنامه‌نویسان خود به‌روزرسانی نشوند کار نکنند."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"حفاظت از کارت SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"برنامه باید برای خواندن کارت SD اجازه بگیرد"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"کارت SD حفاظت شود؟"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"وقتی کارت SD محافظت شده است٬ برنامه‌ها باید اجازه بگیرند تا داده‌های حافظه خارجی را بخوانند."\n\n"برخی از برنامه‌ها ممکن است تا توسط برنامه‌نویسان خود به‌روزرسانی نشوند کار نکنند."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"انتخاب اسبابک"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"انتخاب ابزارک"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"آیا مایل به ایجاد ابزارک و دادن اجازه دسترسی می‌باشید؟"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"پس از اینکه ابزارک را ایجاد کردید٬ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> می‌تواند به کلیه اطلاعاتی که ابزارک نمایش می‌دهد٬ دسترسی داشته باشد."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"همیشه به <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> برای ایجاد ابزارک‌ها و دسترسی به اطلاعات آنها اجازه داده شود"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"متن بزرگ"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"دکمه روشن/خاموش به تماس پایان می‌دهد"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"گفتن گذرواژه‎ها"</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="3264723681038625967">"نصب اسکریپت‌های وب"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"افزایش دسترسی به وب"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"سرویسی نصب نشده است"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"به صفحه‌خوان نیاز دارید؟"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback یک بازخورد شفاهی برای کمک به کاربران نابینا و کم‌بینا ارائه می‌دهد. آیا می‌خواهید آن را به صورت رایگان از Android Market نصب کنید؟"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"اسکریپت‌های وب نصب شوند؟"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"آیا میخواهید برنامه‌های کاربردی، اسکریپت‌ها را از Google نصب کنند که امکان دسترسی به محتوای وب آنها بیشتر شود؟"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"این ویژگی روش واکنش دستگاه شما به لمس را تغییر می‌دهد. روشن شود؟"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"توضیحی ارائه نشده است."</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_not_available" msgid="3214000535532434353">"اطلاعات مصرف باتری موجود نیست."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"موتوری که انتخاب کردید اجرا نمی‌شود."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"پیکربندی"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"انتخاب یک موتور دیگر"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"این موتور ترکیب صوتی ممکن است بتواند تمام متن گفته شده را جمع آوری کند، از جمله اطلاعات شخصی مانند رمزهای ورود و شماره های کارت اعتباری. این کارها توسط موتور<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> انجام می شود. استفاده از این موتور ترکیب صوتی را فعال می کنید؟"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"قبل از استفاده، موتور جدید را فعال کنید."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"رسم الگوی بازگشایی"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"باید الگوی بازگشایی را رسم کنید تا نصب مدارک صلاحیت تأیید شود."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"گذرواژه را برای حافظه اطلاعات کاربری تایپ کنید."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"رمز ورود فعلی:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"حافظه اطلاعات کاربری پاک شد."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"حافظه اطلاعات کاربری پاک نمی‌شود."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"ذخیره سازی اطلاعات کاربری فعال شد."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"باید یک پین قفل صفحه یا گذرواژه را قبل از استفاده از حافظه اطلاعات کاربری تنظیم کنید."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"باید یک پین قفل صفحه یا گذرواژه را قبل از استفاده از حافظه اطلاعات کاربری تنظیم کنید."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"آهنگ اضطراری"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"واکنش موجود در هنگام برقراری تماس اضطراری را تنظیم کنید"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"تهیه نسخه پشتیبان و بازیابی"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"بازیابی خودکار"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"هنگام نصب مجدد برنامه، تنظیمات و داده‌های نسخه پشتیبان بازیابی شود"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"گذرواژه نسخه پشتیبان دسک‌تاپ"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"نسخه‌های پشتیبان کامل دسک‌تاپ در حال حاضر محافظت نمی‌شوند."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"انتخاب برای تغییر یا حذف گذرواژه برای نسخه‌های پشتیبان کامل دسک‌تاپ"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"نسخه‌های پشتیبان کامل دسک‌تاپ در حال حاضر محافظت نمی‌شوند"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"برای تغییر یا حذف گذرواژه برای نسخه‌های پشتیبان کامل دسک‌تاپ لمس کنید"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"تهیه نسخه پشتیبان را از گذرواژه‌های Wi-Fi، نشانک ها و سایر تنظیمات خود و همچنین داده‌های برنامه متوقف میکنید و تمام نسخه‌های موجود در سرورهای Google را نیز پاک میکنید؟"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"تنظیمات سرپرستی دستگاه"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"این سرپرست فعال است و به برنامه <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">"آهنگ‌های زنگ و اعلان‌ها"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"اعلان ها"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"سیستم"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"لرزش و آهنگ زنگ تماس"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"سیستم"</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="3747859666621319757">"اتصال به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"همگام‌سازی انجام نشد"</string>
+    <string name="sync_active" msgid="8476943765960863040">"همگام‌سازی فعال"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"همگام‌سازی"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"همگام‌سازی در حال حاضر دارای مشکلی است. در مدت کوتاهی تصحیح می‌شود."</string>
     <string name="add_account_label" msgid="7811707265834013767">"افزودن حساب"</string>
     <string name="background_data" msgid="5779592891375473817">"داده های پس زمینه"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"همگام سازی روشن است"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"همگام سازی خاموش است"</string>
     <string name="sync_error" msgid="5060969083117872149">"خطای همگام سازی"</string>
+    <string name="last_synced" msgid="4242919465367022234">"تاریخ آخرین همگام‌سازی <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"اکنون همگام‌سازی شود…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"به Google Sync خوش آمدید!"</font>\n"این راهکاری از Google است برای همگام‌سازی داده‌ها و ایجاد امکان دسترسی به مخاطبین، قرارها و موارد بیشتر از هر کجا که هستید."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"تنظیمات همگام‌سازی برنامه"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"داده و همگام سازی"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"تغییر رمز ورود"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"برخی از برنامه‌ها به این حساب نیاز دارند. فقط با بازنشانی رایانه لوحی به تنظیمات کارخانه (با این کار همه داده‌های شخصی شما حذف می‌شود) در تنظیمات &gt; تهیه نسخه پشتیبان و بازنشانی می‌‌توانید آنرا حذف کنید."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"برخی از برنامه‌ها به این حساب نیاز دارند. فقط با بازنشانی گوشی به تنظیمات کارخانه (که همه داده‌های شخصی شما را حذف می‌کند) در تنظیمات &gt; تهیه نسخه پشتیبان و بازنشانی می‌توانید آنرا حذف کنید."</string>
     <string name="provider_label" msgid="7724593781904508866">"اشتراک در پیام های سرویس"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"همگام سازی <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"نمی‌توان بصورت دستی همگام‌سازی کرد"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"همگام‌سازی برای این مورد در حال حاضر غیرفعال است. برای تغییر این تنظیم، داده‌های پس‌زمینه و همگام‌سازی خودکار را موقتاً روشن کنید."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"تنظیمات 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"آدرس 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"برای رمزگشایی حافظه گذرواژه را تایپ کنید"</string>
     <string name="try_again" msgid="4272075051293936921">"دوباره امتحان کنید."</string>
-    <string name="service_busy" msgid="2325014135156127705">"سرویس مشغول است. دوباره امتحان کنید."</string>
     <string name="delete" msgid="4219243412325163003">"حذف"</string>
     <string name="misc_files" msgid="6720680815969643497">"فایل‌های متفرقه"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"انتخاب همه"</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="debug_debugging_category" msgid="6781250159513471316">"اشکال‌زدایی"</string>
+    <string name="debug_app" msgid="8349591734751384446">"انتخاب برنامه رفع اشکال"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"هیچ برنامه رفع اشکالی تنظیم نشده است"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"در حال اشکال‌زدایی برنامه: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"انتخاب برنامه"</string>
+    <string name="no_application" msgid="2813387563129153880">"هیچ چیز"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"انتظار برای اشکال‌زدا"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"برنامه اشکال‌زدایی شده منتظر پیوست شدن اشکال‌زدا قبل از اجرا است"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"ورودی"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"طراحی"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"نظارت"</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_screen_updates" msgid="5470814345876056420">"نمایش به روز رسانی سطح"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"هنگام به روزرسانی سطوح پنجره همه فلش شوند"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"نمایش به روزرسانی‌های نمای GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"هنگام طراحی با GPU٬ نماها در داخل پنجره‌ها فلش شوند"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"غیر فعال کردن پوشش HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"همیشه از GPU در ترکیب صفحه استفاده شود"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"فعال کردن ردیابی"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"انتخاب ردیابی‌های فعال"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"هیچ ردیابی در حال حاضر فعال نیست"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> ردیابی در حال حاضر فعال است"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"همه ردیابی‌ها در حال حاضر فعال هستند"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"نمایش محدوده‌های طرح‌بندی"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"نمایش مرزها، حاشیه‌ها و ویژگی‌های دیگر کلیپ."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"نمایش میزان استفاده از CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"همپوشانی صفحه نمایش میزان استفاده از CPU فعلی"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"اجبار به تفسیر و اجرای GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"استفاده از شتاب‌دهنده سخت‌افزار 2D در برنامه‌ها"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"استفاده اجباری از GPU برای طراحی دوم"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"اجرای GPU نمایه"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"اندازه‌گیری زمان اجرا در adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"مقیاس انیمیشن پنجره"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"مقیاس انیمیشن انتقال"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"مقیاس طول مدت انیماتور"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"برنامه‌ها"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"فعالیت‌ها را ادامه ندهید"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"از بین بردن هر فعالیت به محض خروج کاربر از آن"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"نقاط اتصال تلفن همراه"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"همگام‌سازی خودکار داده"</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="8621855507876539282">"در این مدت، هیچ برنامه‌ای از داده‌ها استفاده نکرده‌ است."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"پیش‌زمینه"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"پس‌زمینه"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"محاسبه شده توسط رایانه لوحی شما. محاسبه داده مصرف در شرکت مخابراتی شما ممکن است متفاوت باشد."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"محاسبه شده توسط گوشی شما. محاسبه داده مصرف در شرکت مخابراتی شما ممکن است متفاوت باشد."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"محدود شده"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"اطلاعات تلفن همراه غیرفعال شود؟"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"تنظیم محدودیت داده تلفن همراه"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"تنظیم محدودیت داده 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"تلفن همراه"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"هیچکدام"</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="8430240158135453271">"مشاهده تنظیمات برنامه"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"محدود کردن داده‌های پس زمینه"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"داده‌های پس‌زمینه فقط در شبکه داده تلفن همراه غیرفعال می‌شود. در صورت وجود از Wi-Fi استفاده می‌شود."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"داده‌های پس‌زمینه را در شبکه‌های تلفن همراه غیرفعال کنید. در صورت وجود از شبکه‌های غیرتلفن‌ همراه استفاده می‌شود."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"برای محدود کردن داده‌های پس زمینه برای این برنامه، ابتدا یک محدودیت داده تلفن همراه را تنظیم کنید."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"محدود کردن داده‌های پس زمینه؟"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"این ویژگی سبب میشود زمانی که Wi-Fi در دسترس نیست، برنامه‌ای که به داده پس زمینه وابسته است متوقف شود."\n\n"در تنظیمات موجود در برنامه میتوانید گزینه‌های کنترل مناسب‌تری را برای کنترل استفاده از داده بیابید."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"این ویژگی سبب می‌شود زمانی که فقط شبکه‌های تلفن همراه در دسترس هستند، عملکرد برنامه‌ای که به داده پس‌زمینه وابسته است متوقف شود. "\n\n"در تنظیمات موجود در برنامه می‌توانید کنترل‌های مناسب‌تری را برای استفاده داده بدست بیاورید."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"محدود کردن داده‌های پس‌زمینه تنها زمانی امکان‌پذیر است یک محدوده‌ای برای داده‌های تلفن همراه تنظیم کنید."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"همگام‌سازی خودکار داده فعال شود؟"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"هرگونه تغییراتی که در حساب‌های خود در وب انجام می‌دهید به طور خودکار در تلفن شما کپی می‌شود."\n\n"بعضی از حساب‌ها نیز ممکن است به طور خودکار تغییراتی را که در رایانه لوحی خود انجام می‌دهید در وب کپی کنند. حساب Google به این صورت کار می‌کند."\n\n"برای انتخاب اینکه کدام نوع اطلاعات با هر یک از حساب‌ها همگام‌سازی شود، به تنظیمات &gt; حساب‌ها بروید."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"هرگونه تغییراتی که در حساب‌های خود در وب انجام می‌دهید به طور خودکار در تلفن شما کپی می‌شود."\n\n"بعضی از حساب‌ها نیز ممکن است به طور خودکار تغییراتی را که در تلفن همراه خود انجام می‌دهید در وب کپی کنند. حساب Google به این صورت کار می‌کند."\n\n"برای انتخاب اینکه کدام نوع اطلاعات با هر یک از حساب‌ها همگام‌سازی شود، به تنظیمات &gt; حساب‌ها بروید."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"همگام‌سازی خودکار داده غیرفعال شود؟"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"این گزینه داده‌ها واستفاده از باتری را محافظت می‌کند، اما برای جمع‌آوری اطلاعات اخیر باید هر حسابی را به صورت دستی همگام‌سازی کنید. و هنگامی که به‌روزرسانی روی می‌دهد اعلان‌ها را دریافت نخواهید کرد."</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_warning_editor_title" msgid="3704136912240060339">"تنظیم هشدار میزان استفاده از داده"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"تنظیم محدوده استفاده از داده"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"محدود کردن استفاده از داده"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"زمانی که مقدار مجاز استفاده از داده برای شما به پایان برسد، اتصال داده‌ <xliff:g id="NETWORKS">%1$s</xliff:g> شما غیرفعال می‌شود."\n\n"از آنجا که مقدار استفاده از داده، توسط رایانه لوحی شما محاسبه شده است و شبکه مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً از یک محدوده محتاطانه‌تر استفاده کنید."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"زمانی که مقدار مجاز استفاده از داده برای شما به پایان برسد، اتصال داده‌ <xliff:g id="NETWORKS">%1$s</xliff:g> شما غیرفعال می‌شود."\n\n"از آنجا که مقدار استفاده از داده، توسط گوشی شما محاسبه شده است و شرکت مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً از یک محدوده محتاطانه‌تر استفاده کنید."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"زمانی که مقدار تعیین شده استفاده از داده برای شما به پایان برسد، اتصال داده‌ تلفن همراه شما غیرفعال می‌شود."\n\n"از آنجا که مقدار استفاده از داده، توسط رایانه لوحی شما محاسبه شده است و شرکت مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً سقف محتاطانه‌تری را در نظر بگیرید."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"زمانی که مقدار تعیین شده استفاده از داده برای شما به پایان برسد، اتصال داده‌ شما تلفن همراه شما غیرفعال می‌شود."\n\n"از آنجا که مقدار استفاده از داده، توسط گوشی شما محاسبه شده است و شرکت مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً سقف محتاطانه‌تری را در نظر بگیرید."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"محدود کردن داده‌های پس‌زمینه؟"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"در صورت محدود کردن داده‌های تلفن همراه در پس زمینه، برخی از برنامه‌های کاربردی و سرویس‌ها کار نمیکنند مگر آنکه به شبکه Wi-Fi متصل شوید."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: در حدود <xliff:g id="TOTAL">%1$s</xliff:g> استفاده شده"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: در حدود <xliff:g id="TOTAL">%1$s</xliff:g> استفاده شده است."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: در حدود <xliff:g id="TOTAL">%1$s</xliff:g>، براساس محاسبه رایانه لوحی شما، استفاده شده است. ممکن است روش محاسبه مقدار استفاده از داده توسط شرکت مخابراتی شما متفاوت باشد."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: در حدود <xliff:g id="TOTAL">%1$s</xliff:g>، براساس محاسبه گوشی شما، استفاده شده است. ممکن است روش محاسبه مقدار استفاده از داده توسط شرکت مخابراتی شما متفاوت باشد."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"نقاط اتصال تلفن همراه"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"شبکه‌های Wi-Fi را انتخاب کنید که نقاط اتصال تلفن همراه هستند. هنگامی که برنامه‌ها در پس‌زمینه هستند، استفاده آنها از این شبکه‌ها ممکن است محدود شود. همچنین زمانی که برنامه‌ها بخواهند از این شبکه‌ها برای دانلودهای بزرگ استفاده کنند، ممکن است به شما هشدار دهند."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبکه‌های تلفن همراه"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"شبکه‌های Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"برای انتخاب نقاط اتصال تلفن همراه، Wi-Fi را روشن کنید."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"ویرایش نمایه VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"اتصال به <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"افزودن نمایه VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"ویرایش نمایه"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"حذف نمایه"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"اتصال شبکه موجود نیست. لطفاً دوباره امتحان کنید."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"یک گواهینامه موجود نیست. لطفاً نمایه را ویرایش کنید."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"پس از روشن کردن \"کاوش‌ با لمس\"، می‌توانید صفحه را برای آشنایی با آنچه زیر انگشتتان است لمس کنید. به عنوان مثال، صفحه فعلی حاوی نمادهای برنامه است. یکی از آنها را با لمس صفحه و لغزاندن انگشت خود به اطراف پیدا کنید."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"خوب است. برای پیدا کردن حداقل یک نماد بیشتر، همچنان انگشت خود را روی صفحه گذاشته و در اطراف بکشید."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"برای فعال کردن چیزی که در حال لمس آن هستید، بر روی آن ضربه بزنید. برای یافتن نماد <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="8764686624055084454">"برای پیمایش در یک لیست، می‌توانید دو انگشت خود را روی صفحه حرکت دهید. برای مثال، صفحه کنونی حاوی لیستی از نام برنامه‌ها است که می‌توانند به بالا یا پایین پیمایش شوند. ابتدا، امتحان کنید که چند مورد در لیست را با کشیدن یک انگشت به اطراف بشناسید."</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="3055831259260848004">"شما برنامه آموزشی را به پایان رساندید. برای خروج، دکمه <xliff:g id="FINISH">%s</xliff:g> را پیدا کرده و آنرا لمس کنید."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"تصحیح املایی"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"غلط‌گیر املا"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"گذرواژه فعلی نسخه پشتیبان کامل خود را در اینجا تایپ کنید"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"گذرواژه جدیدی را برای نسخه‌های پشتیبان کامل در اینجا تایپ کنید"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"گذرواژه نسخه پشتیبان کامل خود را در اینجا دوباره تایپ کنید"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"لغو"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"به روزرسانی های دیگر سیستم"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"کاربران و محدودیت‌ها"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"کاربران"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"افزودن کاربر"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"ویرایش جزئیات"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"اطلاعات کاربر"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"نام"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"محدودیت‌های محتوا"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"پین لازم است"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"رتبه‌بندی محتوا"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"برنامه‌های سیستمی"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"برنامه‌های نصب شده"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"رد کردن"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"حذف کاربر"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"بچه مزاحم"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"حذف کاربر؟"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"آیا مطمئن هستید که می‌خواهید کاربر و تمام داده‌های مربوطه را از دستگاه حذف کنید؟"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"نمایش اعلان‌ها"</string>
+    <string name="help_label" msgid="1107174367904110532">"راهنما"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 70ba5ca..fb8efd9 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Katkaistaan yhteyttä..."</item>
     <item msgid="1634960474403853625">"Yhteys katkaistu"</item>
     <item msgid="746097431216080650">"Epäonnistui"</item>
+    <item msgid="6367044185730295334">"Estetty"</item>
+    <item msgid="503942654197908005">"Vältetään huonoa yhteyttä tilapäisesti"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Katkaistaan yhteys verkosta <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Yhteys katkaistu"</item>
     <item msgid="8578370891960825148">"Epäonnistui"</item>
+    <item msgid="5660739516542454527">"Estetty"</item>
+    <item msgid="1805837518286731242">"Vältetään huonoa yhteyttä tilapäisesti"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Paina painiketta"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ei mitään"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Tukiaseman PIN-koodi"</item>
-    <item msgid="7364462169350112617">"PIN-koodi tältä laitteelta"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Staattinen"</item>
@@ -211,13 +211,8 @@
     <item msgid="3738430123799803530">"Poistettava SD-kortti"</item>
     <item msgid="4498124044785815005">"Anna järjestelmän päättää"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Pois käytöstä"</item>
-    <item msgid="4804571292609523335">"Värinä"</item>
-    <item msgid="595707141547423573">"Mykistä"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Lyhytelokuva"</item>
+    <item msgid="3511504869290423954">"Lyhyt"</item>
     <item msgid="2560532955514699713">"Keskipitkä"</item>
     <item msgid="2372711992605524591">"Pitkä"</item>
   </string-array>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animaation mittakaava 5-kertainen"</item>
     <item msgid="6660750935954853365">"Animaation mittakaava 10-kertainen"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animaatio pois käytöstä"</item>
+    <item msgid="1138649021950863198">"Animaation mittakaava 0,5-kertainen"</item>
+    <item msgid="4394388961370833040">"Animaation mittakaava 1-kertainen"</item>
+    <item msgid="8125427921655194973">"Animaation mittakaava 1,5-kertainen"</item>
+    <item msgid="3334024790739189573">"Animaation mittakaava 2-kertainen"</item>
+    <item msgid="3170120558236848008">"Animaation mittakaava 5-kertainen"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 34fa04b..a8063ff 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Kyllä"</string>
     <string name="no" msgid="6731231425810196216">"Ei"</string>
+    <string name="create" msgid="3578857613172647409">"Luo"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Estä Bluetooth-puhelut kun näyttö on lukittu"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-laitteet"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Laitteen nimi"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Laiteasetukset"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profiilin asetukset"</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_rename_device" product="tablet" msgid="787970073150631155">"Nimeä tablet-laite uudelleen"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Laiteparia muodostetaan..."</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="5655704645616731277">"Parita koskettamalla"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"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="1931617700075106801">"Muodosta laitepari laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Muodosta laitepari laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koskettamalla."</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="device_picker" msgid="8398232791303186677">"Bluetooth-laitevalitsin"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-yhteyspyyntö"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Sovellus haluaa ottaa Bluetoothin käyttöön. Sallitaanko?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Tablet-laitteesi sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Sallitaanko?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Antamasi palvelimen nimi on virheellinen."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Antamasi poissulkemisluettelo 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_port" msgid="5539106187558215246">"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="2671425042711054494">"Antamasi portti on virheellinen."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Aseta"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Epäonnistui"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Onnistui"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Muutokset tulevat voimaan, kun USB-kaapeli kytketään uudelleen"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Muutokset tulevat voimaan, kun USB-kaapeli kytketään uudelleen."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Ota USB-massamuisti käyttöön"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Tavuja yhteensä:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-tila ei käytössä"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Ei SD-korttia"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB-tallennustila ei käytössä."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Ei SD-korttia."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Tavuja käytettävissä:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-tila massamuistina"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-korttia käytetään massamuistilaitteena"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"On turvallista irrottaa USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Voit nyt irrottaa SD-kortin turvallisesti."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB-tila massamuistina"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD-korttia käytetään massamuistilaitteena."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"On turvallista irrottaa USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Voit nyt irrottaa SD-kortin turvallisesti."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-tila irrotettiin sen ollessa käytössä!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-kortti poistettiin sen ollessa käytössä!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Käytetyt tavut:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Etsitään tiedost. USB-tilasta"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB-tila vain luku -tilassa."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Kieli"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Yhdistä verkkoon roaming-tilassa"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Verkkoyhteys katkesi, koska poistuit kotiverkkosi alueelta eikä roaming-tilaa ole otettu käyttöön."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ota käyttöön"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Sallitaanko verkkoyhteys roaming-tilassa? Roaming-maksut saattavat kasvaa suuriksi!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Huomio"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Jos sallit verkkoyhteyden roaming-tilassa, roaming-maksut saattavat kasvaa suuriksi!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Sallitaanko tiedonsiirto roaming-tilassa?"</string>
     <string name="networks" msgid="6333316876545927039">"Operaattorin valinta"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Valitse verkko-operaattori"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Päivämäärä ja aika"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Aseta aika"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Valitse aikavyöhyke"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Aseta päivämäärä"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Valitse päivämäärämuoto"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Valitse päivämäärän 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="date_picker_title" msgid="1338210036394128512">"Päiväys"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Aika"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Paranna kasvojen tunnistusta"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Eläväisyystarkistus"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Vaadi silmänräpäys"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"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 kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"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 kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"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 kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"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 kytkettynä 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="2029407131227814893">"Lataa akku ja yritä uudelleen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"Sinun täytyy asettaa lukitusruudun PIN-koodi tai salasana ennen kuin voit aloittaa salauksen."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Salataanko?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Salausta 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="5682944380460921880">"Salausta 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="6689952371032099350">"Odota, tablet-laitetta salataan. <xliff:g id="PERCENT">^1</xliff:g> % valmiina."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"Kirjoita salasana"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Salaus epäonnistui"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen tablet-laitteesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa tablet-laitteesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt tablet-laitteesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen puhelimesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa puhelimesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt puhelimesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Valitse ruudun lukitus"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen tablet-laitteesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa tablet-laitteesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt tablet-laitteesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen puhelimesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa puhelimesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt puhelimesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Vaihda syöttötapaa"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Valitse ruudunlukitus"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valitse varalukko"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Kuvio"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-koodi"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Salasana"</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>
@@ -358,48 +363,48 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Vaihda lukituksenpoistokuvio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
     <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_password_too_short" msgid="7328975683669256660">"Salasanan täytyy olla vähintään %d merkkiä"</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="122706614386757182">"Kosketa Jatka kun olet valmis"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jatka"</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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Salasanan on oltava lyhyempi kuin <xliff:g id="NUMBER">%d</xliff:g> merkkiä."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-koodin on oltava lyhyempi kuin <xliff:g id="NUMBER">%d</xliff:g> numeroa."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN-koodi saa sisältää vain numeroita 0–9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Järjestelmänv. ei salli viimeaik. PIN-koodin käyttöä."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Salasana sisältää luvattoman merkin."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Salasanan tulee sisältää vähintään yksi kirjain."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Salasanan tulee sisältää vähintään yksi numero."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Salasanan tulee sisältää 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>
+    <item quantity="one" msgid="3063853802158131458">"Salasanan tulee sisältää vähintään yksi kirjain."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Salasanan tulee sisältää vähintään yksi pieni kirjain."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Salasanan tulee sisältää vähintään yksi iso kirjain."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Salasanan tulee sisältää vähintään yksi numero."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Salasanan tulee sisältää vähintään yksi erikoismerkki."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Salasanan tulee sisältää vähintään yksi merkki, joka ei ole kirjain."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Järjestelmänv. 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="lock_setup" msgid="1759001157415978959">"Asetukset määritetty"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Asennus on valmis."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Laitteen järjestelmänvalvonta"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Kirjoita laitteen tarvitsema avain muodostaaksesi laiteparin laitteen <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> kanssa:"</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_enter_pin_other_device" msgid="4637977124526813470">"Saatat joutua syöttämään tämän PIN-koodin myös toiseen laitteeseen."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Saatat 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="2796550001376088433">"Jos haluat muodostaa laiteparin laitteen <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> kanssa, kirjoita laitteelle <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ja paina Rivinvaihto tai Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Laiteparia laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kanssa ei voitu muodostaa, koska PIN-koodi tai avain oli virheellinen."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ei yhteyttä laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Yhteyden muodostaminen laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> epäonnistui."</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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Salli tiedonsiirto, kun tablet-laite koskettaa toista laitetta"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Valmis lähettämään sovelluksen sisältöä NFC:n kautta"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Pois käytöstä"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ei käytettävissä, koska NFC on poistettu käytöstä"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Kun tämä ominaisuus on käytössä, voit lähettää sovellusten sisältöä toiseen NFC-yhteensopivaan laitteeseen pitämällä laitteita lähekkäin. Voit lähettää esimerkiksi selaimen sivuja, YouTube-videoita ja yhteystietoja."\n\n"Aseta laitteet lähekkäin (yleensä taustat vastakkain) ja kosketa näyttöä. Sovellus määrittää lähetettävät tiedot."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Verkkopalveluhaku"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Anna muiden laitteiden sovelluksien löytää tämän laitteen sovelluksia"</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="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_setup_wizard_title" msgid="70277346338812325">"Valitse wifi-verkko"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Verkkoja ei voi etsiä."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Verkkoilmoitus"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Ilmoita, kun avoin verkko on käytettävissä"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Vältä huonoja yhteyksiä"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Älä käytä wifi-verkkoa, jos sillä on huono internetyhteys."</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vältä huonoja yhteyksiä"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Älä käytä wifi-verkkoa, jos sillä on huono internetyhteys."</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wifi käytössä lepotilassa"</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_wps_pbc" msgid="2668564692207863017">"WPS-painike"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Suora wifi-yhteys"</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">"Näet käytettävissä olevat verkot, kun otat wifin käyttöön."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Haetaan wifi-verkkoja..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Muu verkko..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Lisää"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaattiset aset. (WPS)"</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="8242979682530043184">"Anna tukiaseman PIN-koodi"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS-asetukset"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"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_wps_setup_title" msgid="6034518116333042484">"Suojatut wifi-asetukset"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Käynnistetään WPS:ää..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Paina reitittimen Wi-Fi Protected Setup -painiketta. Siinä voi lukea WPS tai se voi sisältää seuraavan symbolin:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Näppäile pin-koodi <xliff:g id="NUMBER">%1$s</xliff:g> wifi-reitittimeen. Asennus voi kestää kaksi minuuttia."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS onnistui. Muodostetaan yhteyttä verkkoon..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS on jo käynnissä ja sen suorittaminen voi kestää kaksi minuuttia."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS epäonnistui. Yritä uudelleen muutaman minuutin kuluttua."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Langattoman reitittimen suojausasetusta (WEP) ei tueta."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Langattoman reitittimen suojausasetusta (TKIP) ei tueta."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Todennusvirhe. Yritä myöhemmin uudelleen."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Havaittiin toinen WPS-käyttökerta. Yritä uudelleen muutaman minuutin kuluttua."</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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Huono verkkoyhteys, ei muodostettu"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Verkkoon ei yhdistetty, koska sen internetyhteys on huono. Poista tämä toiminto käytöstä valikon kohdasta Asetukset &gt; Wifi, Lisäasetukset."</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_wps_available_first_item" msgid="3538912605343585226">"Salattu verkko käytettävissä"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (salattu verkko käytettävissä)"</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_failed_connect_message" msgid="8491902558970292871">"Yhteyden muodostaminen verkkoon epäonnistui."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unohda"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Verkon unohtaminen epäonnistui."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Tallenna"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Verkon tallentaminen epäonnistui."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Peruuta"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Havaittiin toinen salattu wifi-käyttökerta. Yritä uudelleen hetken päästä."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Yhdyskäytävä"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Verkon etuliitteen pituus"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Suora wifi-yhteys"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Vertaisyhteyden muodostaminen"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Suora wifi-yhteys"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Laitteen tiedot"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Salatun wifi-yhteyden asetukset"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Kirjoita 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_remove_group" msgid="4844634506540667517">"Poista ryhmä"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Lisäasetukset"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Saatavilla olevat laitteet"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Etsi laitteita"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Haetaan..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Nimeä laite uudelleen"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vertaislaitteet"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Ei yhteyttä"</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Laitteen nimeäminen uudelleen epäonnistui."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Katkaistaanko yhteys?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Jos katkaiset yhteyden, yhteys laitteeseen <xliff:g id="PEER_NAME">%1$s</xliff:g> katkaistaan."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Jos kosketat Katkaise yhteys, yhteys laitteeseen <xliff:g id="PEER_NAME">%1$s</xliff:g> ja <xliff:g id="PEER_COUNT">%2$s</xliff:g> muuhun laitteeseen katkaistaan."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Peruutetaanko kutsu?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Haluatko peruuttaa laitteelle <xliff:g id="PEER_NAME">%1$s</xliff:g> lähetetyn yhteydenmuodostuskutsun?"</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_configure_ap_text" msgid="3474995108398156258">"Määritä wifi-yhteyspisteen asetukset"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Luo wifi-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> kannettava wifi-yhteyspiste"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ääni"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Äänetön tila"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Puhelimen soittoääni"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Äänenvoimakkuudet"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musiikkitehosteet"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Soittoäänen voimakkuus"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Käytä värinää äänettömässä tilassa"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Värinä ja soittoääni"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Oletusilmoitus"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuta ilmoitusvaloa"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Soittoääni"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Mykistä soittoääni ja ilmoitukset"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Mykistä musiikki ja muu media"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Mykistä ilmoitukset"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Mykistä herätykset"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Värinä ja soittoääni"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Aseta tablet-laite telineeseen ennen telineen ääniasetuksien määrittämistä."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Aseta puhelin telineeseen ennen telineen ääniasetuksien määrittämistä."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Telakoi tablet-laite, jos haluat määrittää telineen äänet."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Telakoi puhelin, jos haluat määrittää telineen äänet."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Telineeseen asettamisääni"</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="account_settings" msgid="6403589284618783461">"Tilit"</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="7965901687241669598">"Ruutu"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Haluatko poistaa kaikki henkilökohtaiset tietosi ja lataamasi sovellukset? 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="2234954758550554549">"Vahvista tehdasasetuksien palauttaminen piirtämällä lukituksenpoistokuviosi."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Vahvista tehdasasetusten palautus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Palauttamista ei suoritettu, koska System Clear -palvelu ei ole käytettävissä."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Palautetaanko?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Tyhjennä USB-tila"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Haluatko tyhjentää SD-kortin ja poistaa kaikki siellä olevat tiedostot? Toimintoa ei voi peruuttaa!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Poista kaikki"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Piirrä lukituksenpoistokuvio"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Varmista USB-tallennustilan tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Varmista SD-kortin tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vahvista USB-tallennustilan tyhjennys piirtämällä lukituksenpoistokuviosi."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"Jaettu yhteys USB:n kautta"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiiliverkot"</string>
     <string name="location_title" msgid="1029961368397484576">"Oma sijainti"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Googlen sijaintipalvelu"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Anna sovelluksien määrittää sijaintisi wifi- ja mobiiliverkkojen tietojen avulla."</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Anna Googlen kerätä anonyymejä sijaintitietoja. Anna myös sovelluksien määrittää sijaintisi wifi- ja mobiiliverkkojen tietojen 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Saat ohjeita painamalla Valikko-painiketta."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Nosta sormi, kun olet valmis."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Yhdistä vähintään <xliff:g id="NUMBER">%d</xliff:g> pistettä. Yritä uudelleen:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Kuvio tallennettu!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Kuvio tallennettu."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Vahvista piirtämällä kuvio uudelleen:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Uusi lukituksenpoistokuviosi:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Vahvista"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Seuraava"</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="1075370160667458122">"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"Oletko valmis? Kosketa Seuraava."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"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 neljä pistettä. "\n\n"Oletko valmis? Kosketa Seuraava."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Suojaa puhelintasi luvattomalta käytöltä luomalla henkilökohtainen näytön lukituksenpoistokuvio. Yhdistä seuraavassa ruudussa olevat pisteet (vähintään neljä) sormellasi haluamassasi järjestyksessä."\n\n"Oletko valmis? Kosketa Seuraava."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hallinnoi sovelluksia"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hallinnoi ja poista asennettuja sovelluksia"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Hallinnoi sovelluksia, ota käyttöön pikakuvakkeita"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Sovellusasetukset"</string>
     <string name="install_applications" msgid="4872012136210802181">"Tuntemattomat lähteet"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Salli muiden kuin Marketista tulevien sovelluksien asentaminen"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Salli tuntemattomista lähteistä tulevien sovelluksien asentaminen"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tablet-laite ja henkilötiedot ovat alttiimpia tuntemattomista lähteistä tulevien sovelluksien kautta tapahtuville hyökkäyksille. Hyväksyt, että olet itse vastuussa mahdollisista tablet-laitteelle aiheutuvista vahingoista tai tietojen menetyksestä, joka voi johtua näiden sovelluksien käytöstä."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Puhelimesi ja henkilötiedot ovat alttiimpia tuntemattomista lähteistä tulevien sovelluksien kautta tapahtuville hyökkäyksille. Hyväksyt, että olet itse vastuussa mahdollisista puhelimelle aiheutuvista vahingoista tai tietojen menetyksestä, joka voi johtua näiden sovelluksien käytöstä."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Lisäasetukset"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Sovelluksen tiedot"</string>
     <string name="storage_label" msgid="8700867073480107253">"Tallennustila"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Käynnistä oletuksena"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Oletukset"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Tyhjennä tiedot"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Poista päivitykset"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Olet valinnut tämän sovelluksen käynnistettäväksi oletuksena tiettyjen toimintojen yhteydessä."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Olet antanut sovellukselle oikeuden luoda widgetejä ja käyttää niiden tietoja."</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="1616155457673106022">"Tätä sovellusta ei välttämättä ole suunniteltu ruudullesi sopivaksi. Voit muuttaa asetuksia täältä."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Lajittelu koon mukaan"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Käynnissä olevat palvelut"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Näytä välimuistiprosessit"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Nollaa sovellusasetukset"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nollaa sovellusasetukset?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tämä nollaa kaikki seuraavat asetukset:"\n\n" "<li>"Käytöstä poistetut sovellukset"</li>\n" "<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n" "<li>"Toimintojen oletussovellukset"</li>\n" "<li>"Taustasovellusten tietojenkäyttörajoitukset"</li>\n\n" Et menetä mitään sovellusten tietoja."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Nollaa sovellukset"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Hallinnoi tallennustilaa"</string>
     <string name="filter" msgid="2018011724373033887">"Suodata"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Valitse suodatinvaihtoehdot"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Tämä sovellus voi käyttää seuraavia tablet-laitteesi ominaisuuksia:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"Paketin koon laskeminen epäonnistui."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Vaihda uusien sovelluksien ensisijaista asennussijaintia."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Poista sis. sovellus käytöstä?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jos poistat sisäänrakennetun sovelluksen käytöstä, muut sovellukset voivat toimia virheellisesti."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Poista ilmoitukset käytöstä?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jos poistat tämän sovelluksen ilmoitukset käytöstä, et välttämättä näe tärkeitä ilmoituksia ja päivityksiä."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Tallennustilan käyttö"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Näytä sovellusten käyttämä tallennustila."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Käynnissä olevat palvelut"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"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>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Tämä oikoluku voi ehkä kerätä kaiken kirjoittamasi tekstin, mukaan lukien henkilötiedot, kuten salasanat ja luottokorttien numerot. Se on lähtöisin sovelluksesta <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Käytetäänkö tätä oikolukua?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Asetukset"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Kieli"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Sovelluksen <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> asetuksia ei voi avata"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Hiiri/ohjauslevy"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Osoittimen nopeus"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Peliohjaimet"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Käytä värinää"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Ohjaa värinä peliohjaimeen, jos ohjain on kytketty."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Valitse näppäimistöasettelu"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Määritä näppäimistöasettelut"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Vaihda painamalla Ctrl+välilyönti"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Oletus"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Näppäimistöasettelut"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Käyttäjän sanakirja"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Oma sanakirja"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Omat sanakirjat"</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_add_screen_title" msgid="742580720124344291">"Ilmaus"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Lisää vaihtoeht."</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Väh. vaihtoeht."</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Sana:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Pikanäppäin:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Kieli:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Kaikille kielille"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Lisää kieliä..."</string>
     <string name="testing" msgid="6584352735303604146">"Testaus"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet-laitteen tiedot"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Puhelimen tiedot"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Valitse sovellusten 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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Kehittäjän laitetunnus"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Laitteen tiedot eivät ole saatavilla"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pysy käynnissä"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Näyttö ei sammu puhelimen latautuessa"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Sallitaanko USB-vianetsintä?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-vianetsintä on tarkoitettu vain kehittäjien käyttöön. Sen avulla voidaan kopioida tietoja tietokoneesi ja laitteesi välillä, asentaa laitteeseesi sovelluksia ilmoittamatta siitä sinulle ja lukea lokitietoja."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Sallitaanko kehittäjäasetukset?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Nämä asetukset on tarkoitettu vain kehityskäyttöön, ja ne voivat aiheuttaa haittaa laitteellesi tai sen sovelluksille."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Suojaa USB-tallennustila"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Sovellusten on pyydettävä lupa USB-tallennustilan lukemiseen"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Suojataanko USB-tallennustila?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jos USB-tallennustila on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen."\n\n"Jotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Suojaa SD-kortti"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Sovellusten on pyydettävä lupa SD-kortin lukemiseen"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Suojataanko SD-kortti?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jos SD-kortti on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen."\n\n"Jotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Valitse gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Valitse widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Luo widget ja salli käyttö?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Kun olet luonut widgetin, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> voi käyttää kaikkia sen näyttämiä tietoja."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> saa luoda widgetejä ja käyttää niiden tietoja"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> pv <xliff:g id="HOURS">%2$d</xliff:g> t <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> t <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>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Puhu salasanat"</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="3264723681038625967">"Asenna verkkokomentosarjat"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Paranna internetin esteettömyyttä"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ei asennettuja palveluita"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Tarvitsetko näytönlukuohjelman?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack auttaa sokeita ja näkörajoitteisia käyttäjiä puhepalautteen avulla. Haluatko asentaa sovelluksen ilmaiseksi Android Marketista?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Asennetaanko verkkokomentosarjat?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Haluatko sovellusten asentavan Googlelta ohjelmia, jotka parantavat niiden esteettömyyttä?"</string>
-    <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="1072730037861494125">"Ei kuvausta."</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_not_available" msgid="3214000535532434353">"Akun käyttötietoja ei saatav."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"Valitsemaasi syntetisaattoria ei voi käyttää."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Määritä"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Valitse toinen moottori"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Tämä puhesynteesimoottori saattaa kerätä kaiken puhutun tekstin, mukaan lukien henkilökohtaiset tiedot kuten salasanat ja luottokorttinumerot. Se on lähtöisin moottorista <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Haluatko ottaa tämän puhesynteesimoottorin käyttöön?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Nainen"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Ota puhesynt. ensin 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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Piirrä lukituksenpoistokuvio"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Vahvista kirjautumistunnuksien asennus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Anna käyttöoikeustietojen tallennustilan salasana."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nykyinen salasana:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Käyttöoikeustietojen tallennustila on tyhjennetty."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Käyttöoik.tiet. ei poistettu."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Käyttöoikeustietojen tallentaminen on käytössä."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Ruudunlukituksen PIN-koodi tai salasana on asetettava ennen kuin käyttöoikeustietojen tallennustilaa voi käyttää."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Ruudunlukituksen PIN-koodi tai salasana on asetettava ennen kuin käyttöoikeustietojen tallennustilaa voi käyttää."</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="5446972770562918934">"Varmuuskopioi ja palauta"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaattinen palauttaminen"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Palauta varmuuskopioidut asetukset ja tiedot, kun sovellus asennetaan uudelleen."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Varmuuskop. salasana"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Tietokoneen kaikkien tietojen varmuuskopiointia ei ole tällä hetkellä suojattu."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Muuta tai vaihda tietokoneen kaikkien tietojen varmuuskopioinnin salasana koskettamalla"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Haluatko lopettaa wifi-salasanojen, kirjanmerkkien, muiden asetuksien ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Laitteen järjestelmänvalvoja-asetukset"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Järjestelmä"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Soittoääni ja värinä"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Yhdistetään wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Synkronointi epäonnistui"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Synkronointi käytössä"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Synkronointi"</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="background_data" msgid="5779592891375473817">"Taustatiedot"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Viimeksi synkronoitu: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Synkronoidaan nyt..."</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><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ä muita tietoja mistä tahansa."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Jotkut sovellukset käyttävät tätä tiliä. Voit poistaa tilin vain palauttamalla tablet-laitteeseen tehdasasetukset (tällöin kaikki henkilökohtaistet tietosi poistetaan) kohdassa Asetukset &gt; Varmuuskopiointi &amp; palautus."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Jotkut sovellukset käyttävät tätä tiliä. Voit poistaa tilin vain palauttamalla puhelimeen tehdasasetukset (tällöin kaikki henkilökohtaistet tietosi poistetaan) kohdassa Asetukset &gt; Varmuuskopiointi &amp; palautus."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Manuaalinen synkronointi epäonnistui"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"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="wimax_settings" msgid="1574837328738396794">"4G-asetukset"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC -osoite"</string>
     <string name="enter_password" msgid="4131758584074246224">"Poista tallennustilan salaus antamalla salasana."</string>
     <string name="try_again" msgid="4272075051293936921">"Yritä uudelleen."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Palvelu on varattu. Yritä uudelleen."</string>
     <string name="delete" msgid="4219243412325163003">"Poista"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Vianetsintä"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Valitse vianetsintäsovellus"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Vianetsintäsovellusta ei ole asetettu"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Vianetsintäsovellus: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Valitse sovellus"</string>
+    <string name="no_application" msgid="2813387563129153880">"Ei mitään"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Odota vianetsintää"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Sovellus odottaa vianetsinnän lisäämistä, ja käynnistyy sen jälkeen."</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Syöte"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Piirustus"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Valvonta"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Tiukka tila 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_screen_updates" msgid="5470814345876056420">"Näytä pintapäivitykset"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Väläytä koko ikkunoiden pinnat päivitettäessä"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Näytä GPU:n näytön päiv."</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Väläytä ikkunoiden sisältö GPU:lla piirrettäessä"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Poista HW-peittok. käyt."</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Käytä GPU:ta ruudun koostamiseen"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Ota jäljitys käyttöön"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Valitse käytettävät jälj."</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Jäljityksiä ei käytössä"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> jäljitystä tällä hetkellä käytössä"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Kaikki jäljitykset käytössä"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Näytä asettelun rajat"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Näytä leikkeiden rajat, marginaalit jne."</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="force_hw_ui" msgid="6426383462520888732">"Pakota GPU-hahmonnus"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Käytä sovelluksissa 2D-laitteistokiihdytystä"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Käytä GPU:ta 2d-piirtämiseen"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profiilin GPU-hahmonnus"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mittaa hahmonnusaika: adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Animatorin keston mittakaava"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Sovellukset"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Älä säilytä toimintoja"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Tuhoa kaikki toiminnot, kun käyttäjä poistuu"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobiiliyhteyden hotspotit"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Tietojen automaattinen synkronointi"</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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Tablet-laitteen mittaama. Operaattorin laskema tiedonsiirtomäärä voi olla eri."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Puhelimen mittaama. Operaattorin laskema tiedonsiirtomäärä voi erota tästä."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"rajoitettu"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Poistetaanko mobiilitiedonsiirto käytöstä?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Aseta mobiilitiedonsiirtoraja"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Aseta 4G-tiedonsiirtoraja"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobiili"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Ei yhtää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="8430240158135453271">"Näytä sovellusasetukset"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Taustatiedonsiirr. rajoittaminen"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Poista taustatiedonsiirto käytöstä vain mob.verkossa. Wifiä käytetään, jos se on saatavilla."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Ei taustatiedons. mobiiliverkossa. Käytä wifiä, jos mahdollista."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Aseta mobiilitiedonsiirtoraja sov. taustatiedonsiirron rajoittamiseksi"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Rajoitetaanko taustatiedonsiirtoa?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Tämä toiminto voi pysäyttää taustatiedonsiirrosta riippuvaisen sovelluksen toiminnan, jos wifi-yhteyttä ei ole käytettävissä."\n\n"Saatat löytää sopivampia tiedonsiirtoasetuksia sovellusasetuksista."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Toiminto saattaa estää taustatiedonsiirrosta riippuvaisten sovellusten toiminnan, jos käytettävissä on vain mobiiliverkkoja."\n\n"Voit säätää tiedonsiirron asetuksia tarkemmin sovelluksessa."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Taustatiedonsiirron rajoittaminen on mahdollista vain, jos olet asettanut mobiilitiedonsiirtorajan."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Otetaanko aut. synkr. käyttöön?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Kaikki tileihisi verkossa tekemäsi muutokset kopioidaan tablet-laitteellesi automaattisesti."\n\n"Jotkut tilit voivat myös automaattisesti kopioida tablet-laitteella tehdyt muutokset verkkoon. Google-tili toimii tällä tavalla."\n\n"Valitse kunkin tilin synkronoitavat tiedot siirtymällä kohtaan Asetukset &gt; Tilit."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Kaikki tileihisi verkossa tekemäsi muutokset kopioidaan puhelimellesi automaattisesti."\n\n"Jotkut tilit voivat myös automaattisesti kopioida puhelimella tehdyt muutokset verkkoon. Google-tili toimii tällä tavalla."\n\n"Valitse kunkin tilin synkronoitavat tiedot siirtymällä kohtaan Asetukset &gt; Tilit."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Poistetaanko automaatt. synkr.?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Tämä vähentää tiedonsiirtomäärää ja akun käyttöä, mutta jokainen tili tulee synkronoida manuaalisesti, jos haluat niiden tiedot käyttöösi. Et myöskään saa ilmoituksia, jos tietoja päivitetään."</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_warning_editor_title" msgid="3704136912240060339">"Aseta tiedonsiirtovaroitus"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Aseta tiedonsiirtoraja"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Tiedonsiirron rajoittaminen"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"<xliff:g id="NETWORKS">%1$s</xliff:g>-tiedonsiirtoyhteytesi poistetaan käytöstä, jos määritetty raja saavutetaan."\n\n"Tablet-laite mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"<xliff:g id="NETWORKS">%1$s</xliff:g>-tiedonsiirtoyhteytesi poistetaan käytöstä, jos määritetty raja saavutetaan."\n\n"Puhelin mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobiiliyhteytesi poistetaan käytöstä, jos määritetty tiedonsiirtoraja saavutetaan."\n\n"Tablet-laite mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobiiliyhteytesi poistetaan käytöstä, jos määritetty tiedonsiirtoraja saavutetaan."\n\n"Puhelin mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Rajoitetaanko taustatiedonsiirtoa?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellei wifi-verkko ole käytettävissä."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: n. <xliff:g id="TOTAL">%1$s</xliff:g> käytetty"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: n. <xliff:g id="TOTAL">%1$s</xliff:g> käytetty."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: n. <xliff:g id="TOTAL">%1$s</xliff:g> käytetty tablet-laitteen mukaan. Operaattorin mittaustulos voi erota tästä."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: n. <xliff:g id="TOTAL">%1$s</xliff:g> käytetty puhelimen mukaan. Operaattorin mittaustulos voi erota tästä."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobiiliyhteyden hotspotit"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Valitse wifi-verkot, joita käytetään mobiiliyhteyden hotspotteina. Sovelluksia voidaan kieltää käyttämästä näitä verkkoja niiden toimiessa taustalla. Sovellukset voivat myös näyttää varoituksen ennen suurien tiedostojen lataamista näiden verkkojen kautta."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiiliverkot"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wifi-verkot"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Ota wifi käyttöön valitaksesi mobiiliyhteyden hotspotteja."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Muokkaa VPN-profiilia"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Yhdistä profiiliin <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Lisää VPN-profiili"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Muokkaa profiilia"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Poista profiili"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Ei verkkoyhteyttä. Yritä myöhemmin uudelleen."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Varmenne puuttuu. Muokkaa profiilia."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"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="3973201880357468747">"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="8764686624055084454">"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="3055831259260848004">"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="spellcheckers_settings_title" msgid="399981228588011501">"Oikeinkirjoituksen tarkistus"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Anna nykyinen varmuuskopioinnin salasana"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Anna uusi varmuuskopioinnin salasana"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Anna uusi varmuuskopioinnin salasana uudelleen."</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Peruuta"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Järjestelmän lisäpäivitykset"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Käyttäjät ja rajoitukset"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Käyttäjät"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Lisää käyttäjä"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Muokkaa tietoja"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Käyttäjätiedot"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nimi"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Sisältörajoitukset"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Vaadi PIN-koodi"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Sisällön ikärajoitus"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Järjestelmäsovellukset"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Asennetut sovellukset"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Hylkää"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Poista käyttäjä"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Ärsyttävä pentu"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Poistetaanko käyttäjä?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Haluatko varmasti poistaa laitteesta käyttäjän ja kaikki tähän yhdistetyt tiedot?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Näytä ilmoitukset"</string>
+    <string name="help_label" msgid="1107174367904110532">"Ohje"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 27750ac..3304e32 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Déconnexion…"</item>
     <item msgid="1634960474403853625">"Déconnecté"</item>
     <item msgid="746097431216080650">"Échec"</item>
+    <item msgid="6367044185730295334">"Bloqué"</item>
+    <item msgid="503942654197908005">"Évite momentanément une mauvaise connexion"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Déconnexion de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Déconnecté"</item>
     <item msgid="8578370891960825148">"Échec"</item>
+    <item msgid="5660739516542454527">"Bloqué"</item>
+    <item msgid="1805837518286731242">"Évite momentanément une mauvaise connexion"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Appuyer sur le bouton"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Aucun"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Code PIN du point d\'accès"</item>
-    <item msgid="7364462169350112617">"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>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Carte SD amovible"</item>
     <item msgid="4498124044785815005">"Laisser le système décider"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Désactivé"</item>
-    <item msgid="4804571292609523335">"Vibreur"</item>
-    <item msgid="595707141547423573">"Silencieux"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court"</item>
     <item msgid="2560532955514699713">"Moyen"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Échelle d\'animation 5x"</item>
     <item msgid="6660750935954853365">"Échelle d\'animation 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animation désactivée"</item>
+    <item msgid="1138649021950863198">"Échelle d\'animation 0,5x"</item>
+    <item msgid="4394388961370833040">"Échelle d\'animation 1x"</item>
+    <item msgid="8125427921655194973">"Échelle d\'animation 1,5x"</item>
+    <item msgid="3334024790739189573">"Échelle d\'animation 2x"</item>
+    <item msgid="3170120558236848008">"Échelle d\'animation 5x"</item>
+    <item msgid="1069584980746680398">"É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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9749763..8a11ce5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Oui"</string>
     <string name="no" msgid="6731231425810196216">"Non"</string>
+    <string name="create" msgid="3578857613172647409">"Créer"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Désactiver les appels via le Bluetooth lorsque l\'écran est verrouillé"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Appareils Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nom de l\'appareil"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Paramètres de l\'appareil"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Paramètres du profil"</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_rename_device" product="tablet" msgid="787970073150631155">"Renommer la tablette"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Association…"</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="5655704645616731277">"App. pour associer"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"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="1931617700075106801">"Appuyez pour associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Appuyez pour associer l\'appareil à <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="device_picker" msgid="8398232791303186677">"Sélecteur d\'appareil Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Demande d\'autorisation Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Une application souhaite activer Bluetooth. Autoriser cette action ?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Une application de votre tablette souhaite rendre votre tablette identifiable par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Autoriser cette action ?"</string>
@@ -148,14 +150,14 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Une application de votre téléphone souhaite activer Bluetooth et rendre votre téléphone identifiable par d\'autres appareils pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Autoriser cette action ?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Une application de votre tablette souhaite activer Bluetooth et rendre votre tablette identifiable par d\'autres appareils. Autoriser cette action ?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Une application de votre téléphone souhaite activer Bluetooth et rendre votre téléphone identifiable par d\'autres appareils. Autoriser cette action ?"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activation du Bluetooth"</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="40711424456733571">"Connexion automatique"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Demande de connexion Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Appuyez 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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Le nom d\'hôte saisi n\'est pas valide."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Le format de la liste d\'exclusion spécifiée n\'est pas correct. Séparez 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_port" msgid="5539106187558215246">"Le champ \"Port\" est obligatoire."</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="2671425042711054494">"Le port indiqué n\'est pas valide."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le proxy HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Définir"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Échec"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"OK"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Les modifications prendront effet lors de la prochaine connexion du câble USB."</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Les modifications prendront effet lors de la prochaine connexion du câble USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activer la mémoire de stockage de masse USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Octets au total :"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Mémoire de stockage USB non installée"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Aucune carte SD n\'a été trouvée."</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Mémoire USB non installée"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Aucune carte SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Octets disponibles :"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Mémoire USB utilisée comme stockage de masse"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La carte SD est utilisée comme périphérique de stockage de masse."</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Retirez mémoire USB en toute sécurité."</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Vous pouvez maintenant retirer la carte SD en toute sécurité."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Mémoire USB utilisée comme stockage de masse"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"La carte SD est utilisée comme périphérique de stockage de masse."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Retirez mémoire USB en toute sécurité."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Vous pouvez maintenant retirer la carte SD en toute sécurité."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Mémoire USB retirée pendant son utilisation"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La carte SD a été retirée pendant son utilisation !"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Octets utilisés :"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Recherche fichiers multimédias sur USB"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Mémoire USB en lecture seule"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Langue"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Se connecter aux services de données lors de l\'itinérance"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Vous avez été déconnecté, car vous avez quitté votre réseau domestique et l\'itinérance des données est désactivée."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activer"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Autoriser l\'itinérance des données ? Des frais d\'itinérance importants peuvent s\'appliquer !"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Attention"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Lorsque vous activez l\'itinérance des données, des frais d\'itinérance importants peuvent s\'appliquer."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Autoriser l\'itinérance des données ?"</string>
     <string name="networks" msgid="6333316876545927039">"Sélection de l\'opérateur"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Sélectionner un opérateur de réseau"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Date et heure"</string>
@@ -283,12 +285,14 @@
     <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>
     <string name="date_time_set_date" msgid="7021491668550232105">"Définir la date"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Choisir le format de date"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Choisir le format de la 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="date_picker_title" msgid="1338210036394128512">"Date"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Heure"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Améliorer la correspondance faciale"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Détection des mouvements"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Demander à ce que l\'utilisateur fasse un clin d\'œil"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"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 d\'usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure, voire plus. 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 vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"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établissant la configuration d\'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 vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"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établissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et la tablette doit rester branchée jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"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établissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et le téléphone doit rester branché jusqu\'à la fin. Si vous interrompez le processus, 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="2029407131227814893">"Veuillez charger votre batterie, puis réessayer."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"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="5100339496381875522">"Chiffrer ?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Le chiffrement est irréversible, et toute interruption du processus peut entraîner la perte de données. L\'opération peut prendre une heure, voire plus, 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="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"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="6891198717505120682">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. En conséquence, les données de votre tablette ne sont plus accessibles. "\n\n"Pour continuer d\'utiliser votre tablette, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. En conséquence, les données de votre téléphone ne sont plus accessibles. "\n\n"Pour continuer d\'utiliser votre téléphone, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Verrouillage de l\'écran"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles."\n\n"Pour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles."\n\n"Pour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Changer le mode de saisie"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Sélect. verr. écran"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Verrouillage secondaire"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Schéma"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Code PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <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="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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"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="6419879099090294052">"Le code PIN doit comporter moins de <xliff:g id="NUMBER">%d</xliff:g> chiffres."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Le code PIN ne doit contenir que des chiffres compris entre 0 et 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"L\'administrateur de l\'appareil ne permet pas l\'utilisation d\'un code PIN récent."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Le mot de passe contient un caractère non autorisé."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Le mot de passe doit comporter au moins une lettre."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Le mot de passe doit comporter au moins un chiffre."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Le mot de passe doit comporter au moins une lettre."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Le mot de passe doit comporter au moins une lettre minuscule."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Le mot de passe doit comporter au moins une lettre majuscule."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Le mot de passe doit comporter au moins un chiffre."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Le mot de passe doit comporter au moins un caractère spécial."</item>
+    <item quantity="other" msgid="1221290525051187757">"Le mot de passe doit comporter au moins %d caractères spéciaux."</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>
+    <item quantity="one" msgid="4594051152085925921">"Le mot de passe doit comporter au moins un caractère autre qu\'une lettre."</item>
+    <item quantity="other" msgid="3952508584649046404">"Le mot de passe doit comporter au moins %d caractères autres que 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_password_recently_used" msgid="6098087796784262081">"L\'administrateur de l\'appareil ne permet pas l\'utilisation d\'un mot de passe récent."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuler"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuler"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Suivant"</string>
-    <string name="lock_setup" msgid="1759001157415978959">"Configuration terminée."</string>
+    <string name="lock_setup" msgid="3355847066343753943">"La configuration est terminée."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Pour l\'association à :<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Saisir la clé d\'accès requise de 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_enter_pin_other_device" msgid="4637977124526813470">"Vous devrez peut-être également saisir ce code PIN sur l\'autre appareil."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Pour l\'association à :<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Saisissez <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, puis appuyez sur \"Retour\" ou sur \"Entrée\"."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Impossible d\'établir l\'association avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en raison d\'un code PIN ou d\'une clé d\'accès incorrects."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Impossible d\'établir la communication avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Impossible de se connecter à <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Autoriser l\'échange de données lorsque le téléphone touche un autre appareil"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Autoriser l\'échange de données lorsque la tablette est en contact avec un autre appareil"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Autoriser l\'échange de données lorsque le téléphone touche un autre appareil"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Prêt à partager le contenu de l\'application via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Désactivé"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponible, car la NFC est désactivée"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible NFC en rapprochant les appareils. Vous pouvez, par exemple, partager des pages de navigateur, des vidéos YouTube, des contacts et plus encore."\n\n"Il vous suffit de rapprocher les appareils (en les plaçant dos à dos), puis d\'appuyer sur votre écran. L\'application détermine le contenu à transférer."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Identification du service réseau"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Autoriser les applications sur d\'autres appareils à identifier les applications sur celui-ci"</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="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_setup_wizard_title" msgid="70277346338812325">"Sélectionner le Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Impossible de rechercher des réseaux."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notification de réseau"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Me notifier lorsqu\'un réseau ouvert est disponible"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Éviter mauvaises connexions"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Ne pas utiliser de réseau Wi-Fi, sauf en cas de connexion Internet de bonne qualité"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Éviter les connexions de mauvaise qualité"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Ne pas utiliser de réseau Wi-Fi, sauf en cas de connexion Internet de bonne qualité"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wi-Fi actif en veille"</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_wps_pbc" msgid="2668564692207863017">"Bouton commande WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Saisie code PIN WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Recherche de réseaux Wi-Fi en cours…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Autre réseau…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Plus"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuration auto (WPS)"</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="8242979682530043184">"Saisir le code PIN du point d\'accès"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Configuration WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Saisissez le code PIN <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_wps_setup_title" msgid="6034518116333042484">"Configuration Wi-Fi protégée"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Démarrage de la configuration WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Appuyez sur le bouton \"Configuration Wi-Fi protégée\" de votre routeur. Celui-ci peut s\'appeler \"WPS\" ou contenir ce symbole :"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Saisissez le code <xliff:g id="NUMBER">%1$s</xliff:g> sur votre routeur Wi-Fi. La configuration peut prendre jusqu\'à deux minutes."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Configuration WPS réussie. Connexion au réseau en cours…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Connecté au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configuration WPS est déjà en cours et peut prendre jusqu\'à deux minutes."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Échec de la configuration WPS. Veuillez réessayer dans quelques minutes."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"La configuration de sécurité du routeur sans fil (WEP) n\'est pas compatible."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuration de sécurité du routeur sans fil (TKIP) n\'est pas compatible."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Échec de l\'authentification. Veuillez réessayer."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Une autre session WPS a été détectée. Veuillez réessayer dans quelques minutes."</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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Mauvaise connexion Internet évitée"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Le réseau a été ignoré en raison d\'une mauvaise connexion. Désactivez ce comportement dans Paramètres &gt; Wi-Fi, menu \"Avancé\"."</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_wps_available_first_item" msgid="3538912605343585226">"Réseau protégé disponible"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (réseau protégé disponible)"</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_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Échec de la suppression du réseau."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Enregistrer"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Échec de l\'enregistrement du réseau."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuler"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Autre session Wi-Fi protégée détectée. Réessayez 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Passerelle"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longueur du préfixe réseau"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Configurer la connectivité peer-to-peer"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informations sur l\'appareil"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Configuration Wi-Fi protégée (WPS)"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Supprimer le groupe"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avancés"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Appareils disponibles"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Rechercher des appareils"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Recherche en cours…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Renommer l\'appareil"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Appareils associés"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Impossible de se connecter."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Échec du changement de nom de l\'appareil."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Déconnecter ?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Si vous vous déconnectez, votre connexion avec <xliff:g id="PEER_NAME">%1$s</xliff:g> prendra fin."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Si vous vous déconnectez, votre connexion avec <xliff:g id="PEER_NAME">%1$s</xliff:g> et <xliff:g id="PEER_COUNT">%2$s</xliff:g> autres appareils prendra fin."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annuler l\'invitation ?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Voulez-vous annuler l\'invitation à se connecter avec <xliff:g id="PEER_NAME">%1$s</xliff:g> ?"</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_configure_ap_text" msgid="3474995108398156258">"Configurer le point d\'accès Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"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="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Mode silencieux"</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="4296957391257836961">"Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Effets musicaux"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume de la sonnerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibreur et sonnerie"</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="incoming_call_volume_title" msgid="8073714801365904099">"Sonnerie"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Couper la sonnerie et le son des notifications"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Couper le son de la musique et des autres médias"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Couper le son des notifications"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Couper le son des alarmes"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibreur quand téléphone sonne"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Vous devez placer la tablette dans la station d\'accueil avant de configurer la partie audio de la station d\'accueil."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Vous devez poser le téléphone dans sa station d\'accueil avant de configurer la partie audio de la station d\'accueil."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Vous devez poser la tablette sur la station d\'accueil avant de configurer les paramètres audio de cette dernière."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Vous devez poser le téléphone sur la station d\'accueil avant de configurer les paramètres audio de celle-ci."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Son d\'insertion dans la station d\'accueil"</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="account_settings" msgid="6403589284618783461">"Comptes"</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="7965901687241669598">"Affichage"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mon numéro de téléphone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Version PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"Version de la liste d\'itinérance préférée"</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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Effacer toutes vos informations personnelles et les applications téléchargées ? Cette action est irréversible."</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="2234954758550554549">"Vous devez dessiner votre schéma de déverrouillage pour confirmer la réinitialisation de la configuration usine."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Vous devez dessiner votre schéma de déverrouillage pour confirmer le rétablissement de la configuration d\'usine."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"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="7572642091599403668">"Réinitialiser ?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Effacer la mémoire USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Effacer la carte SD en supprimant tous les fichiers qu\'elle contient ? Cette action est irréversible."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Tout effacer"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dessinez votre schéma de déverrouillage"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Dessinez votre schéma de déverrouillage pour confirmer l\'effacement de la mémoire de stockage USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vous devez dessiner votre schéma de déverrouillage pour confirmer l\'effacement de la mémoire de stockage USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"Partage connexion Bluetooth par USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Réseaux mobiles"</string>
     <string name="location_title" msgid="1029961368397484576">"Ma position"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Service de localisation"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Utiliser les données des réseaux Wi-Fi et mobiles pour déterminer votre position approximative"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Autoriser envoi de données de localisation anonymes à Google. Autoriser certaines applis à utiliser données des réseaux Wi-Fi et mobiles pour identifier votre position approx."</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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Appuyez sur Menu pour obtenir de l\'aide."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ôtez le doigt lorsque vous avez terminé."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Reliez au moins <xliff:g id="NUMBER">%d</xliff:g> points. Veuillez réessayer :"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Schéma enregistré !"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Schéma enregistré."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Redessinez le schéma pour confirmer :"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Votre nouveau schéma de déverrouillage :"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmer"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Suivant"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sécurisation de votre tablette"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Sécurisation de votre téléphone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"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="tablet" msgid="8616353869251700776">"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="8393155371327584659">"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="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gérer les applications, configurer des raccourcis de lancement rapide"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Paramètres de l\'application"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sources inconnues"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Autoriser l\'installation d\'applications ne provenant pas de l\'Android Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Autoriser l\'installation d\'applications issues de sources inconnues"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Votre tablette et vos données personnelles sont plus vulnérables face aux attaques d\'applications provenant de sources inconnues. Vous reconnaissez être seul responsable de tout dommage subi par votre tablette ou de toute perte de données pouvant découler de l\'utilisation de ces applications."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Votre téléphone et vos données personnelles sont plus vulnérables face aux attaques d\'applications provenant de sources inconnues. Vous reconnaissez être seul responsable de tout dommage subi par votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de ces applications."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"Paramètres 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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Effacer les données"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Désinstaller les mises à jour"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Vous avez choisi de lancer cette application par défaut pour certaines actions."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Vous avez choisi de permettre à cette application de créer des widgets et d\'accéder à leurs données."</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="1616155457673106022">"Cette application n\'est peut-être pas adaptée à votre écran. Vous pouvez modifier les paramètres d\'ajustement ici."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Trier par taille"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Afficher les services"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Voir processus en cache"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préf. applis"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences ?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Cette opération entraîne la réinitialisation de toutes les préférences pour : "\n\n" "<li>"les applications désactivées ;"</li>\n" "<li>"les notifications des applications désactivées ;"</li>\n" "<li>"les applications utilisées par défaut pour certaines actions ;"</li>\n" "<li>"les restrictions relatives aux données en arrière-plan pour les applications."</li>\n\n" Vous ne perdrez aucune des données relatives à ces applications."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Réinitialiser applis"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrer"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Sélectionner les options du filtre"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Cette application peut accéder aux éléments suivants de votre tablette :"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Cette application peut accéder aux éléments suivants 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="invalid_size_value" msgid="7563537715280712285">"Impossible de calculer la taille du package."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Modifier l\'emplacement d\'installation par défaut pour les nouvelles applications"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Désactiver appli intégrée ?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Si vous désactivez une application intégrée, cela peut provoquer des dysfonctionnements d\'autres applications."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Désactiver les notifications ?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si vous désactivez les notifications de cette application, vous risquez de manquer des alertes et des mises à jour importantes."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisation du stockage"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Afficher l\'espace de stockage utilisé par les applications"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Services en cours d\'exécution"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Ce mode de saisie est susceptible d\'enregistrer le texte que vous saisissez, y compris vos données personnelles, telles que les mots de passe et les numéros de carte de paiement. Il provient de l\'application <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voulez-vous vraiment l\'activer ?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ce correcteur orthographique peut recueillir l\'ensemble du texte saisi, y compris des données personnelles comme des mots de passe et des numéros de carte de paiement. Il provient de l\'application <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utiliser ce correcteur orthographique ?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Paramètres"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Langue"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Échec de l\'ouverture des paramètres de l\'application <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>."</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Souris/Pavé tactile"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Vitesse du pointeur"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Manette de jeu"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Utiliser le vibreur"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Rediriger le vibreur vers la manette de jeu lorsque vous êtes connecté"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Sélectionner disposition du clavier"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configurer dispositions clavier"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Appuyez sur Ctrl+Espace pour changer disposition"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Par défaut"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Dispositions du clavier"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dictionnaire personnel"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dictionnaire personnel"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"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_add_screen_title" msgid="742580720124344291">"Expression"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Plus d\'options"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Moins d\'options"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Mot :"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Raccourci :"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Langue :"</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="8165273379942105271">"Votre dictionnaire personnel ne contient aucun mot. Ajoutez un mot en appuyant sur le bouton d\'ajout (\"+\")."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Toutes les langues"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Pour toutes les langues"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Plus de langues…"</string>
     <string name="testing" msgid="6584352735303604146">"Test"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informations sur la tablette"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informations sur le téléphone"</string>
@@ -1133,19 +1188,30 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID appareil de développement"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Informations sur l\'appareil non disponibles."</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Rester activé"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Le débogage USB est conçu uniquement pour le développement. Utilisez-le pour copier des données entre votre ordinateur et votre appareil, installer des applications sur votre appareil sans notification et lire les données de journal."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Activer les paramètres de développement ?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ces paramètres sont en cours de développement. Ils peuvent endommager votre appareil et les applications qui s\'y trouvent, ou provoquer leur dysfonctionnement."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protéger mémoire de stockage USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Applis doivent demander autorisation lire mémoire stockage USB."</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protéger mémoire stockage USB ?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Lorsque la mémoire de stockage USB est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe."\n\n"Certaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protéger la carte SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Les applications doivent demander autorisation de lire carte SD."</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protéger la carte SD ?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Lorsque la carte SD est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe."\n\n"Certaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Choisir un gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Choisir un widget"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> mn <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> mn <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> mn <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Créer un widget et autoriser l\'accès ?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Une fois le widget créé, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> peut accéder à toutes les données qu\'il affiche."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Toujours autoriser <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> à créer des widgets et accéder à leurs données"</string>
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <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> h <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="usage_stats_label" msgid="5890846333487083609">"Données statistiques"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Données statistiques"</string>
@@ -1158,14 +1224,11 @@
     <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">"Bouton marche/arrêt raccroche"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Énoncer les mots de passe"</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 malvoyants."</string>
+    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Marche/arrêt pour raccrocher"</string>
+    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Énoncer mots de passe"</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Délai de pression"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Installer des scripts Web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Améliorer l\'accessibilité du Web"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Aucun service installé"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Vous avez besoin d\'un lecteur d\'écran ?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fournit des commentaires audio aux personnes malvoyantes. Voulez-vous l\'installer gratuitement depuis l\'Android Market ?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Installer des scripts Web ?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Voulez-vous que les applications installent des scripts de Google pour rendre leur contenu Web plus accessible ?"</string>
-    <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="1072730037861494125">"Aucune description fournie"</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_not_available" msgid="3214000535532434353">"Info d\'utilisation batterie indispo"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"Le moteur sélectionné ne peut pas fonctionner."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurer"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Sélectionner un autre moteur"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ce moteur de synthèse vocale est susceptible de collecter tout ce que vous direz, y compris les données personnelles comme les mots de passe et les numéros de carte de paiement. Il provient du moteur <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Voulez-vous activer son utilisation ?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Femme"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Activer moteur avant utilisation"</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Dessinez votre schéma de déverrouillage."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Pour confirmer l\'installation des certificats, vous devez dessiner votre schéma de déverrouillage."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Saisir le mot de passe de stockage des identifiants"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mot de passe actuel :"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Les identifiants sont effacés."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Impossible eff. stockage identifiants."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Avant de pouvoir utiliser le stockage des identifiants, vous devez définir un code PIN ou un mot de passe d\'écran de verrouillage."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Avant d\'utiliser le stockage d\'identifiants, vous devez définir un code PIN ou un mot de passe pour le verrouillage d\'écran."</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="5446972770562918934">"Sauvegarder et réinitialiser"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurer automatiquement"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Lors de la réinstallation d\'une application, restaurer les paramètres et les données sauvegardées"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"M. de passe sauv. ordinateur"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Les sauvegardes complètes sur ordinateur 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 complètes sur ordinateur."</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les sauvegardes PC complètes ne sont actuellement pas protégées."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Appuyez pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes PC complètes."</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Arrêter de sauvegarder vos mots de passe Wi-Fi, vos favoris, ainsi que d\'autres paramètres et données d\'applications, et en effacer toutes les copies des serveurs Google ?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Paramètres de gestion de l\'appareil"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Système"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Sonnerie et vibreur pour les appels"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Connexion au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Échec de la synchronisation"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Synchronisation activée"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"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="background_data" msgid="5779592891375473817">"Données en arrière-plan"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Dernière synchronisation : <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Synchronisation en cours…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><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, vos rendez-vous et plus, où que vous soyez."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"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>
@@ -1427,15 +1494,15 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Ce compte est requis par certaines applications. Vous ne pouvez le supprimer qu\'en rétablissant la configuration d\'usine de la tablette (ce qui supprime toutes vos données personnelles) dans Paramètres &gt; Sauvegarder et réinitialiser."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Ce compte est requis par certaines applications. Vous ne pouvez le supprimer qu\'en rétablissant la configuration d\'usine du téléphone (ce qui supprime toutes vos données personnelles) dans Paramètres &gt; Sauvegarder et réinitialiser."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La synchronisation de cet élément est actuellement désactivée. Pour modifier ce paramètre, activez temporairement les données en arrière-plan et la synchronisation automatique."</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="enter_password" msgid="4131758584074246224">"Saisir le mot de passe pour déchiffrer la mémoire de stockage"</string>
-    <string name="try_again" msgid="4272075051293936921">"Veuillez réessayer."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Le service est occupé. Veuillez réessayer."</string>
+    <string name="try_again" msgid="4272075051293936921">"Réessayer"</string>
     <string name="delete" msgid="4219243412325163003">"Supprimer"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Débogage"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Sélectionner une application à déboguer"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Aucune application à déboguer définie"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Application à déboguer : <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Sélectionner une application"</string>
+    <string name="no_application" msgid="2813387563129153880">"Aucune"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Attendre l\'intervention du débogueur"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Avant de s\'exécuter, l\'application déboguée doit attendre que le débogueur soit attaché."</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Saisie"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Tracé"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Suivi"</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é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_screen_updates" msgid="5470814345876056420">"Affich. mise à jour surface"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Surbrillance surfaces entières durant mise à jour"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Afficher mises à jour GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Surbrillance dans les fenêtres si conçues avec GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Désact. superpos. matér."</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser GPU pour composition graphique"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Activer les traces"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Sélect. traces activées"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Aucune trace n\'est activée actuellement."</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traces activées actuellement"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Toutes les traces sont actuellement activées."</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Afficher les contours"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Afficher les limites, les marges de clip, etc."</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="force_hw_ui" msgid="6426383462520888732">"Forcer le rendu GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Utiliser accélération matérielle 2D dans applis"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forcer l\'utilisation du GPU pour le dessin 2D"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Rendu GPU du profil"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mesurer durée rendu dans adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Échelle durée animation"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1562,14 @@
     <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 conso en Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Afficher l\'utilisation Ethernet"</string>
+    <string name="data_usage_menu_metered" msgid="5056695223222541863">"Points d\'accès mobiles"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Synchronisation automatique des données"</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="8621855507876539282">"Aucune donnée utilisée par les applications pendant cette 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_disclaimer" product="tablet" msgid="2591250607795265503">"Données mesurées par la tablette, pouvant différer de celles de votre opérateur."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Données mesurées par le téléphone, pouvant différer de celles de votre opérateur."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"limitée"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Désactiver les données mobiles ?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Définir un plafond"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Définir le quota de données 4G"</string>
@@ -1488,33 +1580,45 @@
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobiles"</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_list_mobile" msgid="5588685410495019866">"Mobile"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Afficher paramètres application"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Limiter données en arrière-plan"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Désactiver données en arrière-plan uniquement sur réseau mobile. Utiliser Wi-Fi si disponible."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Désactiver données arrière-plan sur réseaux mobiles. Utiliser autres réseaux si dispos."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Pour restreindre les données en arrière-plan, définissez un quota de données mobiles."</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="5651588785118290771">"Lorsque le Wi-Fi n\'est pas disponible, cette fonctionnalité peut entraîner l\'arrêt d\'une application utilisant des données en arrière-plan."\n\n"Vous pourrez accéder à davantage d\'options utiles permettant de contrôler la consommation des données dans les paramètres de l\'application."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Cette fonctionnalité peut empêcher certaines applications de s\'exécuter lorsque celles-ci sont dépendantes des données en arrière-plan et que seuls des réseaux mobiles sont disponibles."\n\n"Vous trouverez des options plus adaptées en matière de contrôle de la consommation des données dans les paramètres de l\'application."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"La limitation des données en arrière-plan n\'est disponible que lorsque vous avez défini un plafond de données mobiles."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activer synchro auto données ?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre tablette."\n\n"Certains comptes permettent également de copier automatiquement sur le Web toutes les modifications que vous effectuez sur la tablette. C\'est le cas des comptes Google."\n\n"Pour sélectionner le type d\'informations à synchroniser au sein de chaque compte, accédez à Paramètres &gt; Comptes."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre téléphone."\n\n"Certains comptes permettent également de copier automatiquement sur le Web toutes les modifications que vous effectuez sur le téléphone. C\'est le cas des comptes Google."\n\n"Pour sélectionner le type d\'informations à synchroniser au sein de chaque compte, accédez à Paramètres &gt; Comptes."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Désactiver synchro auto données ?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Cela limite la consommation des données et l\'utilisation de la batterie, mais vous devrez synchroniser manuellement chaque compte pour recueillir les informations récentes. Par ailleurs, vous ne recevrez pas de notifications en cas de mise à jour."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Date de réinitialisation du cycle de consommation"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Jour du mois :"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Définir"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Définir avertissement utilisation des données"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Définir un quota d\'utilisation des données"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitation de la consommation de données mobiles"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Votre connexion réseau <xliff:g id="NETWORKS">%1$s</xliff:g> sera désactivée une fois le seuil défini atteint."\n\n"L’utilisation des données étant mesurée par la tablette, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Votre connexion réseau <xliff:g id="NETWORKS">%1$s</xliff:g> sera désactivée une fois le seuil défini atteint."\n\n"L’utilisation des données étant mesurée par le téléphone, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Votre connexion Internet mobile sera désactivée une fois le seuil défini atteint."\n\n"La consommation des données étant mesurée par la tablette, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Votre connexion Internet mobile sera désactivée une fois le seuil défini atteint."\n\n"La consommation des données étant mesurée par le téléphone, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</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="6387252645350792955">"Si vous limitez les données mobiles en arrière-plan, certains services et applications ne fonctionneront que si vous êtes connecté à un réseau Wi-Fi."</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">"alerte"</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">"plafond"</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g> : environ <xliff:g id="TOTAL">%1$s</xliff:g> utilisés"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g> : environ <xliff:g id="TOTAL">%1$s</xliff:g> utilisés"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g> : env. <xliff:g id="TOTAL">%1$s</xliff:g> utilisés,  selon votre tablette. Le suivi conso de votre opérateur peut différer."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g> : env. <xliff:g id="TOTAL">%1$s</xliff:g> utilisés, selon votre téléphone. Le suivi conso de votre opérateur peut différer."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Points d\'accès mobiles"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Sélectionnez les réseaux Wi-Fi qui sont des points d\'accès mobiles. Il est possible que les applications qui s\'exécutent en arrière-plan ne soient pas autorisées à utiliser ces réseaux. Les applications peuvent également vous avertir avant de les utiliser pour les téléchargements volumineux."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Réseaux mobiles"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Réseaux Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Pour sélectionner des points d\'accès mobiles, activez le Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Modifier le profil VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Se connecter à <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Ajouter un profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Modifier le profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Supprimer le profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Aucune connexion réseau. Veuillez réessayer ultérieurement."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Certificat manquant. Veuillez modifier le profil."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"Après avoir activé la fonctionnalité \"Explorer au toucher\", vous pouvez appuyer sur l\'écran pour connaître l\'élément sélectionné. Par exemple, l\'écran actuel contient des icônes d\'applications. Découvrez plus d\'informations sur 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="3973201880357468747">"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="8764686624055084454">"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="3055831259260848004">"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="spellcheckers_settings_title" msgid="399981228588011501">"Correcteur orthographique"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Saisissez le mot de passe actuel utilisé pour les sauvegardes complètes."</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Saisissez votre nouveau mot de passe pour les sauvegardes complètes."</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Confirmez ici votre nouveau mot de passe de sauvegarde complète."</string>
@@ -1582,4 +1670,22 @@
     <!-- no translation found for percentage (5866131581207788624) -->
     <skip />
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mises à jour supplémentaires du système"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Utilisateurs et restrictions"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Utilisateurs"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Ajouter utilisateur"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Modifier les informations"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Informations sur l\'utilisateur"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nom"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restrictions liées au contenu"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Exiger un code PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Classification du contenu"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Applications système"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Applications installées"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Supprimer"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Suppr. l\'utilisateur"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Enfant turbulent"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Supprimer l\'utilisateur ?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Voulez-vous vraiment supprimer le compte utilisateur ainsi que toutes les données associées de l\'appareil ?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Afficher notifications"</string>
+    <string name="help_label" msgid="1107174367904110532">"Aide"</string>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index b71a82a..63c672d 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"डिस्‍कनेक्‍ट हो रहा है..."</item>
     <item msgid="1634960474403853625">"डिस्कनेक्‍ट किया गया"</item>
     <item msgid="746097431216080650">"असफल"</item>
+    <item msgid="6367044185730295334">"अवरोधित"</item>
+    <item msgid="503942654197908005">"खराब कनेक्शन को अस्थायी रूप से अनदेखा कर रहा है"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से डिस्‍कनेक्‍ट कर रहा है…"</item>
     <item msgid="197508606402264311">"डिस्कनेक्‍ट किया गया"</item>
     <item msgid="8578370891960825148">"असफल"</item>
+    <item msgid="5660739516542454527">"अवरोधित"</item>
+    <item msgid="1805837518286731242">"खराब कनेक्शन को अस्थायी रूप से अनदेखा कर रहा है"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"पुश बटन"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"कोई नहीं"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"पहुंच बिंदु से पिन"</item>
-    <item msgid="7364462169350112617">"इस उपकरण से पिन"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"स्थिर"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"निकाले जाने योग्‍य SD कार्ड"</item>
     <item msgid="4498124044785815005">"सिस्‍टम को निर्धारित करने दें"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"बंद करें"</item>
-    <item msgid="4804571292609523335">"कंपन करें"</item>
-    <item msgid="595707141547423573">"म्यूट करें"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
     <item msgid="2560532955514699713">"मध्यम"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"एनिमेशन स्‍केल 5x"</item>
     <item msgid="6660750935954853365">"एनिमेशन स्‍केल 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"एनिमेशन बंद"</item>
+    <item msgid="1138649021950863198">"एनिमेशन स्‍केल .5x"</item>
+    <item msgid="4394388961370833040">"एनिमेशन स्‍केल 1x"</item>
+    <item msgid="8125427921655194973">"एनिमेशन स्‍केल 1.5x"</item>
+    <item msgid="3334024790739189573">"एनिमेशन स्‍केल 2x"</item>
+    <item msgid="3170120558236848008">"एनिमेशन स्‍केल 5x"</item>
+    <item msgid="1069584980746680398">"एनिमेशन स्‍केल 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"मानक सीमा"</item>
     <item msgid="4071574792028999443">"कोई पृष्ठभूमि प्रक्रियाएं नहीं"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 489ebde..9ecee91 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"हां"</string>
     <string name="no" msgid="6731231425810196216">"नहीं"</string>
+    <string name="create" msgid="3578857613172647409">"बनाएं"</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>
@@ -111,6 +112,8 @@
     <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_device_details" msgid="4594773497930028085">"उपकरण सेटिंग"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"प्रोफ़ाइल सेटिंग"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"कोई नाम सेट नहीं है, खाता नाम का उपयोग कर रहा है"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"उपकरणों के लिए स्‍कैन"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"टेबलेट का नाम बदलें"</string>
@@ -131,13 +134,12 @@
     <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="5655704645616731277">"युग्मित करने हेतु स्‍पर्श करें"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"आस-पास कोई 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="1931617700075106801">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्‍मित करने के लिए स्पर्श करें"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"<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="device_picker" msgid="8398232791303186677">"Bluetooth उपकरण चयनकर्ता"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth अनूमति अनुरोध"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है. अनुमति दें?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"आपके टेबलेट पर कोई एप्‍लिकेशन <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्‍य Bluetooth उपकरणों द्वारा आपके टेबलेट को खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\"<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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ठीक"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"आपके द्वारा लिखा गया होस्‍टनाम मान्‍य नहीं है."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"आपके द्वारा लिखी गई बहिष्करण सूची ठीक से प्रारूपित नहीं है. बहिष्‍कृत डोमेन की अल्‍पविराम द्वारा पृथक सूची लिखें."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"आपको पोर्ट फ़ील्‍ड अवश्‍य पूर्ण करनी चाहिए."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"आपको पोर्ट फ़ील्‍ड पूर्ण करना होगा."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"यदि होस्‍ट फ़ील्‍ड रिक्त है तो पोर्ट फ़ील्‍ड को रिक्त होना ही चाहिए."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"आपके द्वारा लिखा गया पोर्ट मान्‍य नहीं है."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य एप्‍लिकेशन द्वारा उपयोग नहीं किया जा सकता."</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"जब USB केबल को पुन: कनेक्‍ट किए जाने पर परिवर्तन प्रभावी होते हैं"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB संग्रहण माउंट नहीं है."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"कोई 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="6691584887397909775">"USB संग्र. निकालना अब सुरक्षित है"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"अब SD कार्ड निकालना सुरक्षित है"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB संग्रहण का उपयोग विशाल संग्रहण उपकरण जैसे हो रहा है."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD कार्ड का उपयोग विशाल संग्रहण उपकरण के रूप में किया जा रहा है."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"USB संग्रहण निकालना अब सुरक्षित है."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"अब 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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"केवल पढ़ने हेतु माउंट USB संग्रहण."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD कार्ड केवल पढ़ने के लिए माउंट किया गया."</string>
     <string name="skip_label" msgid="47510779345218297">"छोड़ें"</string>
     <string name="next_label" msgid="4693520878012668114">"अगला"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"भाषा"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो परिणामस्वरूप आप पर रोमिंग शुल्‍क लग सकते हैं!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"डेटा रोमिंग की अनुमति दें?"</string>
     <string name="networks" msgid="6333316876545927039">"ऑपरेटर चयन"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"कोई नेटवर्क ऑपरेटर चुनें"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"दिनांक और समय"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"डेटा प्रारूप चुनें"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"चेहरे का मिलान बेहतर बनाएं"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"जीवंतता जांच"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"पलक झपकाना आवश्‍यक है"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"आप अपने खातों, सेटिंग, डाउनलोड किए गए एप्‍लिकेशन और उनके डेटा, मीडिया एवं अन्‍य फ़ाइलों को एन्‍क्रिप्‍ट कर सकते हैं. अपना टेबलेट एन्‍क्रिप्ट करने के बाद, हर बार इसे चालू करते समय इसे डीक्रिप्‍ट करने के लिए आपको एक संख्‍यात्‍मक पिन या पासवर्ड दर्ज करना होगा: आप अपना सभी डेटा मिटाकर, फ़ैक्‍टरी डेटा रीसेट करने के अलावा किसी अन्‍य तरीके से अपने टेबलेट को अनएन्‍क्रिप्ट नहीं कर सकते."\n\n"एन्‍क्रिप्‍शन में एक घंटा या अधिक समय लगता है. आपको एक चार्ज की हुई बैटरी के साथ शुरू करना चाहिए और एन्क्रिप्शन पूरा होने तक अपने टेबलेट को प्‍लग इन करके रखना चाहिए. यदि आप एन्‍क्रिप्‍शन प्रक्रिया में बाधा डालते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"आप अपने खातों, सेटिंग, डाउनलोड किए गए एप्‍लिकेशन और उनके डेटा, मीडिया एवं अन्‍य फ़ाइलों को एन्‍क्रिप्‍ट कर सकते हैं. अपना फ़ोन एन्‍क्रिप्ट करने के बाद, हर बार उसे चालू करते समय उसे डीक्रिप्‍ट करने के लिए आपको एक संख्‍यात्‍मक पिन या पासवर्ड दर्ज करना होगा: आप अपना सभी डेटा मिटाकर, फ़ैक्‍टरी डेटा रीसेट करने के अलावा किसी अन्‍य तरीके से अपने फ़ोन को अनएन्‍क्रिप्ट नहीं कर सकते."\n\n"एन्‍क्रिप्‍शन में एक घंटा या अधिक समय लगता है. आपको एक चार्ज की हुई बैटरी के साथ शुरू करना चाहिए और एन्क्रिप्शन पूरा होने तक अपने फ़ोन को प्‍लग इन करके रखें. यदि आप एन्‍क्रिप्‍शन प्रक्रिया में बाधा डालते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना टेबलेट एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे डीक्रिप्ट करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते."\n\n"एन्क्रिप्शन एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और एन्क्रिप्शन पूर्ण होने तक अपने टेबलेट को प्लग इन रखना चाहिए. यदि आप एन्क्रिप्शन प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना फ़ोन एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे डीक्रिप्ट करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते."\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="2029407131227814893">"अपनी बैटरी चार्ज करें और पुन: प्रयास करें."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"अपना चार्जर प्लग में लगाएं और पुन: प्रयास करें."</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_dialog_need_password_message" msgid="4071395977297369642">"एन्‍क्रिप्‍शन प्रारंभ करने से पहले आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एन्‍क्रिप्‍ट करें?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"एन्‍क्रिप्शन कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान टेबलेट कई बार पुन: प्रारंभ होगा."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"एन्‍क्रिप्शन कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान फ़ोन कई बार पुन: प्रारंभ होगा."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"एन्‍क्रिप्‍ट करना"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"अपना टेबलेट एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"अपना फ़ोन एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <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="2223340178473871064">"अपना पासवर्ड लिखें"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एन्क्रिप्‍शन विफल"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके टेबलेट का डेटा अब पहुंच योग्‍य नहीं है. "\n\n"अपने टेबलेट का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करनी होगी. जब आप रीसेट करने के बाद अपना टेबलेट सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. "\n\n"अपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करनी होगी. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"स्‍क्रीन लॉक चुनें"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"एन्‍क्रिप्‍शन बाधित किया था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके टेबलेट का डेटा अब पहुंच योग्‍य नहीं है. "\n\n" अपने टेबलेट का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टेबलेट सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. इसके परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. "\n\n"अपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धति‍ स्विच करें"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्‍क्रीन लॉक चुनें"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"बैकअप लॉक चुनें"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"लॉक स्‍क्रीन बदलें"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"फेस अनलॉक"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"प्रतिमान"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"पिन"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"पासवर्ड"</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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"पिन में कम से कम %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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"पासवर्ड <xliff:g id="NUMBER">%d</xliff:g> से कम वर्णों का होना चाहिए."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"पिन <xliff:g id="NUMBER">%d</xliff:g> से कम अंकों का होना चाहिए."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"पिन में केवल 0-9 अंक होने चाहिए."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"उपकरण व्‍यवस्‍थापक हाल ही के पिन का उपयोग करने की अनुमति नहीं देता."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"पासवर्ड में एक अमान्‍य वर्ण है."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"पासवर्ड में कम से कम एक अक्षर होना चाहिए."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"पासवर्ड में कम से कम एक अंक होना चाहिए."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"पासवर्ड में कम से कम एक प्रतीक होना चाहिए."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"पासवर्ड में कम से कम 1 अक्षर होना चाहिए"</item>
-    <item quantity="other" msgid="7278096339907683541">"पासवर्ड में कम से कम %d अक्षर होने चाहिए"</item>
+    <item quantity="one" msgid="3063853802158131458">"पासवर्ड में कम से कम 1 अक्षर होना चाहिए."</item>
+    <item quantity="other" msgid="8186027808415585970">"पासवर्ड में कम से कम %d अक्षर होने चाहिए."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"पासवर्ड में कम से कम 1 लोअरकेस अक्षर होना चाहिए"</item>
-    <item quantity="other" msgid="588499075580432178">"पासवर्ड में कम से कम %d लोअरकेस अक्षर होने चाहिए"</item>
+    <item quantity="one" msgid="5583986519662091001">"पासवर्ड में कम से कम 1 लोअरकेस अक्षर होना चाहिए."</item>
+    <item quantity="other" msgid="2693910942679679225">"पासवर्ड में कम से कम %d लोअरकेस अक्षर होने चाहिए."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"पासवर्ड में कम से कम 1 अपरकेस अक्षर होना चाहिए"</item>
-    <item quantity="other" msgid="2183090598541826806">"पासवर्ड में कम से कम %d अपरकेस अक्षर होने चाहिए"</item>
+    <item quantity="one" msgid="2611909966725502768">"पासवर्ड में कम से कम 1 अपरकेस अक्षर होना चाहिए."</item>
+    <item quantity="other" msgid="3030801209112209245">"पासवर्ड में कम से कम %d अपरकेस अक्षर होने चाहिए."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"पासवर्ड में कम से कम एक संख्‍यात्‍मक अंक होना चाहिए"</item>
-    <item quantity="other" msgid="995673409754935278">"पासवर्ड में कम से कम %d संख्‍यात्‍मक अंक होने चाहिए"</item>
+    <item quantity="one" msgid="3820355568839621231">"पासवर्ड में कम से कम 1 संख्‍यात्‍मक अंक होना चाहिए."</item>
+    <item quantity="other" msgid="4703982391407595924">"पासवर्ड में कम से कम %d संख्‍यात्‍मक अंक होने चाहिए."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"पासवर्ड में कम से कम 1 विशेष प्रतीक होना चाहिए"</item>
-    <item quantity="other" msgid="3047460862484105274">"पासवर्ड में कम से कम %d विशेष प्रतीक होने चाहिए"</item>
+    <item quantity="one" msgid="8456579939292408631">"पासवर्ड में कम से कम 1 विशेष प्रतीक होना चाहिए."</item>
+    <item quantity="other" msgid="1221290525051187757">"पासवर्ड में कम से कम %d विशेष प्रतीक होने चाहिए."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"पासवर्ड में कम से कम एक ग़ैर-अक्षरी वर्ण होना चाहिए"</item>
-    <item quantity="other" msgid="5574191164708145973">"पासवर्ड में कम से कम %d ग़ैर-अक्षरी वर्ण होने चाहिए"</item>
+    <item quantity="one" msgid="4594051152085925921">"पासवर्ड में कम से कम 1 वर्ण ऐसा होना चाहिए जो अक्षर न हो."</item>
+    <item quantity="other" msgid="3952508584649046404">"पासवर्ड में कम से कम %d वर्ण ऐसे होने चाहिए जो अक्षर न हों."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"उपकरण व्‍यवस्‍थापक हाल ही के पासवर्ड के उपयोग की अनुमति नहीं देता है"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"उपकरण व्‍यवस्‍थापक हाल ही के पासवर्ड का उपयोग करने की अनुमति नहीं देता."</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="lock_setup" msgid="1759001157415978959">"सेटअप पूर्ण"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"सेटअप पूर्ण है."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"इसके साथ युग्‍मित करने के लिए:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>उपकरण के लिए आवश्‍यक पासकी लिखें:"</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_enter_pin_other_device" msgid="4637977124526813470">"आपको अन्‍य उपकरण पर भी यह पि‍न लिखने की आवश्‍यकता हो सकती है."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"आपको अन्‍य उपकरण पर भी यह पासकी लिखनी होगी."</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="2796550001376088433">"इसके साथ युग्‍मित करने के लिए:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>इस पर लिखें:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, फिर Return या Enter दबाएं."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"गलत पिन या पासकी के कारण <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के साथ युग्‍मित नहीं हो सका."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<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_connecting_error_message" msgid="229861986106185022">"<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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"जब फ़ोन अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"जब टेबलेट अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"जब फ़ोन अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC के माध्यम से एप्लिकेशन सामग्री प्रसारित करने के लिए तैयार"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"बंद"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"अनुपलब्‍ध है क्‍योंकि NFC बंद है"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"जब यह सुविधा चालू हो, तो आप एप्लिकेशन सामग्री को किसी अन्‍य NFC-सक्षम उपकरण पर दोनों उपकरणों को पास-पास रख कर बीम कर सकते हैं. उदाहरण के लिए, आप ब्राउज़र पृष्ठ, YouTube वीडियो, लोग संपर्क, इत्‍यादि बहुत कुछ बीम कर सकते हैं."\n\n"बस दोनों उपकरणों को साथ लाएं (आमतौर पर एक के पीछे एक) और फिर अपनी स्‍क्रीन को स्‍पर्श करें. एप्लिकेशन पता लगा लेता है कि क्‍या बीम हुआ."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"नेटवर्क सेवा खोज"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"अन्‍य उपकरणों पर एप्‍लिकेशन को इस उपकरण पर एप्‍लिकेशन खोजने दें"</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="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_setup_wizard_title" msgid="70277346338812325">"Wi-Fi का चयन करें"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"नेटवर्क के लिए स्‍कैन नहीं कर सकता"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"नेटवर्क सूचना"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"खुला नेटवर्क उपलब्‍ध होने पर मुझे सूचित करें"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"खराब कनेक्‍शन पर ध्‍यान न दें"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"अच्छा इंटरनेट कनेक्‍शन नहीं होने तक Wi-Fi नेटवर्क का उपयोग न करें"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्‍शन से बचें"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"जब तक अच्छा इंटरनेट कनेक्‍शन न हो, तब तक Wi-Fi नेटवर्क का उपयोग न करें"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"निष्क्रिय होने के दौरान 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_wps_pbc" msgid="2668564692207863017">"WPS पुश बटन"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टि"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"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_empty_list_wifi_on" msgid="3354911729026237372">"Wi-Fi नेटवर्क खोज रहा है…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"अन्‍य नेटवर्क…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"उन्नत विकल्प दिखाएं"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"पहुंच बिंदु से पिन लिखें"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS सेटअप"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"पहुंच बिंदु पर <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_wps_setup_title" msgid="6034518116333042484">"Wi-Fi सुरक्षित सेटअप"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ हो रहा है…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"अपने रूटर पर Wi-Fi सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इसमें यह चिह्न हो सकता है:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"अपने Wi-Fi राउटर पर पिन <xliff:g id="NUMBER">%1$s</xliff:g> दर्ज करें. सेटअप पूर्ण होने में दो मिनट लग सकते हैं."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS सफल रहा. नेटवर्क से कनेक्‍ट हो रहा है…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्‍ट किया गया"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS पहले से ही प्रगति में है और पूर्ण होने में दो मिनट लग सकते हैं"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS विफल रहा. कृपया कुछ मिनटों में पुन: प्रयास करें."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"वायरलेस राउटर सुरक्षा सेटिंग (WEP) समर्थित नहीं है"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"वायरलेस राउटर सुरक्षा सेटिंग (TKIP) समर्थित नहीं है"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"प्रमाणीकरण विफल. कृपया पुन: प्रयास करें."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"अन्‍य WPS सत्र का पता चला. कृपया कुछ मिनटों में पुन: प्रयास करें."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"नेटवर्क SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"सुरक्षा"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"सिग्‍नल शक्ति"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"सहेजा गया"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"अक्षम"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"खराब कनेक्‍शन पर ध्‍यान नहीं दि‍या गया"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"खराब कनेक्शन के कारण नेटवर्क पर ध्यान नहीं दिया गया था. सेटिंग &gt; Wi-Fi स्क्रीन, उन्नत मेनू आइटम से इस व्यवहार को बंद करें."</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="3538912605343585226">"सुरक्षित नेटवर्क उपलब्‍ध"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (सुरक्षित नेटवर्क उपलब्‍ध)"</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_failed_connect_message" msgid="8491902558970292871">"नेटवर्क से कनेक्ट करने में विफल रहा"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"भूलें"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"नेटवर्क भूलने में विफल रहा"</string>
     <string name="wifi_save" msgid="3331121567988522826">"सहेजें"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"नेटवर्क सहेजने में विफल रहा"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"रद्द करें"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"एक अन्‍य Wi-Fi सुरक्षित सत्र का पता चला. कुछ मिनट में पुन: प्रयास करें."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"नेटवर्क उपसर्ग लंबाई"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi प्रत्यक्ष"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"साथी-से-साथी कनेक्टिविटी सेट करें"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi प्रत्यक्ष"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"उपकरण जानकारी"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi सुरक्षित सेटअप"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"पिन लिखें"</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_remove_group" msgid="4844634506540667517">"समूह निकालें"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"उन्नत"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"उपलब्ध उपकरण"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"उपकरण खोजें"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"खोज रहा है…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"उपकरण का नाम बदलें"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"पीयर उपकरण"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"कनेक्‍ट नहीं किया जा सका."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"उपकरण का नाम बदलने में विफल रहा."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"डिस्‍कनेक्‍ट करें?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"यदि आप डिस्‍कनेक्‍ट करते हैं, तो <xliff:g id="PEER_NAME">%1$s</xliff:g> के साथ आपका कनेक्‍शन समाप्त हो जाएगा."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"यदि आप डिस्‍कनेक्‍ट करते हैं, तो <xliff:g id="PEER_NAME">%1$s</xliff:g> और <xliff:g id="PEER_COUNT">%2$s</xliff:g> अन्‍य उपकरणों के साथ आपका कनेक्‍शन समाप्त हो जाएगा."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"आमंत्रण रद्द करें?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"क्या आप <xliff:g id="PEER_NAME">%1$s</xliff:g> से कनेक्ट होने का आमंत्रण रद्द करना चाहते हैं?"</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_ap_text" msgid="61237027772641155">"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="display_settings_title" msgid="1708697328627382561">"प्रदर्शित करें"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनि"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"मौन मोड"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फ़ोन रिंगटोन"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"वॉल्यूम"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"संगीत प्रभाव"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"रिंगर वॉल्‍यूम"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन होने पर कंपन करें"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"कंपन और रिंग करें"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन और सूचनाएं म्‍यूट करें"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"संगीत और अन्‍य मीडिया म्‍यूट करें"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"सूचनाएं म्‍यूट करें"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"अलार्म म्‍यूट करें"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"रिंग आने पर कंपन करें"</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>
@@ -623,14 +651,15 @@
     <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="9015625921245904495">"डॉक ऑडियो सेट करने से पहले आपको टेबलेट को डॉक करना होगा."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"डॉक ऑडियो सेट करने से पहले आपको फ़ोन डॉक करना होगा."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"डॉक ऑडियो सेट करने से पहले आपको टेबलेट को डॉक करना होगा."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"डॉक ऑडियो सेट करने से पहले आपको फ़ोन को डॉक करना होगा."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"डॉक इंसर्ट ध्‍वनि"</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>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <string name="search_settings" msgid="1910951467596035063">"खोज"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"खोज सेटिंग और इतिहास प्रबंधित करें"</string>
     <string name="display_settings" msgid="7965901687241669598">"प्रदर्शन"</string>
@@ -702,7 +731,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"आपकी सभी निजी जानकारी और डाउनलोड किए गए एप्‍लिकेशन मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सब कुछ मिटाएं"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"अपना अनलॉक प्रतिमान आरेखित करें"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"फ़ैक्‍टरी डेटा रीसेट की पुष्टि के लिए आपको अपना अनलॉक प्रतिमान आरेखित करना होगा."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"आपको फ़ैक्टरी डेटा रीसेट की पुष्टि करने के लिए अपना अनलॉक प्रतिमान बनाना होगा."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"सिस्‍टम साफ़ करें सेवा उपलब्‍ध न होने के कारण कोई रीसेट निष्‍पादित नहीं किया गया था."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करें?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB संग्रहण मिटाएं"</string>
@@ -838,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"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="nosdcard" msgid="2192044794228379224">"आप USB संग्रहण मिटाना चाहते हैं, इसकी पुष्टि के लिए आपको अपना अनलॉक प्रतिमान बनाना होगा."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"आप 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="6688416425801386511">"USB टेदरिंग"</string>
@@ -870,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"मोबाइल नेटवर्क"</string>
     <string name="location_title" msgid="1029961368397484576">"मेरा स्थान"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google की स्‍थान सेवा"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"एप्लिकेशन को आपका अनुमानित स्‍थान निर्धारित करने के लिए Wi-Fi और मोबाइल नेटवर्क जैसे स्रोतों के डेटा का उपयोग करने दें"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"अनाम स्‍थान डेटा Google को भेजने देता है. साथ ही आपके अनुमानित स्‍थान का निर्धारण करने के लिए अनुमति प्राप्त एप्‍लिकेशन को 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>
@@ -915,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"सहायता के लिए मेनू दबाएं."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"पूर्ण होने पर अंगुली हटा लें."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"कम से कम <xliff:g id="NUMBER">%d</xliff:g> बिंदु कनेक्‍ट करें. पुन: प्रयास करें:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"प्रतिमान रिकॉर्ड किया गया!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"प्रतिमान रिकॉर्ड किया गया."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"पुष्टि के लिए पुन: प्रतिमान आरेखित करें:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"आपका नया अनलॉक प्रतिमान:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"पुष्टि करें"</string>
@@ -937,7 +966,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"अगला"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"अपने टेबलेट को सुरक्षित करना"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"आपके फ़ोन को सुरक्षित करना"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"व्यक्तिगत स्‍क्रीन अनलॉक प्रतिमान बनाकर अपने टेबलेट को अनधिकृत उपयोग से बचाएं. बिंदुओं को किसी भी क्रम में जोड़ने के लिए अपनी अंगुली को अगली स्‍क्रीन पर स्लाइड करें. आपको कम से कम चार बिंदुओं को जोड़ना होगा. "\n\n"शुरू करने के लिए तैयार हैं? अगला स्पर्श करें."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"कोई निजी स्‍क्रीन अनलॉक प्रतिमान बनाकर अपने टेबलेट को अनधिकृत उपयोग से बचाएं. बिंदुओं को किसी भी क्रम में जोड़ने के लिए अपनी अंगुली को अगली स्‍क्रीन पर स्लाइड करें. आपको कम से कम चार बिंदुओं को जोड़ना होगा. "\n\n"प्रारंभ करने के लिए तैयार हैं? अगला स्पर्श करें."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"व्यक्तिगत स्‍क्रीन अनलॉक प्रतिमान बनाकर अपने फ़ोन को अनधिकृत उपयोग से बचाएं. कम से कम चार बिंदुओं को किसी भी क्रम में जोड़ने के लिए अपनी अंगुली को अगली स्‍क्रीन पर स्लाइड करें. "\n\n"शुरू करने के लिए तैयार हैं? अगला स्पर्श करें."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"एप्लिकेशन प्रबंधित करें"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"इंस्‍टॉल किए गए एप्‍लिकेशन प्रबंधित करें और निकालें"</string>
@@ -945,7 +974,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"एप्‍लिकेशन प्रबंधित करें, त्‍वरित लॉन्‍च शॉर्टकट सेट करें"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"एप्‍लिकेशन सेटिंग"</string>
     <string name="install_applications" msgid="4872012136210802181">"अज्ञात स्रोत"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"गैर-Market एप्‍लिकेशन को इंस्‍टॉलेशन की अनुमति दें"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"अज्ञात स्रोतों से एप्लिकेशन इंस्टॉल करने दें"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"आपका टेबलेट एवं निजी डेटा अज्ञात स्रोतों के एप्‍लिकेशन के आक्रमण के प्रति अधिक भेद्य हैं. आप इस बात से सहमत हैं कि आप इन एप्‍लिकेशन के उपयोग परिणामस्वरूप आपके टेबलेट को होने वाली क्षति या डेटा की हानि के लिए पूर्ण रूप से ज़िम्मेदार हैं."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"आपका फ़ोन एवं निजी डेटा अज्ञात स्रोतों के एप्‍लिकेशन के आक्रमण के प्रति अधिक भेद्य हैं. आप इस बात से सहमत हैं कि आप इन एप्‍लिकेशन के उपयोग परिणामस्वरूप आपके फ़ोन को होने वाली क्षति या डेटा की हानि के लिए पूर्ण रूप से ज़िम्मेदार हैं."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"उन्नत सेटिंग"</string>
@@ -953,6 +982,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"एप्‍लिकेशन जानकारी"</string>
     <string name="storage_label" msgid="8700867073480107253">"संग्रहण"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"डिफ़ॉल्‍ट रूप से लॉन्‍च करें"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"डिफ़ॉल्‍ट"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"स्क्रीन संगतता"</string>
     <string name="permissions_label" msgid="2605296874922726203">"अनुमतियां"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"कैश"</string>
@@ -972,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"डेटा साफ़ करें"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"अपडेट अनइंस्टॉल करें"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"आपने कुछ क्रियाओं के लिए इस एप्‍लिकेशन को डिफ़ॉल्‍ट रूप से लॉन्‍च करना चुना है."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"आपने इस एप्‍लिकेशन को विजेट बनाने और उनके डेटा पर पहुंचने की अनुमति देना चुना है."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"कोई डिफ़ॉल्‍ट सेट नहीं है."</string>
     <string name="clear_activities" msgid="7408923511535174430">"डिफ़ॉल्‍ट साफ़ करें"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"इस एप्लिकेशन को संभवत: आपकी स्क्रीन के लिए डिज़ाइन नहीं किया गया है. आप यहां अपनी स्‍क्रीन को इसके द्वारा समायोजित किए जाने के तरीके को नियंत्रित कर सकते हैं."</string>
@@ -982,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"आकार के अनुसार क्रमित करें"</string>
     <string name="show_running_services" msgid="5736278767975544570">"चल रही सेवाएं दिखाएं"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"कैश की गई प्रक्रियाएं दिखाएं"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"एप्लि. प्राथमिकताएं रीसेट करें"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"एप्लि. प्राथमिकताएं रीसेट करें?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"इससे इनके लिए सभी प्राथमिकताएं रीसेट हो जाएंगी:"\n\n" "<li>"अक्षम एप्लिकेशन"</li>\n" "<li>"अक्षम एप्लिकेशन सूचनाएं"</li>\n" "<li>"क्रियाओं के लिए डिफ़ॉल्ट एप्लिकेशन"</li>\n" "<li>"एप्लिकेशन के लिए पृष्ठभूमि डेटा प्रतिबंध"</li>\n\n" आपका एप्लिकेशन डेटा नहीं खोएगा."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"एप्लिकेशन रीसेट करें"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"स्‍थान प्रबंधित करें"</string>
     <string name="filter" msgid="2018011724373033887">"फ़िल्टर"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"फ़िल्‍टर विकल्‍प चुनें"</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"यह एप्‍लिकेशन आपके टेबलेट पर निम्‍न में पहुंच सकता है:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"यह एप्‍लिकेशन आपके फ़ोन पर निम्‍न पर पहुंच सकता है:"</string>
     <string name="computing_size" msgid="1599186977475211186">"गणना कर रहा है…"</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"पैकेज आकार की गणना करने में असमर्थ"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"पैकेज आकार की गणना नहीं की जा सकी."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"आपके पास कोई भी तृतीय-पक्ष एप्‍लिकेशन इंस्‍टॉल नहीं है."</string>
     <string name="version_text" msgid="9189073826278676425">"संस्‍करण <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"ले जाएं"</string>
@@ -1032,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"नए एप्‍लिकेशन के लिए पसंदीदा इंस्‍टॉलेशन स्‍थान बदलें"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"अंतर्निहित एप्लि. अक्षम करें?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"यदि आप कोई अंतर्निहित एप्‍लिकेशन अक्षम करते हैं, तो अन्‍य एप्‍लिकेशन गलत व्यवहार कर सकते हैं."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"सूचनाएं बंद करें?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"यदि आप इस एप्‍लिकेशन के लिए सूचनाएं बंद करते हैं, तो आप महत्‍वपूर्ण अलर्ट और अपडेट खो देंगे."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"संग्रहण उपयोग"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"एप्‍लिकेशन द्वारा उपयोग किया गया संग्रहण देखें"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"चल रही सेवाएं"</string>
@@ -1084,19 +1121,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"यह इनपुट विधि, पासवर्ड और क्रेडिट कार्ड नंबर जैसे निजी डेटा सहित आपके द्वारा लिखे जाने वाले सभी पाठ को एकत्र कर सकती है. यह <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> एप्‍लिकेशन से आती है. इस इनपुट विधि का उपयोग करें?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह वर्तनी परीक्षण व्‍यक्तिगत डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर सहित आपके द्वारा लिखे जाने वाले सभी पाठ एकत्रित कर सकता है. यह एप्‍लिकेशन <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस वर्तनी परीक्षण का उपयोग करें?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"सेटिंग"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"भाषा"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> के लिए सेटिंग खोलने में विफल रहा"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"माउस/ट्रैकपैड"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"सूचक गति"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"गेम नियंत्रक"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"कंपनकर्ता का उपयोग करें"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"कनेक्ट होने पर कंपनकर्ता को गेम नियंत्रक पर रीडायरेक्ट करें."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"कीबोर्ड लेआउट चुनें"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"कीबोर्ड लेआउट सेट करें"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"स्‍विच करने हेतु, Control-Spacebar दबाएं"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"डिफ़ॉल्ट"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"कीबोर्ड लेआउट"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"उपयोगकर्ता शब्‍दकोश"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"व्यक्तिगत डिक्शनरी"</string>
     <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_add_screen_title" msgid="742580720124344291">"वाक्यांश"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"अधिक विकल्प"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"कम विकल्‍प"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"ठीक"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"शब्द:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"शॉर्टकट:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"भाषा:"</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="8165273379942105271">"आपके पास उपयोगकर्ता डिक्शनरी में कोई शब्‍द नहीं है. जोड़ें (+) बटन स्‍पर्श करके कोई शब्‍द जोड़ें."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"सभी भाषाएं"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"सभी भाषाओं के लिए"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"अधिक भाषाएं…"</string>
     <string name="testing" msgid="6584352735303604146">"परीक्षण"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"टेबलेट जानकारी"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"फ़ोन जानकारी"</string>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"एप्‍लिकेशन विकास के लिए विकल्‍प सेट करें"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB डीबग करना"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"डीबग मोड जब USB कनेक्‍ट किया गया हो"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"विकास उपकरण ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"उपकरण की जानकारी उपलब्‍ध नहीं है"</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="7316799925425402244">"USB डीबग डीबग करने का उद्देश्‍य केवल विकास है. इसका उपयोग आपके कंप्‍यूटर और आपके उपकरण के बीच डेटा की प्रतिलिपि बनाने, बिना सूचना के आपके उपकरण पर एप्‍लिकेशन इंस्‍टॉल करने और लॉग डेटा पढ़ने के लिए करें."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"विकास सेटिंग की अनुमति दें?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"ये सेटिंग केवल विकास संबंधी उपयोग के प्रयोजन से हैं. वे आपके उपकरण और उस पर स्‍थित एप्लिकेशन को खराब कर सकती हैं या उनके दुर्व्यवहार का कारण हो सकती हैं."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB संग्रहण सुरक्षित करें"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"USB संग्रहण पढ़ने हेतु एप्‍लिकेशन को अनुमति का अनुरोध करना होगा"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB संग्रहण सुरक्षित करें?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB संग्रहण के सुरक्षित होने पर, एप्‍लिकेशन को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा."\n\n"हो सकता है कुछ एप्‍लिकेशन उनके डेवलपर द्वारा अपडेट नहीं किए जाने तक कार्य न करें."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD कार्ड सुरक्षित करें"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"SD कार्ड पढ़ने के लिए एप्‍लिकेशन को अनुमति का अनुरोध करना होगा"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD कार्ड सुरक्षित करें?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD कार्ड के सुरक्षित होने पर, एप्‍लिकेशन को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा."\n\n"हो सकता है कुछ एप्‍लिकेशन उनके डेवलपर द्वारा अपडेट नहीं किए जाने तक कार्य न करें."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"गैजेट चुनें"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"विजेट चुनें"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"विजेट बनाएं और पहुंच की अनुमति दें?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"विजेट बना लेने के बाद, इसके द्वारा प्रदर्शित सभी डेटा पर <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> पहुंच सकता है."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> को हमेशा विजेट बनाने दें और उनके डेटा पर पहुंचने दें"</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>
@@ -1160,12 +1227,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"बड़ा पाठ"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"पावर बटन कॉल बंद करता है"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"पासवर्ड बोलें"</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="3264723681038625967">"वेब स्‍क्रिप्ट इंस्‍टॉल करें"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"वेब पहुंचयोग्यता बढ़ाएं"</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>
@@ -1180,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"कोई सेवा इंस्‍टॉल नहीं है"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"किसी स्‍क्रीन रीडर की आवश्‍यकता है?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack नेत्रहीन और कम-दृष्टि वाले उपयोगकर्ताओं के लिए बोलकर फ़ीडबैक प्रदान करता है. क्‍या आप इसे Android Market से निशुल्‍क इंस्‍टॉल करना चाहते हैं?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"वेब स्‍क्रिप्ट इंस्‍टॉल करें?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"क्‍या आप चाहते हैं कि एप्लिकेशन Google से उन स्क्रिप्‍ट को इंस्‍टॉल करें जो उनकी वेब सामग्री को अधिक पहुंच योग्‍य बनाती हैं?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"यह सुविधा आपके उपकरण द्वारा स्‍पर्श का प्रतिसाद देने का तरीका बदलती है. चालू करें?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"कोई विवरण नहीं दिया गया."</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_not_available" msgid="3214000535532434353">"बैटरी उपयोग डेटा उपलब्ध नहीं है."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1347,7 @@
     <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" msgid="3305141107104670703">"आपके द्वारा चुना गया इंजन चलाया नहीं जा सकता."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"कॉन्फ़िगर करें"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"अन्‍य इंजन चुनें"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"यह वाक् संश्लेषण इंजन पासवर्ड और क्रेडिट कार्ड नंबर जैसे निजी डेटा समेत आपके द्वारा बोले जाने वाले सभी पाठ को एकत्र कर सकता है. यह <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> इंजन से आता है. इस वाक् संश्लेषण इंजन के उपयोग को सक्षम करें?"</string>
@@ -1301,7 +1363,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"उपयोग के पहले नया इंजन सक्षम करें."</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>
@@ -1318,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"अपना अनलॉक प्रतिमान आरेखित करें"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"आपको क्रेडेंशियल इंस्‍टॉलेशन की पुष्टि करने के लिए अपना अनलॉक प्रतिमान बनाना होगा."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"क्रेडेंशियल संग्रहण के लिए पासवर्ड लिखें."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"वर्तमान पासवर्ड:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"क्रेडेंशियल संग्रहण मिटा दिया गया है."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"क्रेडेंशियल संग्रहण मिटाया नहीं जा सका."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"क्रेडेंशियल संग्रहण सक्षम किया गया है."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"क्रेडेंशियल संग्रहण का उपयोग करने से पहले, आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"क्रेडेंशियल संग्रहण का उपयोग करने से पहले, आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"आपातकालीन टोन"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"आपातकालीन कॉल करने के दौरान व्‍यवहार सेट करें"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"बैकअप लें और रीसेट करें"</string>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"स्‍वचालित पुनर्स्थापना"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"किसी एप्‍लिकेशन को पुन: इंस्‍टॉल करने पर, बैकअप ली गई सेटिंग और डेटा पुनर्स्‍थापित करें"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्‍कटॉप बैकअप पासवर्ड"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"डेस्‍कटॉप पूर्ण बैकअप वर्तमान में सुरक्षित नहीं हैं."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"डेस्कटॉप के पूर्ण बैकअप के पासवर्ड को बदलने या निकालने के लिए चयन करें"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्‍कटॉप पूर्ण बैकअप वर्तमान में सुरक्षित नहीं हैं"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटॉप के पूर्ण बैकअप के पासवर्ड को बदलने या निकालने के लिए स्‍पर्श करें."</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"अपने Wi-Fi पासवर्ड, बुकमार्क, अन्य सेटिंग और एप्लिकेशन डेटा का बैक अप लेना रोकें, साथ ही Google सर्वर से सभी प्रतिलिपि मिटाएं?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"उपकरण व्‍यवस्‍थापन सेटिंग"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"यह व्‍यवस्‍थापक सक्रिय है और एप्‍लिकेशन <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">"रिंगटोन और सूचनाएं"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"सूचनाएं"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"सिस्‍टम"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"कॉल की रिंगटोन और कंपन"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"सिस्टम"</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="3747859666621319757">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्‍ट कर रहा है..."</string>
@@ -1394,7 +1458,10 @@
     <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_failed" msgid="1696499856374109647">"समन्‍वयन विफल"</string>
+    <string name="sync_active" msgid="8476943765960863040">"समन्‍वयन सक्रिय"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <string name="sync_is_failing" msgid="1591561768344128377">"सिंक को वर्तमान में समस्या आ रही है. यह शीघ्र ही वापस उपलब्ध होगा."</string>
     <string name="add_account_label" msgid="7811707265834013767">"खाता जोड़ें"</string>
     <string name="background_data" msgid="5779592891375473817">"पृष्ठभूमि डेटा"</string>
@@ -1405,6 +1472,10 @@
     <string name="sync_enabled" msgid="4551148952179416813">"सिंक चालू है"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"सिंक बंद है"</string>
     <string name="sync_error" msgid="5060969083117872149">"सिंक त्रुटि"</string>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <string name="settings_backup" msgid="2274732978260797031">"बैक अप सेटिंग"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"मेरी सेटिंग का बैक अप लें"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"अभी सिंक करें"</string>
@@ -1414,7 +1485,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google sync में आपका स्वागत है!"</font>\n"आप जहां भी हों वहां से आपके संपर्क, अपॉइंटमेंट, और अन्य चीज़ों तक पहुंच की सुविधा देने के लिए डेटा को समन्‍वयित करने का Google का तरीका."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"एप्‍लिकेशन समन्‍वयन सेटिंग"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"डेटा और सिंक्रनाइज़ेशन"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"पासवर्ड बदलें"</string>
@@ -1428,7 +1499,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"कुछ एप्‍लिकेशन के लिए यह खाता आवश्‍यक है. आप टेबलेट को सेटिंग &gt; बैकअप लें और रीसेट करें में फ़ैक्‍टरी डिफ़ॉल्‍ट (जो आपके सभी निजी डेटा को हटा देता है) पर रीसेट करके ही इसे हटा सकते हैं."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"कुछ एप्‍लिकेशन के लिए यह खाता आवश्‍यक है. आप फ़ोन को सेटिंग &gt; बैकअप लें और रीसेट करें में फ़ैक्‍टरी डिफ़ॉल्‍ट (जो आपके सभी निजी डेटा को हटा देता है) पर रीसेट करके ही इसे हटा सकते हैं."</string>
     <string name="provider_label" msgid="7724593781904508866">"पुश ग्राहकी"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g> सिंक करें"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"मैन्युअल रूप से समन्वयित नहीं कर सकता"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"इस आइटम के लिए समन्वयन वर्तमान में अक्षम है. यह सेटिंग बदलने के लिए, पृष्ठभूमि डेटा और स्वचालित समन्वयन को अस्थायी रूप से चालू करें."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G सेटिंग"</string>
@@ -1436,7 +1508,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC पता"</string>
     <string name="enter_password" msgid="4131758584074246224">"संग्रहण डीक्रिप्‍ट करने के लिए पासवर्ड लिखें"</string>
     <string name="try_again" msgid="4272075051293936921">"पुन: प्रयास करें."</string>
-    <string name="service_busy" msgid="2325014135156127705">"सेवा व्यस्त है. पुन: प्रयास करें."</string>
     <string name="delete" msgid="4219243412325163003">"हटाएं"</string>
     <string name="misc_files" msgid="6720680815969643497">"विविध फ़ाइलें"</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>
@@ -1444,21 +1515,46 @@
     <string name="select_all" msgid="1562774643280376715">"सभी का चयन करें"</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="debug_debugging_category" msgid="6781250159513471316">"डीबग करना"</string>
+    <string name="debug_app" msgid="8349591734751384446">"डीबग एप्लिकेशन का चयन करें"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"कोई डीबग एप्लिकेशन सेट नहीं है"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"डीबग करने वाला एप्लिकेशन: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"एप्लिकेशन का चयन करें"</string>
+    <string name="no_application" msgid="2813387563129153880">"कुछ भी नहीं"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"डीबगर की प्रतीक्षा करें"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"डीबग किया गया एप्लि. निष्पादन के पहले अनुलग्न करने हेतु डीबगर की प्रतीक्षा करता है"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"इनपुट"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"आरेखण"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"निगरानी"</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_screen_updates" msgid="5470814345876056420">"सतह अपडेट दिखाएं"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"विंडो सतहें अपडेट होने पर उन सभी को फ़्लैश करें"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU दृश्‍य अपडेट दिखाएं"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU के साथ आरेखित करने पर विंडो में दृश्‍यों को फ़्लैश करें"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"HW ओवरले अक्षम करें"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"स्‍क्रीन संयोजन के लिए हमेशा GPU का उपयोग करें"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"ट्रेस सक्षम करें"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"सक्षम ट्रेस का चयन करें"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"वर्तमान में कोई ट्रेस सक्षम नहीं है"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"वर्तमान में <xliff:g id="NUM">%1$d</xliff:g> ट्रेस सक्षम हैं"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"वर्तमान में सभी ट्रेस सक्षम हैं"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"लेआउट सीमाएं दिखाएं"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU उपयोग दिखाएं"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"स्‍क्रीन ओवरले वर्तमान CPU उपयोग को दिखा रहा है"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"बलपूर्वक GPU रेंडर करें"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"एप्लिकेशन में 2D हार्डवेयर त्वरण का उपयोग करें"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"2d आरेखण के लिए GPU का बलपूर्वक उपयोग करें"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"प्रोफ़ाइल GPU रेंडरिंग"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"adb shell dumpsys gfxinfo में रेंडरिंग समय मापें"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"विंडो एनिमेशन स्‍केल"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"संक्रमण एनिमेशन स्‍केल"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"एनिमेटर अवधि स्केल"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"एप्लिकेशन"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"गतिविधियों को न रखें"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"उपयोगकर्ता के छोड़ते ही प्रत्‍येक गतिविधि समाप्त करें"</string>
@@ -1472,13 +1568,15 @@
     <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_menu_metered" msgid="5056695223222541863">"मोबाइल हॉटस्पॉट"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <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="8621855507876539282">"इस दौरान कि‍सी भी एप्‍लि‍. ने डेटा का उपयोग नहीं कि‍या."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"अग्रभूमि‍"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"पृष्ठभूमि"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"आपके टेबलेट द्वारा मापा जाता है. आपके वाहक का डेटा उपयोग शुल्क भिन्‍न हो सकता है."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"आपके फ़ोन द्वारा मापा जाता है. आपके वाहक का डेटा उपयोग शुल्क भिन्‍न हो सकता है."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"प्रतिबंधित"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"मोबाइल डेटा अक्षम करें?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"मोबाइल डेटा सीमा सेट करें"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G डेटा सीमा सेट करें"</string>
@@ -1489,33 +1587,50 @@
     <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_list_mobile" msgid="5588685410495019866">"मोबाइल"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"कुछ नहीं"</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="8430240158135453271">"एप्‍लिकेशन सेटिंग देखें"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"पृष्ठभूमि डेटा प्रतिबंधित करें"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"केवल मो. डेटा नेटवर्क पर पृष्ठभूमि डेटा अक्षम करें. मौजूद होने पर Wi-Fi का उपयोग होगा."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"मो. नेटवर्क पर पृष्ठभूमि डेटा अक्षम करें. उपलब्ध होने पर गैर-मो. नेटवर्क का उपयोग होगा."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"इस एप्‍लि. के लिए पृष्ठभूमि डेटा प्रतिबंधित करने हेतु, पहले मो. डेटा सीमा सेट करें."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Wi-Fi के उपलब्‍ध न होने पर यह सुविधा पृष्ठभूमि डेटा पर निर्भर एप्‍लिकेशन को कार्य करने से रोक सकती है."\n\n"आपको एप्‍लिकेशन में उपलब्ध सेटिंग में अधिक उपयुक्त डेटा उपयोग नियंत्रण मिल सकते हैं."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"यह सुविधा केवल मोबाइल नेटवर्क उपलब्ध होने पर उस एप्ल‍िकेशन को कार्य करने से रोक सकती है जो पृष्ठभूमि डेटा पर निर्भर है."\n\n"आपको एप्ल‍िकेशन में उपलब्ध सेटिंग में अधिक उपयुक्त डेटा उपयोग नियंत्रण मिल सकते हैं."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"पृष्ठभूमि डेटा प्रतिबंधित करना केवल तभी संभव है जब आपने कोई नेटवर्क डेटा सीमा सेट की हुई हो."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <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_warning_editor_title" msgid="3704136912240060339">"डेटा उपयोग चेतावनी सेट करें"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"डेटा उपयोग की सीमा सेट करें"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"डेटा उपयोग सीमित करना"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"निर्दिष्ट सीमा तक पहुंचने पर आपका <xliff:g id="NETWORKS">%1$s</xliff:g> डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके टेबलेट द्वारा मापा जाता है, और आपका वाहक उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"निर्दिष्ट सीमा तक पहुंचने पर आपका <xliff:g id="NETWORKS">%1$s</xliff:g> डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके फ़ोन द्वारा मापा जाता है, और आपका वाहक उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके टेबलेट द्वारा मापा जाता है, और आपका वाहक उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके फ़ोन द्वारा मापा जाता है, और आपका वाहक उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: लगभग <xliff:g id="TOTAL">%1$s</xliff:g> प्रयुक्त"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके टेबलेट के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपका वाहक डेटा उपयोग के लिए भिन्न तरह से शुल्क ले सकता है."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके फ़ोन के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपका वाहक डेटा उपयोग के लिए भिन्न तरह से शुल्क ले सकता है."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"मोबाइल हॉटस्पॉट"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"उन WI- Fi नेटवर्क का चयन करें जो मोबाइल हॉटस्पॉट हैं. पृष्ठभूमि में होने पर एप्ल‍िकेशन को इन नेटवर्क का उपयोग करने के लिए प्रतिबंधित किया जा सकता है. बड़े डाउनलोड के लिए इन नेटवर्क के उपयोग से पहले एप्लिकेशन चेतावनी भी दे सकते हैं."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाइल नेटवर्क"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi नेटवर्क"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"मोबाइल हॉटस्पॉट का चयन करने के लिए, Wi-Fi चालू करें."</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>
@@ -1541,12 +1656,14 @@
     <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_edit" msgid="8647191407179996943">"VPN प्रोफ़ाइल संपादित करें"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">" <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">" VPN प्रोफ़ाइल जोड़ें"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"प्रोफ़ाइल संपादित करें"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"प्रोफ़ाइल हटाएं"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"कोई नेटवर्क कनेक्शन नहीं है. कृपया बाद में पुन: प्रयास करें."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"प्रमाणपत्र गुम है. प्रोफ़ाइल संपा. करें."</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>
@@ -1555,25 +1672,7 @@
     <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="477937585801538951">"स्‍पर्श द्वारा अन्‍वेषण करें चालू करने के बाद, आपकी अंगुली की पहुंच में क्या है यह जानने के लि‍ए आप स्‍क्रीन को स्‍पर्श कर सकते हैं. उदाहरण के लि‍ए, वर्तमान स्‍क्रीन में एप्‍लि‍केशन आइकन हैं. स्‍क्रीन को स्‍पर्श करके और अपनी अंगुली को स्लाइड करते हुए कोई आइकन ढूंढें."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"बढ़िया. अपनी अंगुली को स्‍क्रीन के आस-पास तब तक स्‍लाइड करते रहें, जब तक कि आपको कम से कम एक और आइकन नहीं मिल जाता."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"आपके द्वारा स्पर्श की जाने वाली चीज़ को सक्रिय करने के लिए, उसे टैप करें. अपनी अंगुली को तब तक स्लाइड करें, जब तक आपको <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="8764686624055084454">"किसी सूची पर स्क्रॉल करने के लिए, आप स्क्रीन पर दो अंगुलियां स्लाइड कर सकते हैं. उदाहरण के लिए, वर्तमान स्क्रीन में उन एप्लिकेशन नामों की सूची शामिल होती है, जिन्हें ऊपर और नीचे स्क्रॉल किया जा सकता है. पहले, एक अंगुली को आस-पास स्लाइड करके सूची के कुछ आइटमों को पहचानने का प्रयास करें."</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="3055831259260848004">"आपने ट्यूटोरियल पूरा कर लिया है. बाहर निकलने के लिए, <xliff:g id="FINISH">%s</xliff:g> बटन ढूंढें और स्‍पर्श करें."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"वर्तनी सुधार"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"वर्तनी परीक्षक"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"अपना वर्तमान पूर्ण बैकअप पासवर्ड यहां लिखें"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"पूर्ण बैकअप के लिए यहां नया पासवर्ड लिखें"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"यहां अपना नया पूर्ण बैकअप पासवर्ड पुन: लिखें"</string>
@@ -1581,4 +1680,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"रद्द करें"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"अतिरिक्त सिस्‍टम अपडेट"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"उपयोगकर्ता और प्रतिबंध"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"उपयोगकर्ता"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"उपयोगकर्ता जोड़ें"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"विवरण संपादित करें"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"उपयोगकर्ता जानकारी"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"नाम"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"सामग्री प्रतिबंध"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"पिन आवश्‍यक है"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"सामग्री रेटिंग"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"सिस्टम एप्‍लिकेशन"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"इंस्‍टॉल किए गए एप्‍लिकेशन"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"छोड़ें"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"उपयोगकर्ता निकालें"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"शैतान बच्चा"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"उपयोगकर्ता निकालें?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"क्‍या आप वाकई उपकरण से उपयोगकर्ता और सभी संबंधित डेटा निकालना चाहते हैं?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"सूचना दिखाएं"</string>
+    <string name="help_label" msgid="1107174367904110532">"सहायता"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 22b6d86..0f87f8b 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Isključivanje…"</item>
     <item msgid="1634960474403853625">"Niste povezani"</item>
     <item msgid="746097431216080650">"Neuspješno"</item>
+    <item msgid="6367044185730295334">"Blokirano"</item>
+    <item msgid="503942654197908005">"Privremeno izbjegavanje loše veze"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Isključivanje iz mreže <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Niste povezani"</item>
     <item msgid="8578370891960825148">"Neuspješno"</item>
+    <item msgid="5660739516542454527">"Blokirano"</item>
+    <item msgid="1805837518286731242">"Privremeno izbjegavanje loše veze"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Gumb"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ništa"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN s pristupne točke"</item>
-    <item msgid="7364462169350112617">"PIN s ovog uređaja"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statično"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Prijenosna SD kartica"</item>
     <item msgid="4498124044785815005">"Neka sustav odluči"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Isključeno"</item>
-    <item msgid="4804571292609523335">"Vibriraj"</item>
-    <item msgid="595707141547423573">"Isključi zvuk"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
     <item msgid="2560532955514699713">"Srednje"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animacija razmjera 5x"</item>
     <item msgid="6660750935954853365">"Animacija razmjera 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animacija isključena"</item>
+    <item msgid="1138649021950863198">"Animacija razmjera 0,5 x"</item>
+    <item msgid="4394388961370833040">"Animacija razmjera 1 x"</item>
+    <item msgid="8125427921655194973">"Animacija razmjera 1,5 x"</item>
+    <item msgid="3334024790739189573">"Animacija razmjera 2 x"</item>
+    <item msgid="3170120558236848008">"Animacija razmjera 5 x"</item>
+    <item msgid="1069584980746680398">"Animacija razmjera 10 x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna granica"</item>
     <item msgid="4071574792028999443">"Nema pozadinskih procesa"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 48d7a9c..0718fca 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
+    <string name="create" msgid="3578857613172647409">"Izradi"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Spriječite upotrebu Bluetooth birača ako je zaslon zaključan"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth uređaji"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Naziv uređaja"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Postavke uređaja"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Postavke profila"</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_rename_device" product="tablet" msgid="787970073150631155">"Preimenuj tabletno računalo"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Uparivanje…"</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="5655704645616731277">"Dodir za uparivanje"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"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="1931617700075106801">"Dodirnite za uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Dodirnite za 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="device_picker" msgid="8398232791303186677">"Birač Bluetooth uređaja"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zatraženo je Bluetooth dopuštenje"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikacija želi uključiti Bluetooth. Dopustiti?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikacija na vašem tabletnom računalu želi omogućiti otkrivanje vašeg tabletnog računala drugim Bluetooth uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Dopustiti?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"U redu"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Naziv hosta koji ste upisali nije valjan."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Popis za isključivanje koji ste napisali nije pravilno formatiran. Unesite popis isključenih domena odvojenih zarezima."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Morate dovršiti polje priključka."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"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="2671425042711054494">"Upisani priključak nije valjan."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik upotrebljava HTTP proxy poslužitelj, ali druge aplikacije ne mogu ga upotrebljavati."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Postavi"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Neuspješno"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Uspješno"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Promijene stupaju na snagu kod ponovnog priključivanja USB kabela"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Promijene stupaju na snagu kod ponovnog priključivanja USB kabela."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Omogući USB masovno pohranjivanje"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Ukupno bajtova:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Memorija USB nije uključena"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nema SD kartice"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB memorija nije uključena."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Nema SD kartice"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Dostupni bajtovi"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB se upot. kao mas. pohrana"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD kartica se koristi ka uređaj za masovno pohranjivanje"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Sada je sigurno ukloniti USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Sada je sigurno ukloniti SD karticu"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB pohrana upotrebljava se kao uređaj masovne pohrane."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD kartica upotrebljava se kao uređaj za masovnu pohranu."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Sad na siguran način možete ukloniti USB pohranu."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Sad na siguran način možete ukloniti SD karticu."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB memorija uklonjena je dok se upotrebljavala!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD kartica je uklonjena tijekom upotrebe!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Iskorišteni bajtovi:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skeniranje USB mem. za medije…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB memorija uključena samo za čitanje."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD kartica uključ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="5349877711342869319">"Jezik"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Poveži se s podatkovnim uslugama u roamingu"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Izgubili ste podatkovnu vezu jer ste isključili mrežni roaming podataka."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Uključi"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Omogućiti roaming podataka? Može doći do znatno većih troškova za roaming!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Pažnja"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Ako omogućite roaming podataka, može doći do značajnih troškova roaminga!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Dopusti roaming podataka?"</string>
     <string name="networks" msgid="6333316876545927039">"Odabir operatora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Odaberite mrežnog operatera"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum i vrijeme"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Postavi vrijeme"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Odaberi vremensku zonu"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Postavi datum"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Odaberi format datuma"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Odaberite 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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Vrijeme"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Poboljšanje podudaranja lica"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Provjera živosti"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Zahtijevaj treptaj"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Možete kriptirati račune, postavke, preuzete aplikacije i njihove podatke, medije i ostale datoteke. Nakon što kriptirate tabletno 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 tabletno 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 tabletno 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="3504519024884099702">"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_desc" product="tablet" msgid="3839235202103924154">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja tabletnog računala morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite: svoje tabletno računalo možete dešifrirati samo vraćanjem u tvorničko stanje čime se brišu svi vaši podaci."\n\n"Enkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i tabletno računalo držati priključeno dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja telefona morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite. Svoj telefon možete dešifrirati samo vraćanjem na tvorničke postavke čime se brišu svi vaši podaci."\n\n"Enkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i telefon držati priključen dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje 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="2029407131227814893">"Napunite bateriju i pokušajte ponovo."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Uključite punjač i pokušajte ponovo."</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_dialog_need_password_message" msgid="4071395977297369642">"Prije nego što ćete moći započeti enkripciju morat ćete postaviti PIN za zaključavanje zaslona ili zaporku."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Kriptirati?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operacija kriptiranja nepovratna je i izgubit ćete podatke ako je prekinete. Kriptiranje traje sat vremena ili dulje, a za to vrijeme tabletno računalo nekoliko će se puta ponovo pokrenuti."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operacija kriptiranja nepovratna je i izgubit ćete podatke ako ju prekinete. Kriptiranje traje sat vremena ili dulje, a za to vrijeme telefon će se nekoliko puta ponovo pokrenuti."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kriptiranje"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Pričekajte dok ne završi kriptiranje vašeg tabletnog računala. <xliff:g id="PERCENT">^1</xliff:g>% dovršeno."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Pričekajte dok ne završi kriptiranje 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="2223340178473871064">"Unesite svoju zaporku"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripcija neuspješna"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Enkripcija je prekinuta i ne može se dovršiti. Stoga podaci na vašem tabletnom računalu više nisu dostupni. "\n\n"Da biste nastavili upotrebljavati ​​tabletno računalo, morate obaviti vraćanje na tvorničke postavke. Kada nakon toga postavite svoje tabletno računalo, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Enkripcija je prekinuta i ne može se dovršiti. Stoga podaci na vašem telefonu više nisu dostupni. "\n\n"Da biste nastavili upotrebljavati ​​telefon, morate obaviti vraćanje na tvorničke postavke. Kada nakon toga postavite svoj telefon, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Odabir zaklj. zaslona"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripcija je prekinuta i ne može se dovršiti. Podaci na vašem tabletnom računali zbog toga više nisu dostupni."\n\n"Da biste nastavili upotrebljavati svoje tabletno računalo, trebate provesti vraćanje u tvorničko stanje. Prilikom postavljanja tabletnog računala nakon vraćanja u tvorničko stanje imat ćete priliku vratiti sve podatke za koje ste na Google računu izradili sigurnosnu kopiju."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripcija je prekinuta i ne može se dovršiti. Stoga podaci na vašem telefonu više nisu dostupni. "\n\n"Da biste nastavili upotrebljavati ​​telefon, morate vratiti tvorničke postavke. Kada nakon toga postavite svoj telefon, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Promjena načina unosa"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Odaberite zaključavanje zaslona"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Odabir sig. zaključ."</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Otključavanje licem"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Uzorak"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Zaporka"</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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mora imati najmanje ovoliko znakova %d"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Zaporka mora imati manje od ovoliko znakova: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN mora imati manje od ovoliko znamenki: <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN mora sadržavati samo znamenke od 0 do 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Administrator uređaja ne dopušta upotrebu nedavnog PIN-a."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Zaporka sadrži nedopušteni znak."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Zaporka treba sadržavati barem jedno slovo."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Zaporka mora sadržavati barem jednu znamenku."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Zaporka mora sadržavati barem jedno slovo."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Zaporka mora sadržavati barem jedno malo slovo."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Zaporka mora sadržavati barem jedno veliko slovo."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Zaporka mora sadržavati barem jednu brojčanu znamenku."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Zaporka mora sadržavati barem jedan posebni simbol."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Zaporka mora sadržavati barem jedan znak koji nije slovo."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Administrator uređaja ne dopušta 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="lock_setup" msgid="1759001157415978959">"Postavljanje je dovršeno"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Postavljanje je završeno."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administracija 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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Za uparivanje s uređajem:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Upišite potrebnu zaporku 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_enter_pin_other_device" msgid="4637977124526813470">"Možda biste također trebali unijeti ovaj PIN i na drugi uređaj."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Za uparivanje s uređajem:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>upišite:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> na tom uređaju pa pritisnite tipke Return ili Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije bilo moguće zbog netočnog PIN-a ili zaporke."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Komunikacija s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije moguća."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Nije moguće povezati se na <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Dopusti razmjenu podataka kada telefon dodiruje drugi uređaj"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dopusti razmjenu podataka kada tabletno računalo dodiruje drugi uređaj"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dopusti razmjenu podataka kada telefon dodiruje drugi uređaj"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Spreman za prijenos sadržaja aplikacije NFC-om"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Isključeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nije dostupno jer je NFC isključen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Kada je ta značajka uključena, možete emitirati sadržaj aplikacije na drugi uređaj na kojem je omogućen NFC tako da držite uređaje jedan uz drugi. Na primjer, možete emitirati stranice Preglednika, videozapise s YouTubea, kontakte s Osoba i više."\n\n"Jednostavno približite jedan uređaj drugom (obično se njihove stražnje strane prislanjaju jedna uz drugu), a zatim dodirnite zaslon. Aplikacija određuje što će se emitirati."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Otkrivanje mrežne usluge"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Dopusti aplikacijama na drugim uređajima otkrivanje aplikacija na ovom uređaju"</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="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_setup_wizard_title" msgid="70277346338812325">"Odaberite Wi-Fi mrežu"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Skeniranje mreža nije moguće"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Mrežna obavijest"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Obavijesti me ako postoji otvorena mreža"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Izbjegavati slabe veze"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Ne upotrebljavati Wi-Fi mrežu ako internetska veza nije zadovoljavajuća"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izbjegavati slabe veze"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Ne upotrebljavati Wi-Fi mrežu ako internetska veza nije zadovoljavajuća"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Zadrži Wi-Fi tijekom mirovanja"</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_wps_pbc" msgid="2668564692207863017">"WPS gumb"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Unos WPS PIN-a"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Izravni Wi-Fi"</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_empty_list_wifi_on" msgid="3354911729026237372">"Traženje Wi-Fi mreža…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Ostale mreže…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Više"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. postavljanje (WPS)"</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="8242979682530043184">"Upišite PIN s pristupne točke"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Postavljanje WPS-a"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Unesite PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> na pristupnu točku"</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_wps_setup_title" msgid="6034518116333042484">"Postavljanje zaštićene mreže Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Pokretanje WPS-a..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pritisnite gumb za zaštićeno postavljanje Wi-Fi mreže na svom usmjerivaču. Može se zvati \"WPS\" ili sadržavati ovaj simbol:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Unesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> na svoj Wi-Fi usmjerivač. Postavljanje može potrajati do dvije minute."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS uspio. Povezivanje s mrežom…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Povezano s mrežom Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Već je u tijeku WPS, a do dovršetka može proteći do dvije minute"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Zahtjev nije uspio. Pokušajte ponovo za nekoliko minuta."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sigurnosna postavka (WEP) bežičnog usmjerivača nije podržana"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sigurnosna postavka bežičnog usmjerivača (TKIP) nije podržana"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentifikacija nije uspjela. Pokušajte ponovo."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Otkrivena je još jedna WPS sesija. Pokušajte ponovo za nekoliko minuta."</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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Izbjegavanje slabe internetske veze"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Mreža je izbjegnuta zbog loše veze. Isključite to ponašanje na zaslonu Postavke &gt; Wi-Fi, u stavci izbornika Napredno."</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_wps_available_first_item" msgid="3538912605343585226">"Zaštićena mreža dostupna"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (zaštićena mreža dostupna)"</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_failed_connect_message" msgid="8491902558970292871">"Povezivanje s mrežom nije uspjelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Zaboravljanje mreže nije uspjelo"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Spremi"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Spremanje mreže nije uspjelo"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Odustani"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Otkrivena je još jedna WiFi zaštićena sesija. Pokušajte 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Pristupnik"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Duljina mrežnog prefiksa"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Izravni Wi-Fi"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Postavljanje veze paralelnih uređaja"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Izravni Wi-Fi"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Podaci o uređaju"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Zaštićeno postavljanje Wi-Fi mreže"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Upišite 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_remove_group" msgid="4844634506540667517">"Ukloni grupu"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Napredno"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Dostupni uređaji"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Traženje uređaja"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Traženje..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Preimenuj uređaj"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Paralelni uređaji"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Povezivanje nije bilo moguće."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Preimenovanje uređaja nije uspjelo."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Isključiti?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Ako odspojite, prekinut će se veza s uređajem <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ako odspojite, prekinut će se veza s uređajem <xliff:g id="PEER_NAME">%1$s</xliff:g> i <xliff:g id="PEER_COUNT">%2$s</xliff:g> te ostalim uređajima."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Otkazati pozivnicu?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Želite li otkazati pozivnicu za povezivanje s korisnikom <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prijenosna pristupna WiFi točka"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Aktivna je prijenosna WiFi pristupna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pogreška prijenosne WiFi pristupne točke"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfiguracija WiFi pristupne točke"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Postavljanje WiFi pristupne točke"</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> prijenosna WiFi pristupna točka"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Bešumni način"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnoća"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Glazbeni efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnoća zvona"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibracija ako je bešumno"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibracija i zvono"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Zadana obavijest"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsno svjetlo obavijesti"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvuk zvona"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Isključivanje zvuka zvona i obavijesti"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Isključivanje zvuka glazbe i drugih medija"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Isključivanje zvuka obavijesti"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Isključivanje zvuka alarma"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrira dok zvoni"</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>
@@ -623,14 +651,15 @@
     <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" product="tablet" msgid="9015625921245904495">"Prije postavljanja zvuka priključne stanice morate priključiti tabletno računalo na nju."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Prije postavljanja zvuka priključne stanice morate priključiti telefon na nju."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Prije postavljanja zvuka priključne stanice trebate na nju postaviti tabletno računalo."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Prije postavljanja zvuka priključne stanice trebate na nju postaviti telefon."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Zvuk priključivanja 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>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <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="7965901687241669598">"Prikaz"</string>
@@ -702,7 +731,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Moj telefonski broj"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"PRL verzija"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Izbrisati sve osobne podatke i preuzete aplikacije? Radnja se ne možete poništiti!"</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="2234954758550554549">"Morate iscrtati svoj uzorak za otključavanje da biste potvrdili vraćanje na tvorničko stanje."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Da biste potvrdili vraćanje na tvorničke postavke, trebate nacrtati svoj uzorak za otključavanje."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nije došlo do poništavanja jer nije dostupna usluga brisanja sustava."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Poništiti?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Izbriši USB memoriju"</string>
@@ -838,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Izbrisati SD karticu i sve pohranjene datoteke na njoj? Radnja se ne može poništiti!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Izbriši sve"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Iscrtajte uzorak za otključavanje"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Morate iscrtati uzorak za otključavanje kako biste potvrdili da želite izbrisati memoriju USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Morate iscrtati uzorak za otključavanje kako biste potvrdili da želite izbrisati USB memoriju."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Trebate iscrtati svoj uzorak za otključavanje kako biste potvrdili da želite izbrisati SD karticu."</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="6688416425801386511">"USB dijeljenje veze"</string>
@@ -870,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilne mreže"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Googleova usluga lociranja"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Neka aplikacije upotrebljavaju podatke iz izvora kao što su Wi-Fi i mobilne mreže kako bi se utvrdila vaša približna lokacija"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Dopusti Googleu slanje anonim. lokac. podat. Dopusti dopuštenim apl. upotrebu podat. iz Wi-Fi i mob. mreža za pribl. lociranje."</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>
@@ -915,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pritisnite Izbornik za pomoć."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Maknite prst ako ste gotovi."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Povežite barem ovoliko točaka: <xliff:g id="NUMBER">%d</xliff:g>. Pokušajte ponovo:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Uzorak je snimljen!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Uzorak je snimljen."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Ponovno iscrtajte uzorak za potvrdu:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Vaš novi uzorak za otključavanje:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potvrdi"</string>
@@ -937,7 +966,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Dalje"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Osiguravanje tabletnog uređaja"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Osiguravanje telefona"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Zaštitite svoje tabletno računalo od neovlaštene upotrebe stvaranjem osobnog uzorka za otključavanje zaslona. Klizite prstom po sljedećem zaslonu da biste povezali 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="tablet" msgid="8616353869251700776">"Zaštitite svoje tabletno računalo od neautorizirane upotrebe stvaranjem osobnog uzorka za otključavanje zaslona. Klizite prstom kako biste točke na zaslonu povezali bilo kojim redoslijedom. Trebate povezati najmanje četiri točke."\n\n"Jeste li spremni? Dodirnite Dalje."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Zaštitite svoj telefon od neovlaštene upotrebe izradom vlastitog uzorka za otključavanje zaslona. Na sljedećem zaslonu klizite prstom da biste spojili najmanje četiri točke bilo kojim redoslijedom. "\n\n"Spremni za početak? Dodirnite \"Dalje\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljanje aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje instaliranim aplikacijama i njihovo uklanjanje"</string>
@@ -945,7 +974,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Upravljanje aplikacijama, postavljanje prečaca za brzo pokretanje"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Postavke aplikacije"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nepoznati izvori"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Dopustiti instalaciju aplikacija koje nisu s usluge Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Dopustite instalaciju aplikacija iz nepoznatih izvora"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Vaše tabletno računalo i osobni podaci izloženiji su napadima aplikacija iz nepoznatih izvora. Prihvaćate isključivu odgovornost za svu štetu nastalu na tabletnom računalu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Vaš telefon i osobni podaci izloženiji su napadima aplikacija iz nepoznatih izvora. Prihvaćate isključivu odgovornost za svu štetu nastalu na telefonu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
@@ -953,6 +982,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"Zadane postavke"</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>
@@ -972,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Izbriši podatke"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Deinstaliraj ažuriranja"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Odlučili ste da se ta aplikacija pokreće prema zadanim postavkama za neke radnje."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Odlučili ste dopustiti ovoj aplikaciji izradu widgeta i pristupanje njihovim podacima."</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="1616155457673106022">"Ta aplikacija možda nije dizajnirana za vaš zaslon. Ovdje možete provjeriti kako se prilagođava vašem zaslonu."</string>
@@ -982,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Poredaj po veličini"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Prikaži pokrenute usluge"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Prikaži procese iz predmemorije"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Poništi postavke"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Poništiti postavke?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"To će poništiti sve postavke za:"\n\n" "<li>"onemogućene aplikacije"</li>\n" "<li>"onemogućene obavijesti aplikacija"</li>\n" "<li>"zadane aplikacije za radnje"</li>\n" "<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n\n" Nećete izgubiti podatke iz aplikacija."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Poništi aplikacije"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
     <string name="filter" msgid="2018011724373033887">"Filtar"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Odabir opcije filtra"</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ova aplikacija može pristupiti sljedećim stavkama na vašem tabletnom računalu:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ova aplikacija može pristupiti sljedećim stavkama 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="invalid_size_value" msgid="7563537715280712285">"Nije moguće izračunati veličinu paketa."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nemate instaliranih aplikacija 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>
@@ -1032,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Promijenite željenu lokaciju instalacije za nove aplikacije."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Onemogući ugrađenu aplikaciju?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ako onemogućite ugrađenu aplikaciju, druge će se aplikacije možda ponašati nepredviđeno."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Isključiti obavijesti?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obavijesti za ovu aplikaciju, možda ćete propustiti važna upozorenja i ažuriranja."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Upotreba pohrane"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Prikaz pohrane koju upotrebljavaju aplikacije"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Pokrenute usluge"</string>
@@ -1042,7 +1079,7 @@
     <string name="service_started_by_app" msgid="818675099014723551">"Pokrenula aplikacija."</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> besplatno"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> slobodno"</string>
     <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> up."</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
@@ -1084,19 +1121,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Ovaj način unosa možda može prikupljati sav tekst koji unosite, uključujući osobne podatke poput zaporki i brojeva kreditnih kartica. To omogućuje aplikacija <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Upotrijebiti taj način unosa?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ovaj alat za provjeru pravopisa može prikupljati sav tekst koji upisujete, uključujući osobne podatke kao što su zaporke i brojevi kreditnih kartica. Dolazi s aplikacije <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Upotrebljavati taj alat za provjeru pravopisa?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Postavke"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Jezik"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Otvaranje postavki za aplikaciju <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> nije uspjelo"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Miš/dodirna površina"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Brzina pokazivača"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Upravljač igrama"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Upotrijebi vibrator"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Preusmjeri vibrator na upravljač igrama kada su povezani."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Odaberite izgled tipkovnice"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Postavljanje izgleda tipkovnice"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Za prijelaz pritisnite Ctrl i razmaknicu."</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Zadano"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Izgledi tipkovnice"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Korisnički rječnik"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobni rječnik"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobni rječnici"</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_add_screen_title" msgid="742580720124344291">"Fraza"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Više opcija"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Manje opcija"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"U redu"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Riječ:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Prečac:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Jezik:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Za sve jezike"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Više jezika..."</string>
     <string name="testing" msgid="6584352735303604146">"Testiranje"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informacije o tabletnom uređaju"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefonske informacije"</string>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Postavljanje opcija 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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID razvoja uređaja"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Informacije o uređaju nisu dostupne"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Ne pokreći mirovanje"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Zaslon nikad neće prijeći u mirovanje tijekom punjenja"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti rješavanje programske pogreške na USB-u?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Rješavanje programske pogreške USB-a namijenjeno je samo u razvojne svrhe. Može se upotrijebiti za kopiranje podataka s računala na uređaj i obrnuto, instalaciju aplikacija na uređaju bez obavijesti i za čitanje dnevničkih zapisa."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Dopustiti postavke razvojnih programera?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ove su postavke namijenjene samo razvojnim programerima. One mogu uzrokovati kvar ili neželjeno ponašanje vašeg uređaja i aplikacija na njemu."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Zaštiti USB pohranu"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikacije moraju tražiti dozvolu za čitanje USB pohrane"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Zaštititi USB pohranu?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kad je USB pohrana zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane."\n\n"Neke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Zaštiti SD karticu"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacije moraju tražiti dozvolu za čitanje SD kartice"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Zaštititi SD karticu?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kad je SD kartica zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane."\n\n"Neke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Odaberi gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Odaberite widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite izraditi widget i dozvoliti pristup?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Kada izradite widget, aplikacija <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> može pristupiti svim podacima koje taj widget prikazuje."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Uvijek dopusti aplikaciji <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> izradu widgeta i pristupanje njihovim podacima"</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> 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> h <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>
@@ -1160,12 +1227,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Veliki tekst"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Prekid poziva tipkom za uključ."</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Izgovori zaporke"</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="3264723681038625967">"Instalacija web-skripti"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Poboljšavanje web-pristupačnosti"</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>
@@ -1180,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nema instaliranih usluga"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Trebate čitač zaslona?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack daje govorne povratne informacije kao pomoć slijepim i slabovidnim korisnicima. Želite li ga besplatno instalirati s usluge Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Instalirati web-skripte?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Želite li da aplikacije instaliraju skripte s Googlea koje će njihov sadržaj učiniti pristupačnijim?"</string>
-    <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="1072730037861494125">"Nije dan opis."</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_not_available" msgid="3214000535532434353">"Podaci o iskorištenosti baterije nisu dostupni."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1347,7 @@
     <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_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" msgid="3305141107104670703">"Alat koji ste odabrali ne može se pokrenuti."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguriraj"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Odaberite drugi alat"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Alat za sintezu govora može prikupljati izgovoreni sadržaj, uključujući osobne podatke kao što su zaporke i brojevi kreditnih kartica. To omogućuje alat <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Želite li omogućiti alat za sintezu govora?"</string>
@@ -1301,7 +1363,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Žena"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Omogući alat 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>
@@ -1318,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Iscrtajte obrazac za otključavanje"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Da biste potvrdili instalaciju vjerodajnica, trebate nacrtati svoj obrazac za otključavanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Upišite zaporku za pohranu vjerodajnica."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutačna zaporka:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Pohrana vjerodajnica izbrisana je."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Pohrana vjer. nije izbrisana."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pohranjivanje vjerodajnica je omogućeno."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Morate postaviti PIN ili zaporku za zaključavanje zaslona kako biste mogli upotrebljavati pohranu vjerodajnica."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebate postaviti PIN ili zaporku za zaključavanje zaslona prije nego što ćete moći upotrebljavati pohranu vjerodajnica."</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="5446972770562918934">"Stvori sigurnosnu kopiju i poništi"</string>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatska obnova"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri ponovnoj instalaciji aplikacije vratiti postavke i podatke za koje su stvorene sigurnosne kopije"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Zaporka sigurnosne kopije"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Potpune sigurnosne kopije na stolnom računalu trenutačno nisu zaštićene"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Odaberite za promjenu ili uklanjanje zaporke u potpunim sigurnosnim kopijama na stolnom računalu"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Zaustaviti stvaranje sigurnosnih kopija Wi-Fi zaporki, oznaka, drugih postavki i podataka aplikacije te izbrisati sve kopije na Googleovim poslužiteljima?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Postavke administracije uređaja"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Sustav"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Melodija zvona i vibriranje za poziv"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Povezivanje s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1457,10 @@
     <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_failed" msgid="1696499856374109647">"Sinkronizacija nije uspjela"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sinkronizacija aktivna"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <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="background_data" msgid="5779592891375473817">"Pozadinski podaci"</string>
@@ -1404,6 +1471,10 @@
     <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>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <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>
@@ -1413,7 +1484,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Dobro došli u Googleovu 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="6205903695598000286">"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>
@@ -1427,7 +1498,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Ovaj je račun potreban za neke aplikacije. Možete ga ukloniti samo vraćanjem tabletnog računala na tvorničke postavke (čime ćete izbrisati sve osobne podatke) na zaslonu Postavke &gt; Sigurnosna kopija i poništavanje."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Ovaj je račun potreban za neke aplikacije. Možete ga ukloniti samo vraćanjem telefona na tvorničke postavke (čime ćete izbrisati sve osobne podatke) na zaslonu Postavke &gt; Sigurnosna kopija i poništavanje."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nije moguća ručna sinkronizacija"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinkronizacija za tu stavku trenutačno je onemogućena. Da biste promijenili tu postavku, privremeno uključite pozadinske podatke i automatsku sinkronizaciju."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Postavke za 4G"</string>
@@ -1435,7 +1507,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
     <string name="enter_password" msgid="4131758584074246224">"Unesite zaporku za dešifriranje pohrane"</string>
     <string name="try_again" msgid="4272075051293936921">"Pokušajte ponovo."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Usluga je zauzeta. Pokušajte ponovo."</string>
     <string name="delete" msgid="4219243412325163003">"Izbriši"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1514,46 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Uklanjanje pogrešaka"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Odaberite aplikaciju za uklanjanje pogrešaka"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nema aplikacije za uklanjanje pogrešaka"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplikacija za uklanjanje pogrešaka: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Odaberite aplikaciju"</string>
+    <string name="no_application" msgid="2813387563129153880">"Ništa"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Čekanje na program za otkrivanje pogrešaka"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikacija čeka priključivanje programa za uklanjanje pogrešaka"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Ulaz"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Crtež"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Nadzor"</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_screen_updates" msgid="5470814345876056420">"Prikaži ažur. površine"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Bljeskanje cijele površine prozora pri ažuriranju"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Prikaži GPU ažur. prikaza"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Bljeskanje prikaza u prozorima pri crtanju GPU-om"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Onemogući HW preklapanja"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek upotrijebi GPU kod slaganja zaslona"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Omogući tragove"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Odaberi omogućene tragove"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Trenutačno nema omogućenih tragova"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Broj trenutačno omogućenih tragova: <xliff:g id="NUM">%1$d</xliff:g>"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Svi su tragovi trenutačno omogućeni"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Prikaži granice izgleda"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <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="force_hw_ui" msgid="6426383462520888732">"Prisilno GPU renderiranje"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Upotreba 2D hardverskog ubrzanja u aplikacijama"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Prisilna upotreba GPU-a za 2D crteže"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profil GPU prikazivanja"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mjeri vrijeme prikaza u adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Razmjer duljine animatora"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikacije"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Uklanjanje aktivnosti"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Uništite svaku aktivnost čim je korisnik napusti"</string>
@@ -1471,13 +1567,15 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobilne žarišne točke"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <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="8621855507876539282">"U tom razdoblju aplik. nisu upotreblj. 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_disclaimer" product="tablet" msgid="2591250607795265503">"Izmjereno tabletnim računalom. Operaterov izračun potrošnje može se razlikovati."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Izmjereno telefonom. Operaterov izračun potrošnje podataka može se razlikovati."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"ograničeno"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Onemogućiti mobilne podatke?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Ograničenje za mobilne podatke"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Postavi ograničenje za 4G"</string>
@@ -1488,33 +1586,50 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobilni uređaj"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Ništa"</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="8430240158135453271">"Prikaz postavki aplikacije"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ograniči pozadinske podatke"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Onemogući poz. pod. samo na mob. mreži. Upot. Wi-Fi ako ga ima."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Onemogući pozadinske podatke na mobilnim mrežama. Upotrijebit će se fiksne mreže ako su dostupne."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Za ograničenje poz. podat. za ovu apl. ograničite mob. podatke."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograničenje pozadinskih podataka?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Kada Wi-Fi nije dostupan, ova značajka može prouzročiti prekid rada aplikacije koja ovisi o pozadinskim podacima."\n\n"U postavkama koje su dostupne u aplikaciji možete pronaći prikladniji način upravljanja upotrebom podataka."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Zbog te značajke aplikacija koja ovisi o pozadinskim podacima može prestati raditi kada su dostupne samo mobilne mreže."\n\n"U postavkama možete pronaći prikladnije kontrole prijenosa podataka."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ograničavanje pozadinskih podataka moguće je samo ako ste postavili ograničenje mobilnih podataka."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <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_warning_editor_title" msgid="3704136912240060339">"Postavite upozorenje o upotrebi podataka"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavite ograničenje upotrebe podataka"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje upotrebe podataka"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Podatkovna veza s mrežom <xliff:g id="NETWORKS">%1$s</xliff:g> bit će onemogućena kada dosegnete navedeno ograničenje."\n\n"Budući da potrošnju podataka mjeri vaše tabletno računalo, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Podatkovna veza s mrežom <xliff:g id="NETWORKS">%1$s</xliff:g> bit će onemogućena kada dosegnete navedeno ograničenje."\n\n"Budući da potrošnju podataka mjeri vaš telefon, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Vaša podatkovna veza mobilnog uređaja bit će onemogućena kada dosegnete navedeno ograničenje."\n\n"Budući da potrošnju podataka mjeri vaše tabletno računalo, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Vaša podatkovna veza mobilnog uređaja bit će onemogućena kada dosegnete navedeno ograničenje."\n\n"Budući da potrošnju podataka mjeri vaš telefon, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograničenje pozadinskih podataka?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: iskorišteno otprilike <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: upotrijebljeno otprilike <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: upotrijebljeno oko <xliff:g id="TOTAL">%1$s</xliff:g>, prema mjerenju tableta. Operater može mjeriti drukčije."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: upotrijebljeno oko <xliff:g id="TOTAL">%1$s</xliff:g>, prema mjerenju telefona. Operater može mjeriti drukčije."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilne žarišne točke"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Odaberite Wi-Fi mreže koje su mobilne žarišne točke. Aplikacijama se može ograničiti upotreba tih mreža dok su u pozadini. Aplikacije također mogu upozoriti prije upotrebe tih mreža za velika preuzimanja."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilne mreže"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi mreže"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Za odabir mobilnih žarišnih točaka uključite Wi-Fi."</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>
@@ -1540,12 +1655,14 @@
     <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_edit" msgid="8647191407179996943">"Uređivanje VPN profila"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Povezivanje s profilom <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Dodavanje VPN profila"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Uredi profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Izbriši profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Nema mrežne veze. Pokušajte ponovo kasnije."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Nedostaje certifikat. Uredite profil."</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>
@@ -1554,25 +1671,7 @@
     <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="477937585801538951">"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="3973201880357468747">"Da biste aktivirali ono što dodirujete, dotaknite to. Klizite prstom dok ne pronađete ikonu za aplikaciju <xliff:g id="APP_NAME">%s</xliff:g>. Zatim dotaknite 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="8764686624055084454">"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. Najprije 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="3055831259260848004">"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">"Pravopisna provjera"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Provjera pravopisa"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Ovdje unesite trenutačnu zaporku za potpunu sigurnosnu kopiju"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Ovdje upišite novu zaporku za potpunu sigurnosnu kopiju"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Ovdje ponovo unesite novu zaporku za potpunu sigurnosnu kopiju"</string>
@@ -1580,4 +1679,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Odustani"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatna ažuriranja sustava"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Korisnici i ograničenja"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Korisnici"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj korisnika"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Uređivanje pojedinosti"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Korisnički podaci"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Ime"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Ograničenja sadržaja"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Zahtijeva se PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Ocjena sadržaja:"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplikacije sustava"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Instalirane aplikacije"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Odbaci"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Ukloni korisnika"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Naporni klinac"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Ukloniti korisnika?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Jeste li sigurni da želite ukloniti korisnika i sve povezane podatke iz uređaja?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavijesti"</string>
+    <string name="help_label" msgid="1107174367904110532">"Pomoć"</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 31c2540..653f0b1 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Kapcsolat bontása..."</item>
     <item msgid="1634960474403853625">"Nincs kapcsolat"</item>
     <item msgid="746097431216080650">"Sikertelen"</item>
+    <item msgid="6367044185730295334">"Letiltva"</item>
+    <item msgid="503942654197908005">"A rossz minőségű kapcsolatok átmeneti elkerülése"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Kapcsolat bontása <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózattal..."</item>
     <item msgid="197508606402264311">"Nincs kapcsolat"</item>
     <item msgid="8578370891960825148">"Sikertelen"</item>
+    <item msgid="5660739516542454527">"Letiltva"</item>
+    <item msgid="1805837518286731242">"A rossz minőségű kapcsolatok átmeneti elkerülése"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"Nyilvános webes meghajtó"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Nyomógomb"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"Nyilvános webes meghajtó"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Semelyik"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Hozzáfér. pont PIN kódja"</item>
-    <item msgid="7364462169350112617">"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>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Eltávolítható SD-kártya"</item>
     <item msgid="4498124044785815005">"Döntse el a rendszer"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Ki"</item>
-    <item msgid="4804571292609523335">"Rezgés"</item>
-    <item msgid="595707141547423573">"Némítás"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Rövid"</item>
     <item msgid="2560532955514699713">"Közepes"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animáció mérete: 5x"</item>
     <item msgid="6660750935954853365">"Animáció mérete: 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animáció ki"</item>
+    <item msgid="1138649021950863198">"Animáció léptéke: 0,5x"</item>
+    <item msgid="4394388961370833040">"Animáció léptéke: 1x"</item>
+    <item msgid="8125427921655194973">"Animáció léptéke: 1,5x"</item>
+    <item msgid="3334024790739189573">"Animáció léptéke: 2x"</item>
+    <item msgid="3170120558236848008">"Animáció léptéke: 5x"</item>
+    <item msgid="1069584980746680398">"Animáció léptéke: 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>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index f22499d..06ff804 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Igen"</string>
     <string name="no" msgid="6731231425810196216">"Nem"</string>
+    <string name="create" msgid="3578857613172647409">"Létrehozás"</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>
@@ -111,6 +112,8 @@
     <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>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth eszközök"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Eszköz neve"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Eszközbeállítások"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profilbeállítások"</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_rename_device" product="tablet" msgid="787970073150631155">"Táblagép átnevezése"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Párosítá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="5655704645616731277">"Párosítás érintéssel"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nem található a közelben Bluetooth-eszköz."</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="1931617700075106801">"Érintse meg a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel való párosításhoz"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Érintse meg a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel való párosításhoz."</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="device_picker" msgid="8398232791303186677">"Bluetooth-eszközválasztó"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth engedélykérés"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Egy alkalmazás be akarja kapcsolni a Bluetooth funkciót. Engedélyezi?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"A táblagépen lévő egyik alkalmazás felfedezhetővé akarja tenni a táblagépet más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig. Engedélyezi?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Érintse meg a(z) \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eszközhöz való csatlakozáshoz."</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_acceptance_dialog_text" msgid="6555508756987053866">"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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"A beírt gazdagépnév nem érvényes."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"A beírt kivétellista nincs jól formázva. Kérjük, vesszővel elválasztott listát írjon be 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_port" msgid="5539106187558215246">"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="2671425042711054494">"A megadott port nem érvényes."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"A HTTP proxyt a böngésző használja, ám más alkalmazások nem használhatják."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Beállítás"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Sikertelen"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Sikeres"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"A módosítások az USB-kábel újracsatlakoztatásakor lépnek életbe"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"A módosítások az USB-kábel újracsatlakoztatásakor lépnek életbe."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB-háttértár engedélyezése"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Összes bájt:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Az USB-tár nincs csatolva"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Hiányzó SD-kártya"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Az USB-tár nincs csatolva."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Nincs SD-kártya."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Rendelkezésre álló bájtok:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Az USB-tár használatos tárhelyként"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Az SD-kártya használata háttértárként"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Az USB-tár eltávolítható"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Most már biztonságosan eltávolíthatja az SD-kártyát"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Az USB-tár háttértárként van használatban."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Az SD-kártya használata háttértárként"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Az USB-tár eltávolítható."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Most már biztonságosan eltávolíthatja az SD-kártyát."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-tárat használat közben távolították el"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Az SD-kártyát használat közben távolították el!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Felhasznált bájtok:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Média keresése az USB-táron"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Írásvédettként csatolt USB-tár."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Nyelv"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Csatlakozás adatszolgáltatásokhoz barangolás során"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Megszakadt az adatkapcsolat, mert elhagyta az otthoni hálózatot, és az adatbarangolás nincs bekapcsolva."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Bekapcsolás"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Engedélyezi az adatbarangolást? Lehet, hogy jelentős összeget számítanak fel érte!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Figyelem"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Ha engedélyezi az adatbarangolást, akkor jelentős barangolási költség merülhet fel!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Engedélyezi az adatbarangolást?"</string>
     <string name="networks" msgid="6333316876545927039">"Szolgáltatóválasztás"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Válassza ki a hálózat üzemeltetőjét"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dátum és idő"</string>
@@ -283,12 +285,14 @@
     <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>
     <string name="date_time_set_date" msgid="7021491668550232105">"Dátum beállítása"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Dátumformátum kiválasztása"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Válassza ki a dátum formátumát"</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="date_picker_title" msgid="1338210036394128512">"Dátum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Idő"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Arcfelismerés javítása"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Élőszerűség ellenőrzése"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Pislogás szükséges"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve 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="3504519024884099702">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve 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_desc" product="tablet" msgid="3839235202103924154">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja táblagépét, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: táblagépének titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről."\n\n"A titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejezéséig hagyja töltőn a táblagépet. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja telefonját, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: telefonjának titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről."\n\n"A titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejeződéséig hagyja töltőn a telefonját. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</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="2029407131227814893">"Töltse fel az akkumulátort, és próbálja újra."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"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="5100339496381875522">"Titkosítja?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A titkosítási művelet visszafordíthatatlan, 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="5682944380460921880">"A titkosítási művelet visszafordíthatatlan, 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="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"Írja be 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="6891198717505120682">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a táblagépen található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja táblagépét, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja táblagépét, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a telefonon található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja telefonját, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja telefonját, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Képernyőzár-választás"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a táblagépen található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja táblagépét, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja táblagépét, lehetősége lesz minden adat visszaállítására, amelyet a rendszer tárolt a Google Fiókjában."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a telefonon található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja telefonját, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja telefonját, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Beviteli mód váltása"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Képernyőzár választása"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Biztonsági zárolás"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Képernyő zárolása"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Képernyőzár mód."</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Arcalapú feloldá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_set_unlock_mode_pattern" msgid="7837270780919299289">"Minta"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kód"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Jelszó"</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>
@@ -362,44 +367,44 @@
     <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="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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A jelszónak rövidebbnek kell lennie <xliff:g id="NUMBER">%d</xliff:g> karakternél."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"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="1079053457942945709">"A PIN kód csak számokat tartalmazhat, 0-tól 9-ig."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Az eszközrendszergazda nem engedélyezi a legutóbbi PIN kódok használatát."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"A jelszó nem használható karaktert tartalmaz."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"A jelszónak tartalmaznia kell legalább egy betűt."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"A jelszónak tartalmaznia kell legalább egy számot."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"A jelszónak tartalmaznia kell legalább egy szimbólumot."</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>
+    <item quantity="one" msgid="3063853802158131458">"A jelszónak tartalmaznia kell legalább 1 betűt."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"A jelszónak tartalmaznia kell legalább 1 kisbetűt."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"A jelszónak tartalmaznia kell legalább 1 nagybetűt."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"A jelszónak tartalmaznia kell legalább 1 számot."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"A jelszónak tartalmaznia kell legalább 1 speciális karaktert."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"A jelszónak tartalmaznia kell legalább 1, betűktől eltérő karaktert."</item>
+    <item quantity="other" msgid="3952508584649046404">"A jelszónak tartalmaznia kell legalább %d, betűktől eltérő 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_password_recently_used" msgid="6098087796784262081">"Az eszközrendszergazda nem engedélyezi a legutóbbi jelszavak 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="lock_setup" msgid="1759001157415978959">"A telepítés kész"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"A beállítás megtörtént."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Eszközfelügyelet"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"A(z) <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g> <xliff:g id="DEVICE_NAME">%1$s</xliff:g> <xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> készülékkel való párosításhoz írja be a készülék szükséges jelszavá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_enter_pin_other_device" msgid="4637977124526813470">"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="2798719004030279602">"Előfordulhat, hogy az azonosító kulcsot a másik eszközön is be kell írnia."</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="2796550001376088433">"A(z) <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> eszközzel való párosításhoz írja be rajta a következőt: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g> <xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, majd nyomja meg a Return vagy az Enter billentyűt."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"A párosítás sikertelen volt a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel hibás PIN kód vagy jelszó miatt."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nem lehet kommunikálni a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Nem sikerült csatlakozni a következőhöz: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Lehetővé teszi az adatok cseréjét, ha a telefon érintkezik egy másik készülékkel"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tegye lehetővé az adatcserét, ha a táblagép érintkezik egy másik eszközzel."</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lehetővé teszi az adatok cseréjét, ha a telefon érintkezik egy másik készülékkel"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Készen áll az alkalmazási tartalmak továbbítására kis hatósugarú vezeték nélküli kommunikáció segítségével"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Ki"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nem érhető el, mert az NFC ki van kapcsolva"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Ha ez a funkció be van kapcsolva, alkalmazástartalmat sugározhat át egy másik NFC-kompatibilis eszközre úgy, hogy egymáshoz közel tartja az eszközöket. Például átsugározhat böngészőoldalalakat, YouTube-videókat, névjegyeket stb."\n\n"Mindössze helyezze az eszközöket egymáshoz közel (lehetőleg a hátlapjaikat összeérintve), majd érintse meg a képernyőt. Az alkalmazás eldönti, hogy mit fog átsugározni."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Hálózati szolgáltatások keresése"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Más eszközökön lévő alkalmazások láthatják az ezen a készüléken lévő alkalmazásokat."</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="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_setup_wizard_title" msgid="70277346338812325">"Wi-Fi hálózat kiválasztása"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nem lehet beolvasni a hálózatokat"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Hálózati értesítés"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Értesítést kérek az elérhető nyitott hálózatokról"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Kerülje a rossz minőségű kapcsolatokat"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Csak akkor használjon Wi-Fi hálózatot, ha jó internetkapcsolatot tud biztosítani"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Rossz minőségű kapcsolatok kerülése"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Csak akkor használjon Wi-Fi hálózatot, ha jó internetkapcsolatot tud biztosítani"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Tartsa bekapcsolva a Wi-Fit alvás közben"</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_wps_pbc" msgid="2668564692207863017">"WPS gomb"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN kód megadása"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Wi-Fi hálózatok keresése..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Másik hálózat..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Egyebek"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. beállítás (WPS)"</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="8242979682530043184">"Írja be a hozzáférési pont PIN kódját"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS beállítása"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"A(z) <xliff:g id="WPS_PIN">%1$s</xliff:g> PIN kód 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_wps_setup_title" msgid="6034518116333042484">"WPS"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS indítása..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Nyomja meg a Wi-Fi Protected Setup gombot a routeren. Ennek elnevezése lehet \"WPS\" is, illetve a következő szimbólum is jelölheti:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Írja be a Wi-Fi router azonosítókódját (<xliff:g id="NUMBER">%1$s</xliff:g>). A telepítés legfeljebb 2 percet vesz igénybe."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Sikeres WPS. Csatlakozás a hálózathoz..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Csatlakozva a(z) <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"A WPS már folyamatban van, és legfeljebb 2 percet vesz igénybe."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Sikertelen WPS. Kérjük, próbálkozzon újra néhány perc múlva."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A vezeték nélküli router biztonsági beállítása (WEP) nem támogatott."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A vezeték nélküli router biztonsági beállítása (TKIP) nem támogatott."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Azonsítási hiba. Kérjük, próbálja újra."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Egy másik WPS-munkamenetet észleltünk. Kérjük, próbálkozzon újra néhány perc múlva."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Mentve"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Letiltva"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Került, rossz minőségű internetkapcsolat"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Hálózat elkerülve rossz kapcsolat miatt. Ezt a viselkedést kikapcsolhatja a Beállítások &gt; Wi-Fi képernyő Haladó menüpontjában."</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_wps_available_first_item" msgid="3538912605343585226">"Védett hálózat elérhető"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (védett hálózat elérhető)"</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_failed_connect_message" msgid="8491902558970292871">"Nem sikerült hálózathoz csatlakozni."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elfelejt"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nem sikerült elfelejteni a hálózatot."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Mentés"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nem sikerült menteni a hálózatot."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Mégse"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Másik védett Wi-Fi programfolyamat látható. 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Átjáró"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Hálózati előtag hossza"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Közvetlen Wi-Fi"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Az egyenrangú kapcsolat beállítása"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Készülékadatok"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi védett beállítások"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Írja be 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_remove_group" msgid="4844634506540667517">"Csoport eltávolítása"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Haladó"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Elérhető eszközök"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Eszközök keresése"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Keresés..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Eszköz átnevezése"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Partnereszközök"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"A kapcsolódás sikertelen."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Nem sikerült átnevezni az eszközt."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Megszakítja?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Ha bontja a kapcsolatot, akkor megszakad a kapcsolat a következővel: <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ha bontja a kapcsolatot, akkor megszakad a kapcsolat a következőkkel: <xliff:g id="PEER_NAME">%1$s</xliff:g> és <xliff:g id="PEER_COUNT">%2$s</xliff:g> további eszköz."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Törli a meghívást?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Szeretné törölni a(z) <xliff:g id="PEER_NAME">%1$s</xliff:g> eszközhöz való csatlakozásra vonatkozó meghívást?"</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_configure_ap_text" msgid="3474995108398156258">"Wi-Fi hotspot konfigurálása"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-Fi hotspot beállítá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="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hang"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Néma üzemmód"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon csengőhangja"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hangerő"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Zenei hatások"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Csengetés hangereje"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rezgés néma üzemmódban"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Rezgés és csengetés"</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="incoming_call_volume_title" msgid="8073714801365904099">"Csengőhang"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Csengőhang és értesítések elnémítása"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Zene és egyéb média elnémítása"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Értesítések elnémítása"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Riasztások elnémítása"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Csörgéskor rezegjen"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"A dokkolási hang beállítása előtt dokkolnia kell a táblagépet."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"A dokkolás hangjának beállítása előtt dokkolnia kell a telefont."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"A dokkolás hangjának beállítása előtt dokkolnia kell a táblagépet."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"A dokkolás hangjának beállítása előtt dokkolnia kell a telefont."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dokkolási hang"</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="account_settings" msgid="6403589284618783461">"Fiókok"</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="7965901687241669598">"Megjelenítés"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Saját telefonszámom"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"PRL verzió"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Törli az összes személyes információt és letöltött alkalmazást? 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="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_gesture_explanation" msgid="826193821455182780">"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="7959646179737950703">"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="7572642091599403668">"Visszaállítás?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-tár törlése"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Törli az SD-kártyát, ezzel eltávolítva az összes ott tárolt fájlt? A műveletet nem lehet visszavonni!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Minden törlése"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Rajzolja le a feloldási mintát"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az USB-tárat."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Le kell rajzolnia a feloldó mintát annak megerősítéséhez, hogy törölni kívánja az USB-tárat."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"USB-megosztás"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilhálózatok"</string>
     <string name="location_title" msgid="1029961368397484576">"Saját pozíció"</string>
     <string name="location_network_based" msgid="5569673665032992664">"A Google helyszolgáltatása"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Engedélyezze az alkalmazásoknak a Wi-Fi és mobiladatok használatát a hozzávetőleges tartózkodási hely meghatározásához"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Helyadatok küldésének engedélyezése. Az alkalmazások Wi-Fi és mobil hálózatok adatait is használhatják a helymeghatározáshoz."</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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nyomja meg a Menü gombot, ha segítségre van szüksége."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Emelje fel az ujját, ha kész."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Kapcsoljon össze legalább <xliff:g id="NUMBER">%d</xliff:g> pontot. Próbálkozzon újra:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"A minta rögzítve!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"A minta rögzítve!"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Rajzolja újra a mintát a megerősítéshez:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Az új feloldási minta:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Megerősítés"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Tovább"</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="1075370160667458122">"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="tablet" msgid="8616353869251700776">"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="8393155371327584659">"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össön össze legalább négy pontot a következő képernyőn. "\n\n"Készen áll? Érintse meg a Tovább gombot."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Alkalmazások kezelése"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Telepített alkalmazások kezelése és eltávolítása"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Alkalmazások kezelése, gyorsindító parancsikonok létrehozása"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Alkalmazásbeállítások"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ismeretlen források"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Nem a Marketről származó alkalmazások telepítésének engedélyezése"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Ismeretlen forrású alkalmazásokat is lehessen telepíteni"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"A táblagépre és a személyes adatokra sokkal nagyobb veszélyt jelentenek az ismeretlen forrásból származó alkalmazások támadásai. Ön kijelenti, hogy egyedül Ön felel a táblagépen bekövetkező minden olyan kárért vagy adatvesztésért, amely ezen alkalmazások használatából fakad."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"A telefonra és a személyes adatokra sokkal nagyobb veszélyt jelentenek az ismeretlen forrásból származó alkalmazások támadásai. Ön kijelenti, hogy egyedül Ön felel a telefonon bekövetkező minden olyan kárért vagy adatvesztésért, amely ezen alkalmazások használatából fakad."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Speciális beállítások"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Alkalmazásinformáció"</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="auto_launch_label_generic" msgid="3230569852551968694">"Alapbeállítások"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Adatok törlése"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Frissítések eltávolítása"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Úgy döntött, hogy ezt az alkalmazást indítja el alapértelmezettként egyes műveletekhez."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Ön engedélyezte az alkalmazás számára modulok létrehozását, illetve az adataikhoz való hozzáférést."</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="1616155457673106022">"Nem biztos, hogy ezt az alkalmazást az Ön képernyőjére tervezték. Itt szabályozhatja az alkalmazás megjelenítését."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Rendezés méret szerint"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Futó szolgáltatások"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Tárolt folyamatok"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Alapbeállítások"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Visszaállítja a beállításokat?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ez visszaállítja az összes beállítást a következőknél:"\n\n" "<li>"Letiltott alkalmazások"</li>\n" "<li>"Letiltott alkalmazásokkal kapcsolatos értesítések"</li>\n" "<li>"Alapértelmezett alkalmazások az egyes műveletekhez"</li>\n" "<li>"Háttéradatokra vonatkozó korlátozások az alkalmazásoknál"</li>\n\n" Az alkalmazásokban található adatok nem fognak elveszni."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Alapbeállítások"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Terület kezelése"</string>
     <string name="filter" msgid="2018011724373033887">"Szűrő"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Válasszon szűrési lehetőségeket"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"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="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"A csomag méretének kiszámítása sikertelen."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"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="3916469657537695436">"Beépített alkalmazás letiltása?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ha letiltja a beépített alkalmazást, más alkalmazások hibásan működhetnek."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Kikapcsolja az értesítéseket?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ha kikapcsolja az erre az alkalmazásra vonatkozó értesítéseket, akkor lemaradhat fontos figyelmeztetésekről és a frissítésekről."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Tárhely-használat"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Alkalmazások által használt tárhely megtekintése"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Futó szolgáltatások"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"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>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Lehetséges, hogy ez a helyesírás-ellenőrző összegyűjti a beírt szövegeket, beleértve a személyes adatokat, mint amilyenek a jelszavak és bankkártyaszámok. A(z) <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> alkalmazástól származik. Használja ezt a helyesírás-ellenőrzőt?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Beállítások"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Nyelv"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Nem sikerült megnyitni a(z) <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> beállításait."</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Egér/érintőpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Mutató sebessége"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Játékvezérlő"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Rezgés használata"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Rezgés átirányítása a játékvezérlőbe kapcsolódáskor."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Billentyűzetkiosztás kiválasztása"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Billentyűzetkiosztások beállítása"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Váltáshoz nyomja meg a Control+szóköz billentyűkódot"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Alapértelmezett"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Billentyűzetkiosztások"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Felhasználói szótár"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Személyes szótár"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Személyes szótárak"</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_add_screen_title" msgid="742580720124344291">"Kifejezés"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"További opciók"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Kevesebb opció"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Szó:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Parancsikon:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Nyelv:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Minden nyelven"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"További nyelvek…"</string>
     <string name="testing" msgid="6584352735303604146">"Tesztelés"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Táblagép adatai"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefon adatai"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Alkalmazásfejlesztési beállítások megadá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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Fejlesztési eszköz azonosítója"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Nem áll rendelkezésre eszközinformáció"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Nem kapcsolódik ki"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A képernyő soha nem kapcsol ki töltés során"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Engedélyezi az USB hibakeresést?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Az USB hibakeresés fejlesztési célokat szolgál. Használhatja adatok másolására a számítógép és a készülék között, alkalmazások a készülékre való értesítés nélküli telepítésére és naplózási adatok olvasására."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Engedélyezi a fejlesztői beállításokat?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ezek a beállítások csak fejlesztői használatra szolgálnak. Használatuk esetén eszköze vagy alkalmazásai meghibásodhatnak, illetve nem várt módon viselkedhetnek."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB-tár védetté tétele"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Alkalmazások kérjenek engedélyt az USB-n lévő adatok olvasására"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Védetté teszi az USB-tárat?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Ha az USB-háttértár védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására."\n\n"Előfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD-kártya védetté tétele"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Az alkalmazások kérjenek engedélyt az SD-kártya olvasására"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Védetté teszi az SD-kártyát?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ha az SD-kártya védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására."\n\n"Előfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Modul kiválasztása"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Modul kiválasztása"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Létrehozza a modult, és engedélyezi a hozzáférést?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Miután létrehozta a modult, a(z) <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> hozzáférhet az összes általa megjelenített adathoz."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Mindig engedélyezem a(z) <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> számára a modulok létrehozását és az adatokhoz való hozzáférést."</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> n <xliff:g id="HOURS">%2$d</xliff:g> ó <xliff:g id="MINUTES">%3$d</xliff:g> p <xliff:g id="SECONDS">%4$d</xliff:g> mp"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ó <xliff:g id="MINUTES">%2$d</xliff:g> p <xliff:g id="SECONDS">%3$d</xliff:g> mp"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> p <xliff:g id="SECONDS">%2$d</xliff:g> mp"</string>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Jelszavak kimondása"</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="3264723681038625967">"Internetes szkriptek telepítése"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Webelérhetőség fokozása"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nincs telepített szolgáltatás"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Képernyőolvasóra van szüksége?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"A TalkBack beszéddel történő visszajelzést kínál vak és gyengénlátó felhasználók számára. Szeretné ingyen telepíteni az Android Marketről?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Internetes szkriptek telepítése?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Szeretné, ha az alkalmazások telepíthetnének olyan szkripteket a Google-tól, melyek révén az internetes tartalom még inkább hozzáférhetővé válik?"</string>
-    <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="1072730037861494125">"Nincs leírás."</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_not_available" msgid="3214000535532434353">"Nincs akkuhasználati adat"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"A kiválasztott motor nem futtatható."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurálás"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Válasszon másik motort"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ez a beviteli módszer alkalmas lehet az elhangzott 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="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> motor kapcsolta be. Engedélyezi ennek a beszédszintetizáló motornak a használatát?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Nő"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Használat előtt 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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Rajzolja le a feloldási mintát"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"A hitelesítési adatok telepítésének megerősítéséhez rajzolja le feloldási mintáját."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Írja be az azonosítótároló jelszavát."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Jelenlegi jelszó:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Hit. adatok tárolója üres."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Az azonosítótárolót nem lehet törölni."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"A hitelesítési adatok tárolója engedélyezve van."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Be kell állítani a zárolási képernyő PIN kódját vagy jelszavát, mielőtt használhatja az azonosítótárolót."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Be kell állítania a zárolási képernyő PIN kódját vagy jelszavát, mielőtt használhatná az azonosítótárolót."</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="5446972770562918934">"Biztonsági mentés és visszaállítás"</string>
@@ -1338,13 +1401,13 @@
     <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="9157861529438245957">"Alkalmazásadatok, Wi-Fi jelszavak és egyéb 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_title" msgid="3790872965773196615">"Biztonsági mentés helye"</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="4235615056371993807">"Amikor újratelepít egy alkalmazást, a biztonsági mentésből állítsa helyre a beállításait és az adatokat"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Asztali mentés jelszava"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Az asztali teljes biztonsági mentések jelenleg nem védettek."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Érintse meg, ha módosítaná vagy eltávolítaná a jelszót az asztali teljes mentésekhez"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Wi-Fi jelszavak, könyvjelzők, egyéb beállítások és alkalmazásadatok biztonsági mentésének kikapcsolása, valamint a Google szerverein lévő összes példány törlése?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Eszközkezelői beállítások"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Rendszer"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Csengőhang és rezgés beállításai"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Csatlakozás a(z) <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"A szinkronizálás nem sikerült"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Szinkronizálás aktív"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Szinkronizálás"</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="background_data" msgid="5779592891375473817">"Háttéradatok"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Utolsó szinkronizálás: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Szinkronizálás..."</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>
@@ -1413,7 +1480,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Naptár"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Címtár"</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="sync_plug" msgid="3905078969081888738"><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="6205903695598000286">"Alkalmazás-szinkronizá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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Ez a fiók szükséges egyes alkalmazások számára. Csak a táblagép gyári beállításainak visszaállításával távolíthatja el (ez törli az összes személyes adatát) a Beállítások &gt; Biztonsági mentés és visszaállítás menüpontban."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Ez a fiók szükséges egyes alkalmazások számára. Csak a telefon gyári beállításainak visszaállításával távolíthatja el (ez törli az összes személyes adatát) a Beállítások &gt; Biztonsági mentés és visszaállítás menüpontban."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nem lehet manuálisan szinkronizálni"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Az elem szinkronizálása jelenleg le van tiltva. A beállítás módosításához ideiglenesen kapcsolja be a háttéradatokat és az automatikus szinkronizálást."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G beállítások"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-cím"</string>
     <string name="enter_password" msgid="4131758584074246224">"Írja be a jelszót a tároló kódolásának feloldásához"</string>
     <string name="try_again" msgid="4272075051293936921">"Próbálja újra."</string>
-    <string name="service_busy" msgid="2325014135156127705">"A szolgáltatás foglalt. Próbálja újra."</string>
     <string name="delete" msgid="4219243412325163003">"Törlés"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"Az ö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="debug_debugging_category" msgid="6781250159513471316">"Hibakeresés"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Válassza az alkalmazás hibakeresése lehetőséget"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nincs beállítva alkalmazás hibakereséshez"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazás hibakeresése"</string>
+    <string name="select_application" msgid="5156029161289091703">"Alkalmazás kiválasztása"</string>
+    <string name="no_application" msgid="2813387563129153880">"Semmi"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Várjon a hibakeresőre."</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"A javított alkalmazás a hibakeresőre vár."</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Bevitel"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Rajz"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Figyelés"</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_screen_updates" msgid="5470814345876056420">"Képernyőfrissítések megj."</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"A teljes ablakfelület villogjon frissítéskor."</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU-nézetfriss. megjel."</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Ablakbeli nézetek villognak GPU-s rajznál."</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"HW fedvények letiltása"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Mindig a GPU használata képernyő-feldolgozáshoz"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Nyomkövetés engedélyezése"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Eng. nyomkövetés kivál."</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Jelenleg nincs engedélyezett nyomkövetés."</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Jelenleg <xliff:g id="NUM">%1$d</xliff:g> nyomkövetés engedélyezett."</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Jelenleg minden nyomkövetés engedélyezve van."</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Elrendezéshatár mutatása"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Kliphatárok, margók stb. megjelenítése."</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="force_hw_ui" msgid="6426383462520888732">"GPU-megjelenítés"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"2D hardvergyorsítás használata az alkalmazásokban"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"GPU használatának kényszerítése 2D rajzhoz"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profil GPU-renderelésről"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Renderelési idő mérés ADB shell dumpsys gfxinfoban"</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="animator_duration_scale_title" msgid="3406722410819934083">"Animáció léptéke"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobil hotspotok"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Adatok automatikus szinkronizálása"</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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Ez a táblagép általi mérés. A szolgáltatói adathasználati mérés eltérhet ettől."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Ez a telefon általi mérés. A szolgáltatói adathasználati mérés eltérhet ettől."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"korlátozott"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Mobiladatok kikapcsolása?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Mobil adatkorlát beállítása"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G adatkorlát beállítása"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobil"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Nincs"</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="8430240158135453271">"Alkalmazásbeállítások megtekintése"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Háttéradatok korlátozása"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Adatok kikapcs. mobil-adathálózatokon. Wi-Fi használata, ha van."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Háttéradatok kikapcsolása mobilhálózaton. Nem mobil hálózatok használata."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Háttéradatok korlátozásához előbb állítson be mobiladatkorlátot."</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="5651588785118290771">"Ez a funkció leállíthat egyes háttérben zajló adatforgalmat igénylő alkalmazásokat, amikor nem áll rendelkezésre Wi-Fi kapcsolat."\n\n"Beállíthat megfelelőbb adathasználatot az alkalmazás beállításai között."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Lehetséges, hogy e funkció miatt a háttéradatoktól függő alkalmazások nem fognak működni, ha csak mobilhálózatok állnak rendelkezésre."\n\n"Az alkalmazásban lévő beállítások között megfelelőbb adathasználati beállításokat találhat."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"A háttéradatok korlátozása csak akkor lehetséges, ha beállított mobil adatkorlátot."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Automatikus adatszinkr. be?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Az interneten végrehajtott fiókmódosítások automatikusan megjelennek táblagépén is."\n\n"Egyes fiókok esetében ez fordítva is igaz. A Google Fiók az utóbbi szerint működik."\n\n"Annak kiválasztásához, hogy mi legyen szinkronizálva az egyes fiókokon belül, menjen a Beállítások &gt; Fiókok lehetőségre."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Az interneten végrehajtott fiókmódosítások automatikusan megjelennek telefonján is."\n\n"Egyes fiókok esetében ez fordítva is igaz. A Google Fiók az utóbbi szerint működik."\n\n"Annak kiválasztásához, hogy mi legyen szinkronizálva az egyes fiókokon belül, menjen a Beállítások &gt; Fiókok lehetőségre."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Automatikus adatiszinkr. ki?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Ez mérsékelni fogja az adat- és akkumulátorhasználatot, de minden egyes fiókot manuálisan kell majd szinkronizálnia a legfrissebb információk begyűjtéséhez. Továbbá nem fog értesítéseket kapni a frissítésekről."</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_warning_editor_title" msgid="3704136912240060339">"Adathasználati figyelmeztetés beállítása"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Adathasználati korlát beállítása"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Adatforgalom korlátozása"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"A(z) <xliff:g id="NETWORKS">%1$s</xliff:g> hálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor."\n\n"Mivel az adathasználatot a táblagép méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"A(z) <xliff:g id="NETWORKS">%1$s</xliff:g> hálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor."\n\n"Mivel az adathasználatot a telefon méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"A mobilhálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor."\n\n"Mivel az adathasználatot a táblagép méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"A mobilhálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor."\n\n"Mivel az adathasználatot a telefon méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Korlátozza a háttéradatokat?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ha korlátozza a háttérben zajló mobiladat-forgalmat, néhány alkalmazás és szolgáltatás nem fog működni, ha a Wi-Fi nincs engedélyezve."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: kb. <xliff:g id="TOTAL">%1$s</xliff:g> felhasználva"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: kb. <xliff:g id="TOTAL">%1$s</xliff:g> felhasználva"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: kb. <xliff:g id="TOTAL">%1$s</xliff:g> felhasználva a táblagép szerint. A szolgáltatói mérés eltérhet ettől."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: kb. <xliff:g id="TOTAL">%1$s</xliff:g> felhasználva a telefon szerint. A szolgáltatói mérés eltérhet ettől."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobil hotspotok"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Válassza ki azokat a Wi-Fi hálózatokat, amelyek mobil hotspotok. A háttérben futó alkalmazásoknál letilthatja az ilyen hálózatok használatát. Az alkalmazások akár értesíthetik is Önt, mielőtt nagyméretű letöltésekre használnák az ilyen hálózatokat."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilhálózatok"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi hálózatok"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"A mobil hotspotok kiválasztásához kapcsolja be a Wi-Fit."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"VPN-profil szerkesztése"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Csatlakozás a következőhöz: <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"VPN-profil hozzáadása"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Profil szerkesztése"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Profil törlése"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Nincs hálózati kapcsolat. Próbálja újra később."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Egy tanúsítvány hiányzik. Kérjük, módosítsa a profilt."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"Miután bekapcsolta a \"Felfedezés érintéssel\" funkciót, a képernyő megérintésével többet tudhat meg arról, amin az ujját tartja. Például az aktuális képernyőn alkalmazások ikonjai találhatók. Találjon meg egyet úgy, hogy megérinti a képernyőt és húzza az 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="3973201880357468747">"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="8764686624055084454">"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="3055831259260848004">"Ön az útmutató végére ért. A kilépéshez keresse meg, majd é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="spellcheckers_settings_title" msgid="399981228588011501">"Helyesírás-ellenőrző"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Adja meg a jelenlegi, teljes biztonsági mentéshez használt jelszavát"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Írjon be új jelszót a teljes mentésekhez itt"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Még egyszer írja be a teljes mentés új jelszavát"</string>
@@ -1582,4 +1670,22 @@
     <!-- no translation found for percentage (5866131581207788624) -->
     <skip />
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"További rendszerfrissítések"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Felhaszn. és korlátozások"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Felhasználók"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Felhasználó hozzáad."</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Részletek szerkesztése"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Felhasználói adatok"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Név"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Tartalmi korlátozások"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN-kód kérése"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Tartalom besorolása"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Rendszeralkalmazások"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Telepített alkalmazások"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Elvetés"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Felhasználó törlése"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Bosszantó gyerek"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Törli a felhasználót?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Biztosan eltávolítja a felhasználót és az összes hozzá kapcsolódó adatot az eszközről?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Értesítések megjelenítése"</string>
+    <string name="help_label" msgid="1107174367904110532">"Súgó"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index cb84fe4..12f3cd9 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Memutus sambungan..."</item>
     <item msgid="1634960474403853625">"Sambungan terputus"</item>
     <item msgid="746097431216080650">"Gagal"</item>
+    <item msgid="6367044185730295334">"Dicekal"</item>
+    <item msgid="503942654197908005">"Menghindari sambungan buruk untuk sementara"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Diputus dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Sambungan terputus"</item>
     <item msgid="8578370891960825148">"Gagal"</item>
+    <item msgid="5660739516542454527">"Dicekal"</item>
+    <item msgid="1805837518286731242">"Menghindari sambungan buruk untuk sementara"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Tekan tombol"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Tak Satu Pun"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN dari titik akses"</item>
-    <item msgid="7364462169350112617">"PIN dari perangkat ini"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statik"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Kartu SD yang dapat dicopot"</item>
     <item msgid="4498124044785815005">"Biarkan sistem menentukan"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Mati"</item>
-    <item msgid="4804571292609523335">"Getar"</item>
-    <item msgid="595707141547423573">"Bungkam"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Singkat"</item>
     <item msgid="2560532955514699713">"Sedang"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Skala animasi 5x"</item>
     <item msgid="6660750935954853365">"Skala animasi 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animasi mati"</item>
+    <item msgid="1138649021950863198">"Skala animasi 0,5x"</item>
+    <item msgid="4394388961370833040">"Skala animasi 1x"</item>
+    <item msgid="8125427921655194973">"Skala animasi 1,5x"</item>
+    <item msgid="3334024790739189573">"Skala animasi 2x"</item>
+    <item msgid="3170120558236848008">"Skala animasi 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ed7347b..02c254b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -18,6 +18,7 @@
     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="create" msgid="3578857613172647409">"Buat"</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>
@@ -62,7 +63,7 @@
     <string name="small_font" msgid="2295331917424072635">"Kecil"</string>
     <string name="medium_font" msgid="2068475425515133701">"Sedang"</string>
     <string name="large_font" msgid="599055175160971446">"Besar"</string>
-    <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
+    <string name="font_size_save" msgid="3450855718056759095">"Oke"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Penyimpanan USB"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Kartu SD"</string>
     <string name="battery_info_status_label" msgid="8109155295509700309">"Status baterai:"</string>
@@ -96,7 +97,7 @@
     <string name="battery_info_health_overheat" msgid="8442959549291368806">"Panas berlebih"</string>
     <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_unspecified_failure" msgid="6347021103185471590">"Kesalahan 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>
@@ -111,10 +112,12 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Mencegah penggunaan aplikasi telepon Bluetooth ketika layar terkunci"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Perangkat bluetooth"</string>
     <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_device_details" msgid="4594773497930028085">"Setelan perangkat"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Setelan profil"</string>
+    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Tidak ada setelan nama, menggunakan nama akun"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Memindai perangkat"</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_device" product="tablet" msgid="787970073150631155">"Ganti nama tablet"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Ganti 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>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Menyandingkan..."</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="5655704645616731277">"Sentuh utk mnyandingkn"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Tak ditemukan prngkt Bluetooth terdekat."</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="1931617700075106801">"Sentuh untuk menyandingkan 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_notif_message" msgid="5300852675110479862">"Sentuh untuk menyandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tampilkan file yang diterima"</string>
+    <string name="device_picker" msgid="8398232791303186677">"Pemilih perangkat bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan izin bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Sebuah apl ingin menghidupkan Bluetooth. Izinkan?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Sebuah apl pada tablet Anda ingin membuat tablet dapat ditemukan oleh perangkat Bluetooth lainnya selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Izinkan?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Sentuh untuk menyambung ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Sambungkan ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="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_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ingin mengakses kontak 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>
@@ -176,18 +178,18 @@
     <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_defaultView_text" msgid="6387985519141433291">"Pulihkan default"</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_label" msgid="8490171412999373362">"Nama host 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="8052095511862922213">"Nama inang yang Anda ketikkan tidak valid."</string>
+    <string name="proxy_error_dismiss" msgid="4993171795485460060">"Oke"</string>
+    <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Nama host yang Anda ketikkan tidak valid."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Daftar pengecualian yang Anda ketikkan tidak diformat dengan benar. Ketikkan daftar pengecualian domain 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_empty_port" msgid="5539106187558215246">"Anda perlu melengkapi bidang port."</string>
+    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Bidang port harus kosong jika bidang host kosong."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Port yang Anda ketik tidak valid."</string>
-    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP digunakan oleh peramban, namun tidak boleh digunakan oleh apl lain."</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP digunakan oleh browser, namun tidak boleh digunakan oleh apl 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>
@@ -211,7 +213,7 @@
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"Jenis jaringan:"</string>
     <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Setel jenis jaringan yang disukai:"</string>
     <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping IpAddr:"</string>
-    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping Nama Inang (www.google.com):"</string>
+    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping Nama Host (www.google.com):"</string>
     <string name="radio_info_http_client_test" msgid="5733604021077701555">"Tes Klien HTTP:"</string>
     <string name="ping_test_label" msgid="7255376471490860631">"Jalankan tes ping"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Setel"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Gagal"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Berhasil"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Perubahan aktif ketika kabel USB tersambung kembali"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Perubahan diberlakukan ketika kabel USB tersambung kembali."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Aktifkan penyimpanan massal USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total byte:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Penyimpanan USB tidak dipasang"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Tidak ada kartu SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Penyimpanan USB tidak dipasang."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Tidak ada kartu SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Byte tersedia:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Penyimpanan USB sedang digunakan sebagai perangkat penyimpanan massal"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Kartu SD sedang digunakan sebagai perangkat penyimpanan massal"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Sekarang penyimpanan USB aman dicopot"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Sekarang Anda dapat mencopot kartu SD dengan aman"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Penyimpanan USB sedang digunakan sebagai perangkat penyimpanan massal."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Kartu SD sedang digunakan sebagai perangkat penyimpanan massal."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Sekarang penyimpanan USB aman dicopot."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Sekarang Anda dapat mencopot kartu SD dengan aman."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Penyimpanan USB dicopot saat sedang digunakan!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Kartu SD dicabut ketika sedang digunakan!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Byte yang digunakan:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Memindai penyimpanan USB untuk media…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Pnympann USB dpsg sbg hny bca."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Kartu SD dipasang sebagai hanya baca."</string>
     <string name="skip_label" msgid="47510779345218297">"Lewati"</string>
     <string name="next_label" msgid="4693520878012668114">"Berikutnya"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Bahasa"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Sambungkan ke layanan data ketika roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Anda telah kehilangan konektivitas data karena Anda meninggalkan jaringan asal dalam keadaan roaming data dimatikan."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Hidupkan"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Izinkan roaming data? Anda mungkin dikenai tarif jelajah yang tinggi!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Perhatian"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Saat Anda mengizinkan roaming data, Anda dapat dikenai tagihan roaming yang tinggi!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Izinkan roaming data?"</string>
     <string name="networks" msgid="6333316876545927039">"Pilihan operator"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pilih operator jaringan"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tanggal &amp; waktu"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Setel waktu"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pilih zona waktu"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Setel tanggal"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Pilih format tanggal"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"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 menurut zona waktu"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tanggal"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Waktu"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Menyempurnakan pencocokan wajah"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Pemeriksaan keaktifan"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Perlu kedipan mata"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Anda dapat mengenkripsi akun, setelan, apl unduhan dan datanya, media, serta berkas Anda yang lain. Setelah mengenkripsi tablet, Anda harus memasukkan PIN angka atau sandi untuk mengurai enkripsi setiap 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 terhubung dengan sumber listrik hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Anda dapat mengenkripsi akun, setelan, apl unduhan dan datanya, media, serta berkas lain. Setelah mengenkripsi ponsel, Anda harus memasukkan sandi atau PIN angka untuk mengurai enkripsi setiap kali menghidupkannya: Anda tidak dapat membatalkan enkripsi ponsel 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 ponsel harus tetap terhubung dengan sumber listrik hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi tablet, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menyalakannya: Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikannya ke setelan pabrik yang akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan tablet dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi ponsel, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menghidupkannya: Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikan ke setelan pabrik dan akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan ponsel dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</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="2029407131227814893">"Isi daya baterai Anda dan coba lagi."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pasang pengisi daya Anda dan coba lagi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tidak ada PIN atau sandi pengunci layar"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Anda harus menyetel PIN atau sandi pengunci 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_dialog_need_password_message" msgid="4071395977297369642">"Anda perlu menyetel PIN atau sandi pengunci layar sebelum dapat memulai enkripsi."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Enkripsikan?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operasi enkripsi tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, dan selama itu tablet akan dimulai ulang beberapa kali."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operasi enkripsi tidak dapat dibatalkan dan jika Anda menghentikannya, data akan hilang. Enkripsi membutuhkan waktu satu jam atau lebih, dan selama 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="6689952371032099350">"Tunggu sampai tablet selesai dienkripsi. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"Ketikkan sandi Anda"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsi gagal"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan tablet, Anda harus mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan ponsel, Anda harus mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Pilih kunci layar"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Beralih metode masukan"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci layar"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih gembok cadangan"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Pola"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -358,48 +363,48 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ubah pola pembuka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ubah PIN pembuka kunci"</string>
     <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_password_too_short" msgid="7328975683669256660">"Sandi minimal %d karakter"</string>
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN minimal terdiri dari %d karakter"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Sandi harus kurang dari <xliff:g id="NUMBER">%d</xliff:g> karakter."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN harus kurang dari <xliff:g id="NUMBER">%d</xliff:g> digit."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN hanya boleh terdiri dari angka 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Administrator perangkat tidak mengizinkan penggunaan PIN terbaru."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Sandi mengandung karakter yang tidak sah."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Sandi paling tidak harus terdiri dari satu huruf."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Sandi paling tidak harus terdiri dari satu digit."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Sandi paling tidak harus terdiri dari 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>
+    <item quantity="one" msgid="3063853802158131458">"Sandi paling tidak harus terdiri dari 1 huruf."</item>
+    <item quantity="other" msgid="8186027808415585970">"Sandi paling tidak harus terdiri dari %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>
+    <item quantity="one" msgid="5583986519662091001">"Sandi paling tidak harus terdiri dari 1 huruf kecil."</item>
+    <item quantity="other" msgid="2693910942679679225">"Sandi paling tidak harus terdiri dari %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>
+    <item quantity="one" msgid="2611909966725502768">"Sandi paling tidak harus terdiri dari 1 huruf besar."</item>
+    <item quantity="other" msgid="3030801209112209245">"Sandi paling tidak harus terdiri dari %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>
+    <item quantity="one" msgid="3820355568839621231">"Sandi paling tidak harus terdiri dari 1 digit angka."</item>
+    <item quantity="other" msgid="4703982391407595924">"Sandi paling tidak harus terdiri dari %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>
+    <item quantity="one" msgid="8456579939292408631">"Sandi paling tidak harus terdiri dari 1 simbol khusus."</item>
+    <item quantity="other" msgid="1221290525051187757">"Sandi paling tidak harus terdiri dari %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>
+    <item quantity="one" msgid="4594051152085925921">"Sandi paling tidak harus terdiri dari 1 karakter bukan huruf."</item>
+    <item quantity="other" msgid="3952508584649046404">"Sandi paling tidak harus terdiri dari %d karakter bukan 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_password_recently_used" msgid="6098087796784262081">"Administrator perangkat tidak mengizinkan penggunaan sandi terbaru."</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"Oke"</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="lock_setup" msgid="1759001157415978959">"Penyiapan selesai"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Penyiapan selesai."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administrasi 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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Untuk menyandingkan dengan:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Ketik kode sandi perangkat yang diperlukan:"</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_enter_pin_other_device" msgid="4637977124526813470">"Anda mungkin juga perlu mengetikkan PIN ini ke perangkat lain."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Anda mungkin juga perlu mengetikkan 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="2796550001376088433">"Untuk menyandingkan dengan:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Ketikkan:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kemudian tekan Kembali atau Enter."</string>
@@ -425,11 +430,11 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Tidak dapat menyandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> karena PIN atau kode sandi salah."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Tidak dapat berkomunikasi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Tidak dapat tersambung 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_device_settings" msgid="907776049862799122">"Setelan 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>
@@ -444,7 +449,7 @@
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambungkan ke…"</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_opp" msgid="9168139293654233697">"Transfer file"</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>
@@ -459,17 +464,17 @@
     <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_device_advanced_enable_opp_title" msgid="8222550640371627365">"Izinkan transfer file 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_opp_profile_summary_connected" msgid="2611913495968309066">"Sambungkan ke server transfer file"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak tersambung kepada server transfer file"</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_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk transfer file"</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>
@@ -478,45 +483,62 @@
     <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="5237208142892767592">"Memungkinkan pertukaran data saat ponsel bersentuhan dengan perangkat lain"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Memungkinkan pertukaran data saat tablet bersentuhan dengan perangkat lain"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Memungkinkan pertukaran data saat ponsel bersentuhan dengan perangkat lain"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Siap mentransmisikan konten apl melalui NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Mati"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Tidak tersedia karena NFC dimatikan"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Jika fitur ini dihidupkan, Anda dapat memancarkan konten apl ke perangkat berkemampuan NFC lainnya dengan mendekatkan kedua perangkat. Contohnya, Anda dapat memancarkan laman Peramban, video YouTube, data kenalan Orang, dan lain-lain."\n\n"Cukup dekatkan kedua perangkat (biasanya saling membelakangi) lalu sentuh layar Anda. Apl ini akan menentukan apa yang dipancarkan."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Jika fitur ini dihidupkan, Anda dapat memancarkan konten apl ke perangkat berkemampuan NFC lainnya dengan mendekatkan kedua perangkat. Contohnya, Anda dapat memancarkan laman Browser, video YouTube, kontak Orang, dan lain-lain."\n\n"Cukup dekatkan kedua perangkat (biasanya saling membelakangi) lalu sentuh layar Anda. Apl ini akan menentukan apa yang dipancarkan."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Penemuan layanan jaringan"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Izinkan aplikasi di perangkat lain menemukan aplikasi di perangkat ini"</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">"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_setup_wizard_title" msgid="70277346338812325">"Pilih Wi-Fi"</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_error" msgid="3207971103917128179">"Kesalahan"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Dalam mode Pesawat"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"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 tersedia jaringan terbuka"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Hindari sambungan buruk"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Jangan gunakan jaringan Wi-Fi kecuali sambungan internetnya baik"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Hindari sambungan buruk"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Jangan gunakan jaringan Wi-Fi kecuali sambungan internetnya baik"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Terus nyalakan Wi-Fi selama dalam mode tidur"</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_wps_pbc" msgid="2668564692207863017">"Tombol Tekan WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entri Pin WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Langsung"</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_empty_list_wifi_on" msgid="3354911729026237372">"Menelusuri jaringan Wi-Fi..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Jaringan lain..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Lainnya"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Penyiapan otomatis (WPS)"</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="8242979682530043184">"Ketikkan PIN dari titik akses"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Penyiapan WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Ketikkan 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_wps_setup_title" msgid="6034518116333042484">"Penyiapan Wi-Fi yang Dilindungi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulai WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Tekan tombol Penyiapan Wi-FI yang Dilindungi di router Anda. Ini dapat disebut \"WPS\" atau berisi simbol ini:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi Anda. Penyiapan perlu hingga dua menit sampai selesai."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS berhasil. Menyambung ke jaringan..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS sedang berlangsung dan perlu hingga dua menit sampai selesai."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Gagal memulai WPS. Coba lagi setelah beberapa menit."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Pengaturan keamanan router nirkabel (TKIP) tidak didukung"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Pengaturan keamanan router nirkabel (TKIP) tidak didukung"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pengesahan gagal. Harap coba lagi."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Terdeteksi sesi WPS lainnya. Coba lagi setelah beberapa menit."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Nonaktif"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Koneksi internet buruk dihindari"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Jaringan ini dihindari karena koneksi buruk. Nonaktifkan perilaku ini dari layar Setelan &gt; Wi-Fi, item menu Lanjutan."</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_wps_available_first_item" msgid="3538912605343585226">"Jaringan yang terlindungi tersedia"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (jaringan yang dilindungi tersedia)"</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_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke jaringan"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Gagal melupakan jaringan"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Gagal menyimpan jaringan"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Batal"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Sesi Wi-Fi yang dilindungi 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>
@@ -568,34 +590,35 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Panjang awalan jaringan"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi langsung"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Siapkan sambungan antar-rekan"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Langsung"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informasi perangkat"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Penyiapan Wi-Fi yang dilindungi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Ketikkan 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_remove_group" msgid="4844634506540667517">"Hapus grup"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Lanjutan"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Perangkat yang tersedia"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Telusuri perangkat"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Menelusuri…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Ganti nama perangkat"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Perangkat P2P"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Tidak dapat menyambung."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Gagal mengubah nama perangkat."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Putuskan sambungan?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Jika diputuskan, sambungan Anda dengan <xliff:g id="PEER_NAME">%1$s</xliff:g> akan berakhir."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Jika diputuskan, sambungan Anda dengan <xliff:g id="PEER_NAME">%1$s</xliff:g> dan <xliff:g id="PEER_COUNT">%2$s</xliff:g> perangkat lain akan berakhir."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Batalkan undangan?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Apakah Anda ingin membatalkan undangan untuk tersambung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Konfigurasikan hotspot Wi-Fi"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kesalahan hotspot Wi-Fi portabel"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Siapkan 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="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Mode senyap"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering ponsel"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efek musik"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume dering"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar saat senyap"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Getar dan dering"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Pemberitahuan bawaan"</string>
+    <string name="notification_sound_title" msgid="312032901303146002">"Pemberitahuan default"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Kedipkan lampu pemberitahuan"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
@@ -610,10 +633,15 @@
     <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="volume_media_description" msgid="7949355934788807863">"Musik, video, permainan, &amp; media lainnya"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"Musik, video, game, &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="volume_ring_mute" msgid="3018992671608737202">"Bungkam nada dering &amp; pemberitahuan"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Bungkam musik &amp; media lain"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Bungkam pemberitahuan"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Bungkam alarm"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Bergetar saat berdering"</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>
@@ -623,14 +651,15 @@
     <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" product="tablet" msgid="9015625921245904495">"Anda harus menghubungkan tablet dengan dok sebelum menyiapkan audio dok."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Anda harus menghubungkan ponsel dengan dok sebelum menyiapkan audio dok."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Anda perlu menghubungkan tablet dengan dok sebelum menyiapkan audio dok."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Anda perlu menghubungkan ponsel dengan dok sebelum menyiapkan audio dok."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Suara pemasangan 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>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <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="7965901687241669598">"Tampilan"</string>
@@ -655,8 +684,8 @@
     <string name="screensaver_test" msgid="3048249263811694128">"Cobalah!"</string>
     <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Juga dimulai ketika dipasangkan pada dok"</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="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
+    <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukuran font"</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>
@@ -678,7 +707,7 @@
     <string name="sim_change_failed" msgid="304964924772218382">"Tidak dapat mengubah PIN."\n"PIN mungkin salah."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM berhasil diubah"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"Tidak bisa mengubah status kunci kartu SIM."\n"PIN Mungkin salah."</string>
-    <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
+    <string name="sim_enter_ok" msgid="6475946836899218919">"Oke"</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 ponsel"</string>
@@ -702,7 +731,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -760,10 +789,10 @@
     <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_mtp_summary" msgid="4617321473211391236">"Memungkinkan Anda mentransfer file media di Windows, atau menggunakan Transfer File 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="usb_ptp_summary" msgid="7673397474756664929">"Memungkinkan Anda mentransfer foto menggunakan perangkat lunak kamera, dan mentransfer file apa pun di komputer yang tidak mendukung MTP"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Pasang alat transfer file"</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>
@@ -802,9 +831,9 @@
     <string name="error_apn_empty" msgid="6056233831214537267">"APN wajib diisi."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Bidang MCC harus terdiri dari 3 digit."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Bidang MNC harus 2 atau 3 digit."</string>
-    <string name="restore_default_apn" msgid="8178010218751639581">"Memulihkan setelan APN bawaan."</string>
-    <string name="menu_restore" msgid="8260067415075573273">"Setel ulang ke bawaan"</string>
-    <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penyetelan ulang setelan APN bawaan selesai."</string>
+    <string name="restore_default_apn" msgid="8178010218751639581">"Memulihkan setelan APN default."</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Setel ulang ke default"</string>
+    <string name="restore_default_apn_completed" msgid="2824775307377604897">"Penyetelan ulang setelan APN default selesai."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Kembalikan ke setelan pabrik"</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>
@@ -823,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Hapus semua informasi pribadi dan apl unduhan Anda? Anda tidak dapat mengurungkan tindakan ini!"</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="2234954758550554549">"Anda harus membuat pola pembuka kunci untuk mengonfirmasi kembalikan ke setelan pabrik."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi kembalikan ke setelan pabrik."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Penyetelan ulang tidak dilakukan karena layanan System Clear tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setel ulang?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Hapus penyimpanan USB"</string>
@@ -834,12 +863,12 @@
     <string name="media_format_desc" product="default" msgid="8764037252319942415">"Hapus kartu SD? Anda akan kehilangan "<b>"semua"</b>" data dalam kartu!"</string>
     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Hapus penyimpanan USB"</string>
     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Hapus kartu SD"</string>
-    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Hapus penyimpanan USB beserta semua berkas yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
-    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Hapus kartu SD beserta semua berkas yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Hapus penyimpanan USB beserta semua file yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
+    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Hapus kartu SD beserta semua file yang tersimpan di sana? Anda tidak dapat mengurungkan tindakan ini!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Hapus semua"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Buat pola pembuka kunci Anda"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Anda harus membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus penyimpanan USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi bahwa Anda ingin menghapus penyimpanan USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Anda perlu 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="6688416425801386511">"Penambatan USB"</string>
@@ -853,7 +882,7 @@
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Tertambat"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"Tidak bisa 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="usb_tethering_errored_subtext" msgid="1377574819427841992">"Kesalahan 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>
@@ -870,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Jaringan seluler"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasiku"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Layanan lokasi Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Izinkan aplikasi menggunakan data dari sumber seperti jaringan Wi-Fi dan seluler untuk menentukan perkiraan lokasi Anda"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Izinkan data lokasi anonim dikirim ke Google. Izinkan apl memakai data dari jaringan seluler &amp; Wi-Fi untuk menentukan 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>
@@ -915,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tekan Menu untuk bantuan."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Angkat jari ketika selesai."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Sambungkan paling tidak <xliff:g id="NUMBER">%d</xliff:g> titik. Coba lagi:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Pola direkam!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Pola dicatat."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Buat pola lagi untuk mengonfirmasi:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Pola pembuka kunci baru Anda:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Konfirmasi"</string>
@@ -937,7 +966,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Berikutnya"</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="1075370160667458122">"Lindungi tablet Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Geser jari Anda untuk menghubungkan titik-titik dengan sembarang urutan di layar berikutnya. Anda harus menghubungkan setidaknya empat titik. "\n\n"Siap memulai? Sentuh Berikutnya."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Lindungi tablet Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Geser jari Anda untuk menghubungkan titik-titik secara acak di layar berikutnya. Anda perlu menghubungkan setidaknya empat titik. "\n\n"Siap memulai? Sentuh Berikutnya."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Lindungi ponsel Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Geser 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="7041951105633616745">"Kelola apl"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Mengelola dan menghapus apl terpasang"</string>
@@ -945,19 +974,20 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Kelola apl, siapkan pintasan peluncuran cepat"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Setelan apl"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sumber tidak dikenal"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Izinkan pemasangan apl selain Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Izinkan pemasangan aplikasi dari sumber yang tidak diketahui"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tablet dan data pribadi Anda lebih rentan terhadap serangan apl dari sumber yang tidak dikenal. Anda setuju untuk bertanggung jawab penuh atas segala kerusakan pada tablet atau kehilangan data yang mungkin diakibatkan oleh penggunaan apl ini."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ponsel dan data pribadi Anda lebih rentan terhadap serangan apl dari sumber yang tidak dikenal. Anda setuju untuk bertanggung jawab penuh atas segala kerusakan pada ponsel atau kehilangan data yang mungkin diakibatkan oleh penggunaan apl ini."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setelan lanjutan"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktifkan opsi setelan yang lain"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info apl"</string>
     <string name="storage_label" msgid="8700867073480107253">"Penyimpanan"</string>
-    <string name="auto_launch_label" msgid="3012617472833815382">"Luncurkan secara bawaan"</string>
+    <string name="auto_launch_label" msgid="3012617472833815382">"Luncurkan secara default"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Default"</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>
-    <string name="cache_size_label" msgid="7505481393108282913">"Tembolok"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Hapus cache"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
     <string name="controls_label" msgid="7611113077086853799">"Kontrol"</string>
     <string name="force_stop" msgid="7435006169872876756">"Paksa berhenti"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
@@ -971,9 +1001,10 @@
     <string name="enable_text" msgid="9217362512327828987">"Aktifkan"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Hapus data"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Copot pemasangan pembaruan"</string>
-    <string name="auto_launch_enable_text" msgid="2652825923953591251">"Anda telah memilih meluncurkan apl 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="auto_launch_enable_text" msgid="2652825923953591251">"Anda telah memilih meluncurkan apl ini secara default untuk beberapa tindakan."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Anda telah memilih untuk mengizinkan aplikasi ini untuk membuat widget dan mengakses data mereka."</string>
+    <string name="auto_launch_disable_text" msgid="7800385822185540166">"Tidak ada setelan default."</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Hapus default"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Apl ini mungkin tidak didesain untuk layar Anda. Anda dapat mengontrol cara menyesuaikannya dengan layar di sini."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Tanyakan saat diluncurkan"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Sesuaikan skala apl"</string>
@@ -982,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sortir menurut ukuran"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Tampilkn layanan berjalan"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Tampilkn proses pd tmbolok"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Setel ulang pref aplikasi"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setel ulang pref aplikasi?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tindakan ini akan menyetel ulang semua preferensi untuk:"\n\n" "<li>"Aplikasi yang dinonaktifkan"</li>\n" "<li>"Pemberitahuan aplikasi yang dinonaktifkan"</li>\n" "<li>"Aplikasi default untuk tindakan"</li>\n" "<li>"Batas data latar belakang untuk aplikasi"</li>\n\n" Anda tidak akan kehilangan data aplikasi apa pun."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Setel ulang aplikasi"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Kelola ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Pilih opsi filter"</string>
@@ -997,8 +1032,8 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Penyimpanan kartu SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Menghitung ulang ukuran..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Hapus data apl?"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"Semua data apl ini akan dihapus secara permanen, termasuk semua berkas, setelan, akun, basis data, dll."</string>
-    <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"Semua data apl ini akan dihapus secara permanen, termasuk semua file, setelan, akun, basis data, dll."</string>
+    <string name="dlg_ok" msgid="2402639055725653590">"Oke"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Batal"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"Apl tersebut tidak ditemukan di dalam daftar apl yang terpasang."</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Apl ini dapat mengakses hal berikut pada tablet Anda:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Apl 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="invalid_size_value" msgid="7563537715280712285">"Tidak dapat menghitung ukuran paket."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Anda tidak memiliki apl 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>
@@ -1032,12 +1067,14 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Ubah lokasi pemasangan yang diinginkan untuk apl baru."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Menonaktifkan apl yang tertanam?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jika Anda menonaktifkan apl yang tertanam, apl lain mungkin akan mengalami kesalahan fungsi."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Nonaktifkan pemberitahuan?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jika Anda mematikan pemberitahuan untuk aplikasi ini, Anda dapat melewatkan pembaruan dan lansiran penting."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan penyimpanan"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Lihat penyimpanan yang digunakan apl"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Layanan yang sedang berjalan"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Melihat dan mengontrol layanan yang sedang berjalan"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Memulai kembali"</string>
-    <string name="cached" msgid="1059590879740175019">"Proses latar belakang dalam tembolok"</string>
+    <string name="cached" msgid="1059590879740175019">"Proses latar belakang dalam cache"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Tidak ada yang berjalan."</string>
     <string name="service_started_by_app" msgid="818675099014723551">"Dimulai oleh apl."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
@@ -1084,19 +1121,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Metode masukan ini mungkin dapat mengumpulkan semua teks yang Anda ketik, termasuk data pribadi seperti sandi dan nomor kartu kredit. Metode ini berasal dari apl <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Gunakan metode masukan ini?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Pemeriksa ejaan ini mungkin dapat mengumpulkan semua teks yang Anda ketik, termasuk data pribadi seperti sandi dan nomor kartu kredit. Pemeriksa ejaan ini berasal dari apl <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Gunakan pemeriksa ejaan ini?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Setelan"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Bahasa"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Gagal membuka setelan untuk <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kecepatan penunjuk"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Pengendali Game"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Gunakan penggetar"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Alihkan penggetar ke pengendali game ketika tersambung."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Pilih tata letak keyboard"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Siapkan tata letak keyboard"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Untuk beralih, tekan Control-Spasi"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tata letak keyboard"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamus pribadi"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kamus pribadi"</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_add_screen_title" msgid="742580720124344291">"Frasa"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Opsi lainnya"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Sedikit opsi"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"Oke"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Kata:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Pintasan:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Bahasa:"</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="8165273379942105271">"Anda tidak memiliki satu kata pun dalam kamus pengguna. Tambahkan kata dengan menyentuh tombol Tambahkan (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Semua bahasa"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Untuk semua bahasa"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Bahasa lainnya..."</string>
     <string name="testing" msgid="6584352735303604146">"Menguji"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informasi tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informasi telepon"</string>
@@ -1108,13 +1164,13 @@
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"Telusuri + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Bersihkan"</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 dihapus."</string>
-    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
+    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Oke"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Batal"</string>
     <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apl"</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_method" msgid="5434026103176856164">"Metode masukan"</string>
-    <string name="current_input_method" msgid="234072873286056438">"Bawaan"</string>
+    <string name="current_input_method" msgid="234072873286056438">"Default"</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>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Menyetel opsi untuk pengembangan apl"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugging USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mode debug ketika USB tersambung"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID perangkat pengembangan"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Informasi perangkat tidak tersedia"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Tetap terjaga"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Layar tidak akan redup selama mengisi daya"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Izinkan melakukan debug USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Debugging USB dimaksudkan untuk tujuan pengembangan saja. Gunakan untuk menyalin data antara komputer dan perangkat Anda, memasang apl pada perangkat tanpa pemberitahuan, dan membaca data log."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Izinkan setelan pengembangan?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Setelan ini hanya dimaksudkan untuk penggunaan pengembangan. Setelan dapat menyebabkan perangkat dan aplikasi yang menerapkannya rusak atau tidak berfungsi semestinya."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Lindungi penyimpanan USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikasi harus meminta izin untuk membaca penyimpanan USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Lindungi penyimpanan USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jika penyimpanan USB dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal."\n\n"Beberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Lindungi kartu SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikasi harus meminta izin untuk membaca kartu SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Lindungi kartu SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jika kartu SD dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal."\n\n"Beberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pilih gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pilih widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Buat widget dan izinkan akses?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Setelah Anda membuat widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> dapat mengakses semua data yang ditampilkannya."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Selalu izinkan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> untuk membuat widget dan mengakses data mereka"</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>d"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>jam<xliff:g id="MINUTES">%2$d</xliff:g>men <xliff:g id="SECONDS">%3$d</xliff:g>det"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>menit <xliff:g id="SECONDS">%2$d</xliff:g> detik"</string>
@@ -1160,12 +1227,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Ucapkan sandi"</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="3264723681038625967">"Pasang skrip web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Meningkatkan aksesibilitas web"</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>
@@ -1176,18 +1240,16 @@
     <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> dapat mengumpulkan semua teks yang Anda ketik, kecuali sandi. Pengumpulan ini mencakup data pribadi seperti nomor kartu kredit. Layanan ini juga dapat mengumpulkan data tentang interaksi Anda dengan tablet."</string>
     <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> dapat mengumpulkan semua teks yang Anda ketik, kecuali sandi. Pengumpulan ini mencakup data pribadi seperti nomor kartu kredit. Layanan ini juga dapat mengumpulkan data tentang interaksi Anda dengan ponsel."</string>
     <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Menyentuh OK akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Menyentuh Oke akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tidak ada layanan terpasang"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Perlu pembaca layar?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan umpan balik lisan untuk membantu pengguna yang buta dan tidak terlalu baik penglihatannya. Apakah Anda ingin memasangnya secara gratis dari Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Pasang skrip web?"</string>
+    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan masukan lisan untuk membantu pengguna yang buta dan tidak terlalu baik penglihatannya. Apakah Anda ingin memasangnya secara gratis dari Android Market?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Apakah Anda ingin apl memasang skrip dari Google yang membuat konten webnya lebih mudah diakses?"</string>
-    <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="1072730037861494125">"Tidak tersedia uraian."</string>
+    <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia deskripsi."</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_not_available" msgid="3214000535532434353">"Data penggunaan baterai tidak tersedia."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1269,9 +1331,9 @@
     <string name="tts_settings" msgid="8186971894801348327">"Setelan text-to-speech"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"Keluaran 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="5916421806783703823">"Setelan bawaan di bawah menggantikan setelan apl"</string>
-    <string name="tts_default_settings_section" msgid="5787915620218907443">"Setelan bawaan"</string>
-    <string name="tts_default_synth_title" msgid="4755558388333117572">"Mesin bawaan"</string>
+    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setelan default di bawah menggantikan setelan apl"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Setelan default"</string>
+    <string name="tts_default_synth_title" msgid="4755558388333117572">"Mesin default"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"Atur mesin sintesa suara untuk digunakan pada teks lisan"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Laju bicara"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kecepatan teks diucapkan"</string>
@@ -1285,7 +1347,7 @@
     <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_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" msgid="3305141107104670703">"Mesin yang Anda pilih tidak dapat dijalankan."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurasikan"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pilih mesin lain"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Mesin sintesa suara ini mungkin dapat mengumpulkan semua teks yang akan diucapkan, termasuk di antaranya data pribadi seperti sandi dan nomor kartu kredit. Berasal dari <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> aplikasi. Gunakan metode masukan ini?"</string>
@@ -1301,7 +1363,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Wanita"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Aktifkan msin br sblm dgunakn."</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>
@@ -1318,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Gambar pola pembuka kunci Anda"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu menggambar pola pembuka kunci untuk mengonfirmasi instalasi kredensial."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ketik sandi untuk penyimpanan kredensial."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Sandi saat ini:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Penyimpanan kredensial dihapus."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Penyimpanan kredensial tidak dapat dihapus."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Penyimpanan kredensial diaktifkan."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Anda harus menyetel PIN atau sandi pengunci layar sebelum dapat menggunakan penyimpanan kredensial."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Anda perlu menyetel PIN atau sandi pengunci layar sebelum dapat menggunakan penyimpanan kredensial."</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="5446972770562918934">"Buat cadangan &amp; setel ulang"</string>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan otomatis"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Memulihkan cadangan setelan dan data ketika memasang ulang apl"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Sandi cadangan desktop"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Saat ini cadangan desktop penuh 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="local_backup_password_summary_none" msgid="393503434408227110">"Saat ini cadangan desktop penuh tidak dilindungi"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh guna mengubah atau menghapus sandi untuk cadangan lengkap desktop"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Hentikan mencadangkan sandi Wi-Fi, bookmark, setelan lainnya, dan data apl, serta menghapus semua salinan di server Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Setelan administrasi perangkat"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Administrator ini aktif dan mengizinkan apl <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_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="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Nada dering &amp; getar panggilan"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Menyambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1392,8 +1456,11 @@
     <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="accessibility_sync_error" msgid="8703299118794272041">"Kesalahan sinkronisasi."</string>
+    <string name="sync_failed" msgid="1696499856374109647">"Sinkronisasi gagal"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sinkronisasi aktif"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <string name="sync_is_failing" msgid="1591561768344128377">"Saat ini sinkronisasi mengalami masalah. Sinkronisasi akan segera berfungsi kembali."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Tambahkan akun"</string>
     <string name="background_data" msgid="5779592891375473817">"Data latar belakang"</string>
@@ -1403,7 +1470,11 @@
     <string name="sync_automatically" msgid="1682730255435062059">"Sinkronisasi otomatis data apl"</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="sync_error" msgid="5060969083117872149">"Kesalahan sinkronisasi"</string>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <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>
@@ -1412,8 +1483,8 @@
 %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="sync_contacts" msgid="9174914394377828043">"Kontak"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Selamat datang di Google sync!"</font>" "\n"Pendekatan Google untuk menyinkronkan data guna memungkinkan akses ke kontak, janji temu, dan lain-lain dari mana saja."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Setelan sinkronisasi apl"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; sinkronisasi"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Ubah sandi"</string>
@@ -1422,12 +1493,13 @@
     <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="8800653398717172460">"Hapus akun?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Menghapus akun ini akan menghapus semua pesan, data kenalan, dan data lain akun tersebut dari tablet!"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Menghapus akun ini akan menghapus semua pesan, data kenalan, dan data lainnya akun tersebut dari ponsel!"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Akun ini diperlukan oleh beberapa apl. Anda hanya dapat menghapusnya dengan menyetel ulang tablet ke bawaan pabrik (yang menghapus semua data pribadi Anda) di Setelan &gt; Cadangan &amp; setel ulang."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Akun ini diperlukan oleh beberapa apl. Anda hanya dapat menghapusnya dengan menyetel ulang ponsel ke bawaan pabrik (yang menghapus semua data pribadi Anda) dalam Setelan &gt; Cadangan &amp; setel ulang."</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Menghapus akun ini akan menghapus semua pesan, kontak, dan data lain akun tersebut dari tablet!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Menghapus akun ini akan menghapus semua pesan, kontak, dan data lainnya akun tersebut dari ponsel!"</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Akun ini diperlukan oleh beberapa apl. Anda hanya dapat menghapusnya dengan menyetel ulang tablet ke default pabrik (yang menghapus semua data pribadi Anda) di Setelan &gt; Cadangan &amp; setel ulang."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Akun ini diperlukan oleh beberapa apl. Anda hanya dapat menghapusnya dengan menyetel ulang ponsel ke default pabrik (yang menghapus semua data pribadi Anda) dalam Setelan &gt; Cadangan &amp; setel ulang."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Tidak dapat menyinkronkan secara manual"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Saat ini, sinkronisasi untuk item ini dinonaktifkan. Untuk mengubah setelan ini, aktifkan data latar belakang dan sinkronisasi otomatis untuk sementara."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Setelan 4G"</string>
@@ -1435,29 +1507,53 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ketik sandi untuk mendekripsi penyimpanan"</string>
     <string name="try_again" msgid="4272075051293936921">"Coba lagi."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Layanan sibuk. Coba lagi."</string>
     <string name="delete" msgid="4219243412325163003">"Hapus"</string>
-    <string name="misc_files" msgid="6720680815969643497">"Berkas Serbaneka"</string>
+    <string name="misc_files" msgid="6720680815969643497">"File 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="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Debugging"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Pilih apl debug"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Tidak ada aplikasi debug yang disetel"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplikasi debug: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Pilih aplikasi"</string>
+    <string name="no_application" msgid="2813387563129153880">"Tidak ada"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Tunggu debugger"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikasi yang di-debug menunggu debugger menempel sebelum berjalan"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Masukan"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Gambar"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Memantau"</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_touches_summary" msgid="6684407913145150041">"Tampilkan masukan visual untuk sentuhan"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Lihat pembaruan permukaan"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Sorot seluruh permukaan jendela saat diperbarui"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Tampilkan pembaruan tampilan GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Tampilan cepat dlm jendela saat digambar dgn GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Nonaktifkan lapisan HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Selalu gunakan GPU untuk pengomposisian layar"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Aktifkan jejak"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Pilih jejak yang diaktifkan"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Tidak ada jejak yang saat ini diaktifkan"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> jejak saat ini diaktifkan"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Semua jejak saat ini diaktifkan"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Tampilkan batas tata letak"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <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="force_hw_ui" msgid="6426383462520888732">"Paksa perenderan GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Gunakan akselerasi perangkat keras 2D dlm aplikasi"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Paksa penggunaan GPU untuk gambar 2d"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Penguraian GPU profil"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Ukur waktu penguraian di adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Skala durasi animator"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apl"</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>
@@ -1471,13 +1567,15 @@
     <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_menu_metered" msgid="5056695223222541863">"Hotspot seluler"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <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="8621855507876539282">"Tak ada apl yg menggunakan data dlm 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_disclaimer" product="tablet" msgid="2591250607795265503">"Dihitung oleh tablet Anda. Hitungan penggunaan data oleh operator dapat berbeda."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Dihitung oleh ponsel Anda. Hitungan penggunaan data oleh operator dapat berbeda."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"terbatas"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Nonaktifkan data seluler?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Tetapkan batas data seluler"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Tetapkan batas data 4G"</string>
@@ -1488,33 +1586,50 @@
     <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_list_mobile" msgid="5588685410495019866">"Seluler"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Lihat setelan apl"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Batasi data latar belakang"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Nonaktifkan data latar belakang pada jaringan data seluler saja. Wi-Fi akan digunakan jika tersedia."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Matikan data latar di jaringan seluler. Jika ada, pakai lainnya."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Untuk membatasi data latar belakang pada apl ini, setel batas data seluler terlebih dulu."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Batasi data latar belakang?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Fitur ini dapat menyebabkan sebuah apl yang bergantung pada data latar belakang berhenti bekerja ketika Wi-Fi tidak tersedia."\n\n"Anda dapat menemukan kontrol penggunaan data yang tepat dalam setelan yang tersedia dalam apl."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Fitur ini dapat menghentikan aplikasi yang bergantung pada data latar saat hanya ada jaringan seluler."\n\n"Anda dapat menemukan kontrol penggunaan data yang lebih sesuai dalam setelan yang tersedia dalam aplikasi."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Pembatasan data latar belakang hanya dimungkinkan bila Anda telah menyetel batas data seluler."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <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_warning_editor_title" msgid="3704136912240060339">"Setel peringatan penggunaan data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setel batas penggunaan data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Membatasi penggunaan data"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Sambungan data <xliff:g id="NETWORKS">%1$s</xliff:g> Anda akan dinonaktifkan bila telah mencapai batas yang ditentukan."\n\n"Karena penggunaan data dihitung oleh tablet, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan menggunakan batas konservatif."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Sambungan data <xliff:g id="NETWORKS">%1$s</xliff:g> Anda akan dinonaktifkan bila telah mencapai batas yang ditentukan."\n\n"Karena penggunaan data dihitung oleh ponsel, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan menggunakan batas konservatif."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sambungan data seluler Anda akan dinonaktifkan ketika mencapai batas yang ditentukan."\n\n"Karena penggunaan data dihitung oleh tablet Anda, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan untuk menggunakan batas yang konservatif."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sambungan data seluler Anda akan dinonaktifkan ketika mencapai batas yang ditentukan."\n\n"Karena penggunaan data dihitung oleh ponsel Anda, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan untuk menggunakan batas yang konservatif."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Batasi data latar belakang?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jika Anda membatasi data latar belakang seluler, beberapa apl dan layanan tidak akan berfungsi kecuali jika Anda terhubung ke jaringan Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> digunakan"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan menurut tablet. Hitungan data operator dapat berbeda."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan menurut ponsel. Hitungan data operator dapat berbeda."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Hotspot seluler"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Pilih jaringan Wi-Fi yang hotspot seluler. Aplikasi dapat dibatasi dari menggunakan jaringan ini ketika berada di latar belakang. Aplikasi juga dapat memperingatkan sebelum menggunakan jaringan ini untuk unduhan yang besar."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Jaringan seluler"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Jaringan Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Untuk memilih hotspot seluler, nyalakan Wi-Fi."</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>
@@ -1540,12 +1655,14 @@
     <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_edit" msgid="8647191407179996943">"Mengedit profil VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Menyambung ke <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Menambahkan profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Edit profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Hapus profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Tidak ada sambungan jaringan. Coba lagi nanti."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Sertifikat hilang. Silakan edit profil."</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>
@@ -1554,30 +1671,30 @@
     <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">"Lewati tutorial"</string>
-    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Pelajaran 1: Menjelajahi layar"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Setelah mengaktifkan Jelajahi dengan Sentuhan, Anda dapat menyentuh layar untuk mempelajari apa yang ada di bawah jari Anda. Misalnya, layar aktif yang berisi ikon apl. Cari salah satu ikon 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="3973201880357468747">"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="8764686624055084454">"Untuk menggulir daftar, Anda dapat menggeser dua jari di sepanjang layar. Misalnya, layar aktif saat ini berisi daftar nama apl 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="3055831259260848004">"Anda telah menyelesaikan tutorial. Untuk keluar, cari dan sentuh tombol <xliff:g id="FINISH">%s</xliff:g>."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Perbaikan ejaan"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Pemeriksa ejaan"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Ketikkan sandi cadangan penuh saat ini di sini"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Ketik sandi baru untuk cadangan penuh di sini"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Ketik ulang sandi baru cadangan penuh Anda 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>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Pemutakhiran sistem tambahan"</string>
+    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Pembaruan sistem tambahan"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Batasan &amp; pengguna"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Pengguna"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Tambahkan pengguna"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Edit detail"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Informasi pengguna"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nama"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Batasan konten"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Perlu PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Nilai konten"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplikasi sistem"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplikasi terpasang"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Buang"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Hapus pengguna"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Hapus pengguna"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Yakin ingin menghapus pengguna dan semua data yang terkait dari perangkat?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Tampilkan pemberitahuan"</string>
+    <string name="help_label" msgid="1107174367904110532">"Bantuan"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index c2d2752..e66963f 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Disconnessione..."</item>
     <item msgid="1634960474403853625">"Disconnessa"</item>
     <item msgid="746097431216080650">"Operazione non riuscita"</item>
+    <item msgid="6367044185730295334">"Bloccato"</item>
+    <item msgid="503942654197908005">"Al momento vengono evitate connessioni deboli"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Disconnessione da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"Disconnessa"</item>
     <item msgid="8578370891960825148">"Operazione non riuscita"</item>
+    <item msgid="5660739516542454527">"Bloccato"</item>
+    <item msgid="1805837518286731242">"Al momento vengono evitate connessioni deboli"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pulsante di comando"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nessuna"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN dal punto di accesso"</item>
-    <item msgid="7364462169350112617">"PIN da dispositivo"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statico"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Scheda SD rimovibile"</item>
     <item msgid="4498124044785815005">"Impostazione di sistema"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Disattivato"</item>
-    <item msgid="4804571292609523335">"Vibrazione"</item>
-    <item msgid="595707141547423573">"Disattiva audio"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Breve"</item>
     <item msgid="2560532955514699713">"Media"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Scala animazione 5x"</item>
     <item msgid="6660750935954853365">"Scala animazione 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animazione disattivata"</item>
+    <item msgid="1138649021950863198">"Scala animazione 0,5x"</item>
+    <item msgid="4394388961370833040">"Scala animazione 1x"</item>
+    <item msgid="8125427921655194973">"Scala animazione 1,5x"</item>
+    <item msgid="3334024790739189573">"Scala animazione 2x"</item>
+    <item msgid="3170120558236848008">"Scala animazione 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d83185c..df7e811 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Sì"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
+    <string name="create" msgid="3578857613172647409">"Crea"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedisci l\'uso del compositore Bluetooth quando lo schermo è bloccato"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivi Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nome dispositivo"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Impostazioni dispositivo"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Impostazioni profilo"</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_rename_device" product="tablet" msgid="787970073150631155">"Rinomina tablet"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Accoppiamento..."</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="5655704645616731277">"Tocca per accoppiam."</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nessun dispositivo Bluetooth in 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="1931617700075106801">"Tocca per l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Tocca per l\'accoppiamento con <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="device_picker" msgid="8398232791303186677">"Selettore dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Richiesta autorizzazione Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Un\'applicazione vuole attivare il Bluetooth. Consentire?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Un\'applicazione sul tablet vuole rendere il tablet rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Consentire?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%1$s desidera 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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Il nome host specificato non è valido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"L\'elenco di esclusioni digitato non è nel formato corretto. Digita 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_port" msgid="5539106187558215246">"Devi inserire 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="2671425042711054494">"La porta specificata non è valida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Il proxy HTTP viene utilizzato dal browser ma potrebbe non essere utilizzato da altre applicazioni."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Imposta"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Non riuscita"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Riuscita"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Le modifiche saranno effettive alla riconnessione del cavo USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Le modifiche verranno applicate quando verrà ricollegato il cavo USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Attiva archivio di massa USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Byte totali:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Archivio USB non montato"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nessuna scheda SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Archivio USB non montato."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Nessuna scheda SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Byte disponibili:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Archivio USB usato come disp. di archiviaz. di massa"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Scheda SD in uso come dispositivo di archiviazione di massa"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Puoi rimuovere l\'archivio USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"È ora possibile rimuovere la scheda SD"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Archivio USB usato come disp. archiviaz. massa"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Scheda SD in uso come dispositivo di archiviazione di massa."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Puoi rimuovere l\'archivio USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"È ora possibile rimuovere la scheda SD."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Archivio USB rimosso quando ancora in uso."</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La scheda SD è stata rimossa quando ancora in uso."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Byte utilizzati:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Ricerca di media in archivio USB…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Archivio USB montato: lettura."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Lingua"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Connessione a servizi di dati in roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Connettività dati persa: hai lasciato la rete del tuo operatore con il roaming dati disattivato."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Attiva"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Consentire il roaming dati? I costi potrebbero essere elevati."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Attenzione"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Se consenti il roaming dei dati i costi potrebbero essere elevati."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Consentire il roaming dei dati?"</string>
     <string name="networks" msgid="6333316876545927039">"Selezione operatore"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Scegli un operatore di rete"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e ora"</string>
@@ -283,18 +285,20 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Imposta ora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleziona fuso orario"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Imposta data"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Seleziona formato data"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Scegli il formato della 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="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Migliora riconoscimento viso"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Controllo vitalità"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Richiedi battito di ciglia"</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="4608681417960923911">"Digita testo da visualizzare in schermo blocco"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Digita testo da visualizzare su blocco schermo"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"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="3504519024884099702">"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_desc" product="tablet" msgid="3839235202103924154">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il tablet, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il tablet se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati."\n\n"La crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il tablet collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il telefono se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati."\n\n"La crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al completamento della crittografia. Se interrompi la procedura, 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="2029407131227814893">"Carica la batteria e riprova."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"Devi impostare un PIN o una password di blocco dello schermo per poter iniziare la crittografia."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Crittografare?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"L\'operazione di crittografia 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="5682944380460921880">"L\'operazione di crittografia 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="6689952371032099350">"Attendi il termine della crittografia del tablet. <xliff:g id="PERCENT">^1</xliff:g>% completato."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Attendi il termine della crittografia del telefono. <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="2223340178473871064">"Digita la password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Crittografia non riuscita"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. "\n\n"Per riprendere a utilizzare il tablet devi effettuare il ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. "\n\n"Per riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Blocco schermo"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. "\n\n"Per riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. "\n\n"Per riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambia metodo di immissione"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Scegli blocco schermo"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Scegli blocco di backup"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Sblocco col sorriso"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Sequenza"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN deve essere lungo almeno %d caratteri"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La password deve contenere meno di <xliff:g id="NUMBER">%d</xliff:g> caratteri."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Il codice PIN deve contenere meno di <xliff:g id="NUMBER">%d</xliff:g> cifre."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Il PIN deve contenere solo cifre da 0 a 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"L\'amministratore del dispositivo non consente l\'utilizzo di un PIN recente."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"La password contiene un carattere non valido."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"La password deve contenere almeno una lettera."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"La password deve contenere almeno una cifra."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"La password deve contenere almeno una lettera."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"La password deve contenere almeno una lettera minuscola."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"La password deve contenere almeno una lettera maiuscola."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"La password deve contenere almeno una cifra numerica."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"La password deve contenere almeno un simbolo speciale."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"La password deve contenere almeno un carattere non costituito da una lettera."</item>
+    <item quantity="other" msgid="3952508584649046404">"La password deve contenere 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_password_recently_used" msgid="6098087796784262081">"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="lock_setup" msgid="1759001157415978959">"Configurazione completata"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Impostazione completata."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Amministrazione 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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Per eseguire l\'accoppiamento con <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, digita 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_enter_pin_other_device" msgid="4637977124526813470">"Potrebbe inoltre essere necessario digitare questo PIN sull\'altro dispositivo."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Potrebbe inoltre essere necessario digitare 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="2796550001376088433">"Per eseguire l\'accoppiamento con <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, digita sul dispositivo <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, quindi premi A capo o Invio."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Impossibile eseguire l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. La passkey o il PIN è errato."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Impossibile comunicare con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Impossibile collegarsi 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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Consenti lo scambio di dati quando il telefono tocca un altro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Consenti lo scambio di dati quando il tablet tocca un altro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Consenti lo scambio di dati quando il telefono tocca un altro dispositivo"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Pronto a trasmettere i contenuti dell\'applicazione tramite NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Non attivo"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Non disponibile perché la tecnologia NFC non è attiva"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Quando questa funzione è attiva, puoi trasferire contenuti di applicazioni su un altro dispositivo che supporta la tecnologia NFC tenendo vicini i due dispositivi. Puoi trasferire, ad esempio, pagine dell\'applicazione Browser, video di YouTube, contatti di Persone e altri dati."\n\n"È sufficiente avvicinare i dispositivi (generalmente mettendo a contatto le due parti posteriori), quindi toccare lo schermo. L\'applicazione stabilisce i dati da trasferire."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Rilevamento servizi di rete"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Consenti alle applicazioni su altri dispositivi di scoprire applicazioni su questo dispositivo"</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="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_setup_wizard_title" msgid="70277346338812325">"Seleziona Wi-Fi"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"Attivazione Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="244864762599017659">"Disattivazione Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Errore"</string>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Impossibile cercare reti"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notifica rete"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Avvisa quando è disponibile una rete aperta"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Evita connessioni deboli"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Non utilizzare una rete Wi-Fi a meno che non abbia una buona connessione a Internet"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evita connessioni deboli"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Non utilizzare una rete Wi-Fi a meno che non abbia una buona connessione a Internet"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Mantieni Wi-Fi durante sospensione"</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_wps_pbc" msgid="2668564692207863017">"Pulsante di comando WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Inserimento PIN WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Ricerca reti Wi-Fi in corso…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Altra rete…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Altro"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Configurazione auto (WPS)"</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="8242979682530043184">"Digita il PIN del punto di accesso"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Impostazione WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Digita 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_wps_setup_title" msgid="6034518116333042484">"Impostazione protetta Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Avvvio WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Premi il pulsante Wi-Fi Protected Setup del router. Il pulsante potrebbe essere denominato \"WPS\" o contenere questo simbolo:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Inserisci il PIN <xliff:g id="NUMBER">%1$s</xliff:g> sul router Wi-Fi. Il completamento della configurazione può richiedere fino a due minuti."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Configurazione WPS riuscita. Connessione alla rete..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Connesso alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configurazione WPS è già in corso e il completamento può richiedere fino a due minuti"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Configurazione WPS non riuscita. Riprova tra qualche minuto."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"L\'impostazione di sicurezza del router wireless (WEP) non è supportata"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"L\'impostazione di sicurezza del router wireless (TKIP) non è supportata"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Errore di autenticazione. Riprova."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"È stata rilevata un\'altra sessione WPS. Riprova tra qualche minuto."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Salvata"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disattivate"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Connessione Internet debole evitata"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"La rete è stata ignorata a causa della connessione scarsa. Disattiva questo comportamento dalla schermata Impostazioni &gt; Wi-Fi, voce di menu Avanzate."</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_wps_available_first_item" msgid="3538912605343585226">"Rete protetta disponibile"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (rete protetta disponibile)"</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_failed_connect_message" msgid="8491902558970292871">"Impossibile connettersi alla rete"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elimina"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Impossibile eliminare la rete"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salva"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Impossibile salvare la rete"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annulla"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Rilevata un\'altra sessione protetta Wi-Fi. 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lunghezza prefisso rete"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Imposta connettività peer-to-peer"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informazioni dispositivo"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Impostazione protetta Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Digita 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_remove_group" msgid="4844634506540667517">"Rimuovi gruppo"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avanzate"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Dispositivi disponibili"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Cerca dispositivi"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Ricerca…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Rinomina dispositivo"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Dispositivi peer"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Impossibile connettersi."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Impossibile rinominare il dispositivo."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Disconnettere?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Se ti disconnetti verrà terminata la connessione con <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Se ti disconnetti verrà terminata la connessione con <xliff:g id="PEER_NAME">%1$s</xliff:g> e altri <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispositivi."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annullare l\'invito?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vuoi annullare l\'invito a connettersi con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Configura hotspot Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"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="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Modalità silenziosa"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Suoneria telefono"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumi"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Effetti musicali"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume suoneria"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra in modalità silenziosa"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrazione e suoneria"</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="incoming_call_volume_title" msgid="8073714801365904099">"Suoneria"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Disattiva audio suoneria e notifiche"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Disattiva audio musica e altri contenuti multimediali"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Disattiva audio notifiche"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Disattiva audio allarmi"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrazione quando squilla"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Devi inserire il tablet nel dock per poter configurare l\'audio del dock."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Devi inserire il telefono nel dock per poter configurare l\'audio del dock."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Devi inserire il tablet nel dock per poter configurare l\'audio del dock."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Devi inserire il telefono nel dock per poter configurare l\'audio del dock."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Suono inserimento nel 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 sincronizzazione"</string>
+    <string name="account_settings" msgid="6403589284618783461">"Google 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="7965901687241669598">"Display"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Il mio numero di telefono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Versione PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Cancellare tutti i dati personali e le applicazioni scaricate? Questa azione è irreversibile."</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="2234954758550554549">"Per confermare un ripristino dati di fabbrica occorre inserire la sequenza di sblocco."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Per confermare un ripristino dati di fabbrica occorre inserire la sequenza di sblocco."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nessun ripristino eseguito perché il servizio System Clear non è disponibile."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Reimpostare?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Cancella archivio USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Cancellare la scheda SD, eliminando tutti i file memorizzati al suo interno? Questa azione è irreversibile."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Cancella tutto"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Inserisci la sequenza di sblocco"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare l\'archivio USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Devi inserire la sequenza di sblocco per confermare che desideri cancellare l\'archivio USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"Tethering USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Reti mobili"</string>
     <string name="location_title" msgid="1029961368397484576">"La mia posizione"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Servizio localizzazione Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Consenti alle applicazioni di utilizzare dati di fonti come reti Wi-Fi/mobili per determinare la tua posizione approssimativa"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Consenti invio a Google di dati anonimi e consenti alle applicazioni autorizzate di usare dati da fonti come reti Wi-Fi e 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premi Menu per visualizzare la guida."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Allontana il dito al termine."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Collega almeno <xliff:g id="NUMBER">%d</xliff:g> punti. Riprova:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Sequenza registrata."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Sequenza registrata."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Inserisci di nuovo la sequenza per confermare:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Nuova sequenza di sblocco:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Conferma"</string>
@@ -925,9 +953,9 @@
     <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="2615606088906120711">"Imposta sequenza come visibile"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Rendi visibile la sequenza"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibra alla pressione"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Blocco istant. puls. accens."</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Blocco con pulsante accens."</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>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Avanti"</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="1075370160667458122">"Proteggi il tuo tablet dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. Fai scorrere il dito per collegare i pallini in qualsiasi ordine nella schermata successiva. Devi collegare almeno quattro pallini. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteggi il tuo tablet dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. Fai scorrere il dito per collegare i pallini in qualsiasi ordine nella schermata successiva. Devi collegare almeno quattro pallini. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteggi il tuo telefono dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. Fai scorrere il dito per collegare almeno quattro pallini in qualsiasi ordine nella schermata successiva. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestisci e rimuovi applicazioni installate"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gestisci le applicazioni, imposta le scorciatoie di avvio rapido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Impostazioni applicazioni"</string>
     <string name="install_applications" msgid="4872012136210802181">"Origini sconosciute"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Consenti l\'installazione di applicazioni non presenti in Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Consenti l\'installazione di applicazioni da fonti sconosciute"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"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 di dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"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 di dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Impostazioni avanzate"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Informazioni applicazione"</string>
     <string name="storage_label" msgid="8700867073480107253">"Archiviazione"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Avvia per impostazione predefinita"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Impostazioni predefinite"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Cancella dati"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Disinstalla aggiornamenti"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Hai scelto di avviare questa applicazione per impostazione predefinita per alcune azioni."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Hai scelto di consentire a questa applicazione di creare widget e di accedere ai relativi dati."</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="1616155457673106022">"Questa applicazione potrebbe non essere stata ideata per il tuo schermo. Puoi stabilire come adattarla al tuo schermo qui."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordina per dimensioni"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostra servizi in esecuzione"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processi nella cache"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Reimposta preferenze app"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reimpostare preferenze app?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"L\'operazione consentirà di reimpostare tutte le preferenze per:"\n\n" "<li>"Applicazioni disattivate"</li>\n" "<li>"Notifiche di applicazioni disattivate"</li>\n" "<li>"Applicazioni predefinite per azioni"</li>\n" "<li>"Limitazioni sui dati in background per le applicazioni"</li>\n\n" I dati delle applicazioni non andranno persi."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Reimposta applicazioni"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestisci spazio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtra"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Scegli opzioni di filtro"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Contenuti a cui può accedere l\'applicazione sul tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"Impossibile calcolare le dimensioni del pacchetto."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1030,8 +1064,10 @@
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"Impossibile spostare l\'applicazione. <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="5155453752692959098">"Cambia il percorso preferito per l\'installazione di nuove applicazioni"</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disattivare applic. integrata?"</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disattivare app integrata?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Se disattivi un\'applicazione integrata, le altre applicazioni potrebbero funzionare in modo anomalo."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Disattivare le notifiche?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se disattivi le notifiche per questa applicazione potresti perdere avvisi e aggiornamenti importanti."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizzo memoria"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Visualizza la memoria utilizzata dalle applicazioni"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servizi in esecuzione"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Questo metodo di immissione 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 immissione?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Questa funzione di controllo ortografico 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="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizzare questa funzione di controllo ortografico?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Impostazioni"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Lingua"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Impossibile aprire le impostazioni di <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocità del puntatore"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Controller di gioco"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Utilizzo della vibrazione"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Reindirizza la vibrazione al controller di gioco quando sei collegato."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Scegli layout tastiera"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configura layout tastiera"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Cambia premendo Ctrl-Barra spaziatr."</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predefinita"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Layout tastiera"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dizionario utente"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dizionario personale"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dizionari personali"</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_add_screen_title" msgid="742580720124344291">"Frase"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Altre opzioni"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Meno opzioni"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Parola:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Scorciatoia:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Lingua:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Per tutte le lingue"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Altre lingue..."</string>
     <string name="testing" msgid="6584352735303604146">"Verifica..."</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>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Sviluppo ID dispositivo"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Informazioni sul dispositivo non disponibili"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Rimani attivo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Lo schermo non va mai in stand-by se sotto carica"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Consentire debug USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Il debug USB è solo a scopo di sviluppo. Utilizzalo per copiare dati tra il computer e il dispositivo, per installare applicazioni sul tuo dispositivo senza notifica e per leggere i dati dei log."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Consentire impostazioni di sviluppo?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Queste impostazioni sono utilizzabili solo a scopo di sviluppo. Possono causare l\'arresto o il comportamento anomalo del dispositivo e delle applicazioni su di esso."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteggi archivio USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Le app devono richiedere l\'autorizzazione per leggere l\'archivio USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Proteggere l\'archivio USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando l\'archivio USB è protetto, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna."\n\n"Alcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteggi scheda SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Le app devono richiedere l\'autorizzazione per leggere la scheda SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteggere la scheda SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando la scheda SD è protetta, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna."\n\n"Alcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Scegli gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Scegli widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creare il widget e consentire l\'accesso?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Dopo che avrai creato il widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> potrà accedere a tutti i relativi dati."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Consenti sempre a <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> di creare widget e accedere ai relativi dati"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> g <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>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Pronuncia le password"</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"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Installa script web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Migliora l\'accessibilità web"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nessun servizio installato"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Hai bisogno di uno screen reader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fornisce commenti vocali per utenti non vedenti o con problemi di vista. Vuoi installare gratuitamente l\'applicazione da Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Installare gli script web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vuoi che le applicazioni installino script di Google per rendere più accessibili i relativi contenuti web?"</string>
-    <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="1072730037861494125">"Nessuna descrizione fornita."</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_not_available" msgid="3214000535532434353">"Dati uso batteria non disp."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1228,7 +1289,7 @@
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dati ricevuti"</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">"Tempo attivazione"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Tempo in attività"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tempo trascorso senza segnale"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Termina"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informazioni applicazione"</string>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"Impossibile eseguire il motore scelto."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configura"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Scegli un altro motore"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Questo motore di sintesi vocale potrebbe essere in grado di raccogliere tutto il testo pronunciato, inclusi dati personali come password e numeri di carte di credito. Deriva dal motore <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Abilitare l\'uso di questo motore di sintesi vocale?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Femminile"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Inserisci la sequenza di sblocco"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Per confermare l\'installazione delle credenziali devi inserire la sequenza di sblocco."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digita la password per l\'archivio credenziali."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Password attuale:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Archivio credenziali cancellato"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Impossibile cancellare archivio credenz."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'archivio di credenziali è attivo."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Devi impostare un PIN o una password di blocco dello schermo per poter utilizzare l\'archivio credenziali."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Devi impostare un PIN o una password di blocco dello schermo per poter utilizzare l\'archivio credenziali."</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="5446972770562918934">"Backup e ripristino"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Ripristino automatico"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In caso di reinstallazione di un\'applicazione, ripristina impostazioni e 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="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"I backup desktop completi non sono attualmente protetti."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocca per modificare o rimuovere la password per i backup desktop completi"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Interrompere il backup delle password Wi-Fi, dei segnalibri, di altre impostazioni e dei dati delle applicazioni, oltre a cancellare tutte le copie sui server di Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Impostazioni di amministrazione dispositivo"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Sistema"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Suoneria e vibrazione chiamata"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Connessione alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Sincronizzazione non riuscita"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sincronizzazione attiva"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Sincronizzazione"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"La sincronizzazione presenta dei problemi. Riprenderà a breve."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Aggiungi account"</string>
     <string name="background_data" msgid="5779592891375473817">"Dati in background"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronizzazione attiva"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"La sincronizzazione non è attiva"</string>
     <string name="sync_error" msgid="5060969083117872149">"Errore sincronizz."</string>
+    <string name="last_synced" msgid="4242919465367022234">"Ultima sincronizzazione: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Sincronizzazione ora…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><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="6205903695598000286">"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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Questo account è richiesto da alcune applicazioni. Puoi rimuoverlo solo ripristinando le impostazioni predefinite di fabbrica del tablet (questa operazione elimina tutti i dati personali) in Impostazioni &gt; Backup e ripristino."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Questo account è richiesto da alcune applicazioni. Puoi rimuoverlo solo ripristinando le impostazioni predefinite di fabbrica del telefono (questa operazione elimina tutti i dati personali) in Impostazioni &gt; Backup e ripristino."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Impossibile sincronizzare manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Al momento la sincronizzazione di questo elemento non è attiva. Per modificare questa impostazione, attiva temporaneamente i dati in background e la sincronizzazione automatica."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Impostazioni 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Indirizzo MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Digita la password per decrittografare l\'archivio"</string>
     <string name="try_again" msgid="4272075051293936921">"Riprova."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Il servizio è occupato. Riprova."</string>
     <string name="delete" msgid="4219243412325163003">"Elimina"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"Seleziona tutti"</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="debug_debugging_category" msgid="6781250159513471316">"Debug"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Seleziona l\'applicazione per il debug"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nessuna applicazione impostata per il debug"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Debug dell\'applicazione: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Seleziona applicazione"</string>
+    <string name="no_application" msgid="2813387563129153880">"Nessuna"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Attendi debugger"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"L\'app. in debug attende il debugger prima dell\'esecuzione"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Disegno"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitoraggio"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Attiva StrictMode"</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 feedback visivi per i tocchi"</string>
-    <string name="show_screen_updates" msgid="8282711794220426931">"Aggiornamenti schermo"</string>
-    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Fai lampeggiare le aree dello schermo quando si aggiornano"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Mostra agg. superficie"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash delle superfici delle finestre all\'aggiornam."</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Mostra agg. visualizz. GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash delle visual. in finestre se disegnate con GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Disabilita overlay HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per la composizione dello schermo"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Abilita tracce"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Seleziona tracce abilitate"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Nessuna traccia attualmente abilitata"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> tracce attualmente abilitate"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Tutte le tracce attualmente abilitate"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Mostra limiti di layout"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Mostra limiti, margini dei clip e così via"</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="force_hw_ui" msgid="6426383462520888732">"Forza rendering GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Usa accelerazione hardware 2D nelle applicazioni"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forza l\'uso della GPU per i disegni 2D"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Traccia prof. render. GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Misura tempi rendering in adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Scala durata animatore"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Hotspot mobili"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizzazione automatica dei dati"</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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Misurato dal tablet. L\'utilizzo dei dati segnalato dall\'operatore potrebbe variare."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Misurato dal telefono. L\'utilizzo dati segnalato dall\'operatore potrebbe variare."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"limitato"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Disattivare i dati mobili?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Imposta limite dati mobili"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Imposta limite dati 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobile"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"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="6236080762898226645">"Disattiva dati in background solo su rete dati mobili. Se disponibile, verrà usata rete Wi-Fi."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Disattiva dati in background su reti mobili. Reti non mobili usate se disponibili."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Per limitare i dati in background, imposta un limite dati mobili."</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="5651588785118290771">"Quando non è disponibile la rete Wi-Fi, questa funzione potrebbe causare l\'interruzione del funzionamento di un\'applicazione che dipende dai dati in background."\n\n"Puoi trovare controlli più adeguati dell\'utilizzo dei dati nelle impostazioni disponibili all\'interno dell\'applicazione."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Questa funzione può causare l\'interruzione del funzionamento di un\'applicazione che dipende dai dati in background quando sono disponibili solo le reti mobili."\n\n"Puoi trovare controlli di utilizzo dei dati più appropriati nelle impostazioni disponibili all\'interno dell\'applicazione."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"La limitazione dei dati in background è possibile solo se hai impostato un limite per i dati mobili."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Attivare sincr. autom. dati?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul tablet."\n\n"Alcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul tablet. Gli account Google funzionano in questo modo."\n\n"Per scegliere quali tipi di informazioni sincronizzare all\'interno di ogni account, vai a Impostazioni &gt; Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul telefono."\n\n"Alcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul telefono. Gli account Google funzionano in questo modo."\n\n"Per scegliere quali tipi di informazioni sincronizzare all\'interno di ogni account, vai a Impostazioni &gt; Account."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Disattivare sincr. autom. dati?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"In questo modo limiterai l\'utilizzo di dati e della batteria, ma dovrai sincronizzare ciascun account manualmente per raccogliere le informazioni recenti. Inoltre non riceverai notifiche quando si verificano gli aggiornamenti."</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_warning_editor_title" msgid="3704136912240060339">"Imposta avviso sull\'utilizzo dei dati"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Imposta limite di utilizzo dati"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitazione utilizzo dati"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"La tua connessione dati <xliff:g id="NETWORKS">%1$s</xliff:g> verrà disattivata al raggiungimento del limite specificato."\n\n"Dato che l\'utilizzo dei dati è misurato dal tuo tablet e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"La tua connessione dati <xliff:g id="NETWORKS">%1$s</xliff:g> verrà disattivata al raggiungimento del limite specificato."\n\n"Dato che l\'utilizzo dei dati è misurato dal tuo telefono e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"La tua connessione dati mobili verrà disattivata al raggiungimento del limite specificato."\n\n"Dato che l\'utilizzo dei dati è misurato dal tuo tablet e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"La tua connessione dati mobili verrà disattivata al raggiungimento del limite specificato."\n\n"Dato che l\'utilizzo dei dati è misurato dal tuo telefono e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Limitare i dati in background?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Se limiti i dati mobili in background, alcuni servizi e applicazioni potrebbero non funzionare senza connessione a una rete Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: circa <xliff:g id="TOTAL">%1$s</xliff:g> utilizzati"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: utilizzati circa <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: utilizzati quasi <xliff:g id="TOTAL">%1$s</xliff:g>, misurati dal tablet. I dati possono differire da quelli dell\'operatore."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: utilizzati quasi <xliff:g id="TOTAL">%1$s</xliff:g>, misurati dal tel. I dati possono differire da quelli dell\'operatore."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Hotspot mobili"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Seleziona le reti Wi-Fi che che sono hotspot mobili. Alle applicazioni può essere impedito l\'uso di queste reti quando in background. Le applicazioni potrebbero inoltre avvisarti prima che utilizzi queste reti per download di grandi dimensioni."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Reti mobili"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Reti Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Per selezionare hotspot mobili, attiva il Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Modifica profilo VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Connessione a <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Aggiungi profilo VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Modifica profilo"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Elimina profilo"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Nessuna connessione di rete disponibile. Riprova più tardi."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Manca un certificato. Modifica il profilo."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"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="3973201880357468747">"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="8764686624055084454">"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="3055831259260848004">"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="spellcheckers_settings_title" msgid="399981228588011501">"Controllo ortografico"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Digita la password corrente di backup completo qui"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Digita una nuova password per i backup completi qui"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Digita nuovamente  la nuova password di backup completo qui"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annulla"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Aggiornamenti di sistema aggiuntivi"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Utenti e limitazioni"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Utenti"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Aggiungi utente"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Modifica dettagli"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Informazioni utente"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nome"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Limitazioni contenuti"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN obbligatorio"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Valutazione contenuti"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Applicazioni di sistema"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Applicazioni installate"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Elimina"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Rimuovi utente"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Bambino molesto"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Rimuovere l\'utente?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Vuoi rimuovere l\'utente e tutti i dati associati dal dispositivo?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra notifiche"</string>
+    <string name="help_label" msgid="1107174367904110532">"Guida"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 8d8ea5f..e236cc8 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"מתנתק..."</item>
     <item msgid="1634960474403853625">"מנותק"</item>
     <item msgid="746097431216080650">"נכשל"</item>
+    <item msgid="6367044185730295334">"חסומה"</item>
+    <item msgid="503942654197908005">"נמנע זמנית מחיבור חלש"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"מתנתק מרשת <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"מנותק"</item>
     <item msgid="8578370891960825148">"נכשל"</item>
+    <item msgid="5660739516542454527">"חסומה"</item>
+    <item msgid="1805837518286731242">"נמנע זמנית מחיבור חלש"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"לחצן דחיפה"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"אין"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN מנקודת גישה"</item>
-    <item msgid="7364462169350112617">"PIN ממכשיר זה"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"סטטי"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"כרטיס SD נשלף"</item>
     <item msgid="4498124044785815005">"תן למערכת להחליט"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"כבוי"</item>
-    <item msgid="4804571292609523335">"רטט"</item>
-    <item msgid="595707141547423573">"השתק"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"קצר"</item>
     <item msgid="2560532955514699713">"בינוני"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"קנה מידה להנפשה 5x"</item>
     <item msgid="6660750935954853365">"קנה מידה להנפשה 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"הנפשה כבויה"</item>
+    <item msgid="1138649021950863198">"קנה מידה להנפשה 5x."</item>
+    <item msgid="4394388961370833040">"קנה מידה להנפשה 1x"</item>
+    <item msgid="8125427921655194973">"קנה מידה להנפשה 1.5x"</item>
+    <item msgid="3334024790739189573">"קנה מידה להנפשה 2x"</item>
+    <item msgid="3170120558236848008">"קנה מידה להנפשה 5x"</item>
+    <item msgid="1069584980746680398">"קנה מידה להנפשה 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"הגבלת תקן"</item>
     <item msgid="4071574792028999443">"אין תהליכים ברקע"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 66a137e..2d5dc38 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"כן"</string>
     <string name="no" msgid="6731231425810196216">"לא"</string>
+    <string name="create" msgid="3578857613172647409">"צור"</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>
@@ -111,9 +112,11 @@
     <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_device_details" msgid="4594773497930028085">"הגדרות המכשיר"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"הגדרות פרופיל"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"לא הוגדר שם, משתמש בשם החשבון"</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="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>
@@ -131,13 +134,12 @@
     <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="5655704645616731277">"גע כדי לבצע התאמה"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"לא נמצאו מכשירי 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="1931617700075106801">"גע כדי ליצור התאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"גע כדי ליצור התאמה עם <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="device_picker" msgid="8398232791303186677">"בוחר מכשיר Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"בקשה להרשאת Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"יישום מסוים רוצה להפעיל את Bluetooth. לאפשר?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"יישום מסוים בטבלט שלך רוצה להפוך את הטבלט לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. לאפשר?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"גע כדי להתחבר אל <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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"אישור"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"שם המארח שהקלדת אינו חוקי."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"רשימת אי ההכללה שהקלדת אינה בפורמט המתאים. הקלד רשימה של דומיינים שאינם נכללים, שהפריטים בה מופרדים באמצעות פסיקים."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"עליך למלא את שדה היציאה."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"עליך למלא את שדה היציאה."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"שדה היציאה חייב להיות ריק אם שדה המארח ריק."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"היציאה שהקלדת אינה חוקית."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך יישומים אחרים לא יכולים להשתמש בו."</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"השינויים ייכנסו לתוקף לאחר חיבור מחדש של כבל ה-USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"השינויים ייכנסו לתוקף לאחר שכבל ה-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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"לא נמצא אחסון USB טעון."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"אין כרטיס 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="6691584887397909775">"כעת ניתן להסיר את אחסון ה-USB באופן בטוח"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"כעת ניתן להסיר את כרטיס ה-SD בבטחה"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"אחסון ה-USB משמש כמכשיר אחסון בנפח גדול."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"כרטיס ה-SD משמש כהתקן אחסון בנפח גדול."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"כעת ניתן להסיר את אחסון ה-USB באופן בטוח."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"כעת ניתן להסיר את כרטיס ה-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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"אחסון ה-USB טעון לקריאה בלבד."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"כרטיס ה-SD טעון לקריאה בלבד."</string>
     <string name="skip_label" msgid="47510779345218297">"דלג"</string>
     <string name="next_label" msgid="4693520878012668114">"הבא"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"שפה"</string>
@@ -248,7 +250,7 @@
     <string name="device_info_label" msgid="6551553813651711205">"מידע על המכשיר"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"מידע על הסוללה"</string>
     <string name="display_label" msgid="8074070940506840792">"מסך"</string>
-    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"פרטי טבלט"</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>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"כשאתה מאפשר נדידה, ייתכן שתחויב בעלויות נדידה גבוהות!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"האם לאפשר נדידה?"</string>
     <string name="networks" msgid="6333316876545927039">"בחירת מפעיל"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"בחר מפעיל רשת"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"תאריך ושעה"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"בחירת פורמט תאריך"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"שיפור התאמת פרצוף"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"וידוא פרצוף"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"דרוש מצמוץ עיניים בעת ביטול נעילה"</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>
@@ -301,31 +305,32 @@
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"סיסמאות"</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="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="923629233459331136">"תוכל להצפין את החשבונות וההגדרות שלך, וכן את היישומים שהורדת והנתונים, המדיה וקבצים אחרים שלהם. לאחר הצפנת הטבלט, עליך להזין קוד PIN מספרי או סיסמה כדי לבטל את ההצפנה בכל הפעלה של הטבלט: תוכל לבטל את הצפנת הטבלט רק על ידי ביצוע איפוס נתוני יצרן, פעולה שתגרום למחיקת כל הנתונים שלך."\n\n"ההצפנה נמשכת שעה או יותר. עליך להתחיל בהצפנה עם סוללה טעונה ולהשאיר את הטבלט מחובר עד להשלמת ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד חלק מהנתונים או את כולם."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"תוכל להצפין את החשבונות וההגדרות שלך, כמו גם את היישומים שהורדת והנתונים, המדיה וקבצים אחרים שלהם. לאחר הצפנת הטלפון, עליך להזין קוד PIN מספרי או סיסמה כדי לבטל את ההצפנה בכל הפעלה של הטלפון: תוכל לבטל את הצפנת הטלפון רק על ידי איפוס נתוני היצרן, פעולה שתגרום למחיקת כל הנתונים שלך."\n\n"ההצפנה נמשכת שעה או יותר. עליך להתחיל בהצפנה עם סוללה טעונה ולהשאיר את הטלפון מחובר עד להשלמת תהליך ההצפנה. אם תפסיק את תהליך ההצפנה לפני סיומו, תאבד חלק מהנתונים או את כולם."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"הצפן טבלט"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטבלט שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטבלט שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים."\n\n"ההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטבלט מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטלפון שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד 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="2029407131227814893">"טען את הסוללה ונסה שוב."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"חבר את המטען ונסה שוב."</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_dialog_need_password_message" msgid="4071395977297369642">"עליך להגדיר PIN או סיסמה לנעילת מסך כדי שתוכל להתחיל בהצפנה."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"האם להצפין?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"פעולת ההצפנה אינה ניתנת לביטול, ואם תפסיק אותה תאבד נתונים. ההצפנה אורכת שעה לפחות, ובמהלך זמן זה הטבלט יופעל מחדש כמה פעמים."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"פעולת ההצפנה אינה ניתנת לביטול, ואם תפסיק אותה תאבד נתונים. ההצפנה אורכת שעה לפחות, ובמהלך זמן זה הטלפון יופעל מחדש כמה פעמים."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"מצפין"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"המתן בזמן הצפנת הטבלט. <xliff:g id="PERCENT">^1</xliff:g> הושלמו."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"המתן בזמן הצפנת הטלפון. <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="2223340178473871064">"הקלד את הסיסמה שלך"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ההצפנה נכשלה"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטבלט שלך. "\n\n"כדי לחזור ולהשתמש בטבלט, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטבלט לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטלפון שלך. "\n\n"כדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"בחר נעילת מסך"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ההצפנה הופסקה ואין אפשרות להשלים אותה. בשל כך, לא ניתן עוד לגשת לנתונים בטבלט שלך. "\n\n"כדי לחזור ולהשתמש בטבלט, עליך לבצע איפוס נתוני יצרן. כאשר תגדיר את הטבלט לאחר האיפוס, תוכל לשחזר נתונים שגובו בחשבון Google שלך."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטלפון שלך. "\n\n"כדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"החלפת שיטת קלט"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"בחירת נעילת מסך"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"בחר נעילת גיבוי"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"נעילת מסך"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"שינוי נעילת מסך"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"זיהוי פרצוף"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"קו ביטול נעילה"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"סיסמה"</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>
@@ -362,44 +367,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"הסיסמה אינה יכולה להכיל יותר מ-<xliff:g id="NUMBER">%d</xliff:g> תווים."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"קוד ה-PIN אינו יכול להכיל יותר מ-<xliff:g id="NUMBER">%d</xliff:g> ספרות."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"קוד ה-PIN יכול להכיל רק את הספרות 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"מנהל המכשירים אינו מאפשר שימוש ב-PIN שנעשה בו שימוש לאחרונה."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"הסיסמה מכילה תו לא חוקי."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"הסיסמה צריכה להכיל אות אחת לפחות."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"הסיסמה צריכה להכיל ספרה אחת לפחות."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"הסיסמה צריכה להכיל סמל אחד לפחות."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"הסיסמה חייבת להכיל אות אחת לפחות"</item>
-    <item quantity="other" msgid="7278096339907683541">"הסיסמה חייבת להכיל %d אותיות לפחות"</item>
+    <item quantity="one" msgid="3063853802158131458">"הסיסמה צריכה להכיל אות אחת לפחות."</item>
+    <item quantity="other" msgid="8186027808415585970">"הסיסמה צריכה להכיל %d אותיות לפחות."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"הסיסמה חייבת להכיל אות קטנה אחת לפחות"</item>
-    <item quantity="other" msgid="588499075580432178">"הסיסמה חייבת להכיל %d אותיות קטנות לפחות"</item>
+    <item quantity="one" msgid="5583986519662091001">"הסיסמה צריכה להכיל אות קטנה אחת לפחות."</item>
+    <item quantity="other" msgid="2693910942679679225">"הסיסמה צריכה להכיל %d אותיות קטנות לפחות."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"הסיסמה חייבת להכיל אות גדולה אחת לפחות"</item>
-    <item quantity="other" msgid="2183090598541826806">"הסיסמה חייבת להכיל %d אותיות רישיות לפחות"</item>
+    <item quantity="one" msgid="2611909966725502768">"הסיסמה צריכה להכיל אות גדולה אחת לפחות."</item>
+    <item quantity="other" msgid="3030801209112209245">"הסיסמה צריכה להכיל %d אותיות גדולות לפחות."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"הסיסמה חייבת להכיל ספרה אחת לפחות"</item>
-    <item quantity="other" msgid="995673409754935278">"הסיסמה חייבת להכיל %d ספרות לפחות"</item>
+    <item quantity="one" msgid="3820355568839621231">"הסיסמה צריכה להכיל ספרה אחת לפחות."</item>
+    <item quantity="other" msgid="4703982391407595924">"הסיסמה צריכה להכיל %d ספרות לפחות."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"הסיסמה צריכה להכיל סמל מיוחד אחד לפחות"</item>
-    <item quantity="other" msgid="3047460862484105274">"הסיסמה חייבת להכיל %d סמלים מיוחדים לפחות"</item>
+    <item quantity="one" msgid="8456579939292408631">"הסיסמה צריכה להכיל סמל מיוחד אחד לפחות."</item>
+    <item quantity="other" msgid="1221290525051187757">"הסיסמה צריכה להכיל %d סמלים מיוחדים לפחות."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"הסיסמה חייבת להכיל תו אחד לפחות שאינו אות"</item>
-    <item quantity="other" msgid="5574191164708145973">"הסיסמה חייבת להכיל %d תווים לפחות שאינם אותיות"</item>
+    <item quantity="one" msgid="4594051152085925921">"הסיסמה צריכה להכיל תו אחד לפחות שאינו אות."</item>
+    <item quantity="other" msgid="3952508584649046404">"הסיסמה צריכה להכיל %d תווים לפחות שאינם אותיות."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"מנהל המכשיר אינו מאפשר שימוש בסיסמה שהיתה בשימוש לאחרונה"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"מנהל המכשירים אינו מאפשר שימוש בסיסמה שנעשה בה שימוש לאחרונה."</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="lock_setup" msgid="1759001157415978959">"ההגדרה הושלמה"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"ההגדרה הושלמה."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"כדי להתאים עם:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>הקלד את מפתח הסיסמה הנדרש של המכשיר:"</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_enter_pin_other_device" msgid="4637977124526813470">"ייתכן שתצטרך להקליד את קוד ה-PIN הזה גם במכשיר השני."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"ייתכן שתצטרך להקליד את המפתח הזה גם במכשיר השני."</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="2796550001376088433">"כדי להתאים עם:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>הקלד בו:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ולאחר מכן הקש על Return או Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"לא ניתן להתאים את <xliff:g id="DEVICE_NAME">%1$s</xliff:g> בשל קוד PIN או סיסמה שגויים."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"לא ניתן לתקשר עם <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_connecting_error_message" msgid="229861986106185022">"לא הייתה אפשרות להתחבר אל <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>
@@ -452,7 +457,7 @@
     <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="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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"אפשר החלפת נתונים כאשר הטלפון נוגע במכשיר אחר"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"אפשר חילופי מידע כאשר הטאבלט נוגע במכשיר אחר"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"אפשר החלפת נתונים כאשר הטלפון נוגע במכשיר אחר"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"מוכן לשדר תוכן יישום באמצעות NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"כבוי"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"לא זמין משום שה-NFC כבוי"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"כאשר תכונה זו מופעלת, תוכל לשדר תוכן יישומים למכשיר אחר התומך ב-NFC על ידי החזקת המכשירים קרובים אחד לשני. לדוגמה, תוכל לשדר דפי דפדפן, סרטוני YouTube, אנשי קשר  ועוד."\n\n"פשוט קרב את המכשירים זה לזה (בדרך כלל גב אל גב) ולאחר מכן גע במסך שלך. היישום יקבע מה ישודר."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"גילוי שירותי רשת"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"אפשר ליישומים במכשירים אחרים לגלות יישומים במכשיר זה"</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="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_setup_wizard_title" msgid="70277346338812325">"בחר Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"לא ניתן לסרוק לאיתור רשתות"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"התראת רשת"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"שלח לי התראה כשיש רשת פתוחה זמינה"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"הימנע  מחיבורים באיכות ירודה"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"אל תשתמש ברשת Wi-Fi, אלא אם יש לה חיבור אינטרנט טוב"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"הימנע מחיבורים באיכות ירודה"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"אל תשתמש ברשת Wi-Fi, אלא אם יש לה חיבור אינטרנט טוב"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"השאר 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_wps_pbc" msgid="2668564692207863017">"לחצן WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"הזנת PIN ‏של WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"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_empty_list_wifi_on" msgid="3354911729026237372">"מחפש רשתות Wi-Fi ..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"רשת אחרת..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"עוד"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"התקנה אוטומטית (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"הצג אפשרויות מתקדמות"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"הקלד קוד PIN מנקודת גישה"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"הגדרת WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"הזן את קוד ה-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_wps_setup_title" msgid="6034518116333042484">"התקנה מוגנת של Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"מפעיל WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"לחץ על כפתור ה-Wi-Fi Protected Setup בנתב שלך. ייתכן שבמקום שם זה יופיע הכיתוב \"WPS\" או הסמל הזה:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"הזן את מספר PIN <xliff:g id="NUMBER">%1$s</xliff:g> בנתב ה-Wi-Fi שלך. השלמת ההתקנה עשויה להימשך עד שתי דקות."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS הצליח. מתחבר לרשת..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"מחובר לרשת Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS כבר מתבצע, והפעולה יכולה להימשך עד שתי דקות"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS נכשל. נסה שוב בעוד מספר דקות."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"הגדרת האבטחה של הנתב האלחוטי (WEP) אינה נתמכת"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"הגדרת האבטחה של הנתב האלחוטי (TKIP) אינה נתמכת"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"האימות נכשל. נסה שוב."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"אותרה פעילות WPS נוספת באתר. נסה שוב בעוד מספר דקות."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"של הרשת SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"אבטחה"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"עוצמת אות"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"נשמר"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"מושבת"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"נמנע חיבור אינטרנט באיכות ירודה"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"נמנע חיבור לרשת עקב איכות חיבור ירודה. כבה התנהגות זו דרך המסך \'הגדרות\' &gt;‏ \'Wi-Fi\', פריט התפריט \'מתקדם\'."</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="3538912605343585226">"רשת מוגנת זמינה"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (רשת מוגנת זמינה)"</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_failed_connect_message" msgid="8491902558970292871">"נכשל הניסיון להתחבר לרשת"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"שכח"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"נכשל הניסיון לשכוח את הרשת"</string>
     <string name="wifi_save" msgid="3331121567988522826">"שמור"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"נכשל הניסיון לשמור את הרשת"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ביטול"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"זוהתה הפעלה מוגנת נוספת של Wi-Fi. נסה שוב בעוד מספר דקות."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"שער"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"אורך קידומת של רשת"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"הגדרת קישוריות מסוג עמית-לעמית"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi ישיר"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"פרטי מכשיר"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"התקנה מוגנת של Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"הקלד קוד 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_remove_group" msgid="4844634506540667517">"הסר קבוצה"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"מתקדם"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"מכשירים זמינים"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"חיפוש מכשירים"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"מחפש…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"שנה את שם המכשיר"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"מכשירי עמית"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"לא ניתן להתחבר."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"ניסיון שינוי השם של המכשיר נכשל."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"להתנתק?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"אם תתנתק, החיבור שלך עם <xliff:g id="PEER_NAME">%1$s</xliff:g> יסתיים."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"אם תתנתק, החיבור שלך עם <xliff:g id="PEER_NAME">%1$s</xliff:g> ועם <xliff:g id="PEER_COUNT">%2$s</xliff:g> מכשירים נוספים יסתיים."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"האם לבטל את ההזמנה?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"האם אתה רוצה לבטל את ההזמנה ליצירת קשר עם <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_ap_text" msgid="61237027772641155">"הגדר נקודה חמה של 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="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
     <string name="sound_settings" msgid="5534671337768745343">"צלילים"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"מצב שקט"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"רינגטון של טלפון"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"עוצמות קול"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"אפקטים מוסיקליים"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"עוצמת קול של צלצול"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"רטט במצב שקט"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"רטט וצלצול"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"השתק רינגטון והתראות"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"השתק מוסיקה וסוגי מדיה אחרים"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"השתק התראות"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"השתק התראות קוליות"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"רטט בעת צלצול"</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>
@@ -623,17 +651,17 @@
     <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="9015625921245904495">"עליך לעגן את הטבלט לפני הגדרת אודיו ממעגן."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"עליך לעגן את הטלפון לפני הגדרת אודיו ממעגן."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"עליך לעגן את הטבלט לפני הגדרת אודיו ממעגן."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"עליך לעגן את הטלפון לפני הגדרת אודיו ממעגן."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"צליל כניסה למעגן"</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="account_settings" msgid="6403589284618783461">"חשבונות"</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="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>
@@ -680,7 +708,7 @@
     <string name="sim_lock_failed" msgid="5651596916127873626">"לא ניתן לשנות את מצב הנעילה של כרטיס ה-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" product="tablet" msgid="1119755927536987178">"סטטוס טבלט"</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>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"גירסת 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>
@@ -818,12 +846,12 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"מחק כרטיס SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"מחק את כל הנתונים באחסון ה-USB הפנימי, כגון פריטי מוסיקה או תמונות"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"מחק את כל הנתונים שבכרטיס ה-SD, כגון מוסיקה או תמונות"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"איפוס טבלט"</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="7209547812233487345">"למחוק את כל המידע האישי שלך והיישומים שהורדת? לא ניתן לבטל את הפעולה!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"מחק הכל"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"שרטט את קו ביטול הנעילה"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"עליך לשרטט את קו ביטול הנעילה כדי לאפשר איפוס נתוני יצרן."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"עליך לשרטט את קו ביטול הנעילה כדי לאפשר איפוס נתוני יצרן."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"לא בוצע איפוס מכיוון שהשירות \'ניקוי מערכת\' אינו זמין."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"לאפס?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"מחק אחסון USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"למחוק את כרטיס ה-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="nosdcard" msgid="2192044794228379224">"עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את אחסון ה-USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"עליך לשרטט את קו ביטול הנעילה כדי לאשר שברצונך למחוק את כרטיס ה-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="6688416425801386511">"קשירת USB"</string>
@@ -855,13 +883,13 @@
     <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="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="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="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="tablet" msgid="2093881379028235555">"לא משתף את החיבור לאינטרנט של טאבלט זה"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"לא משתף את החיבור לאינטרנט של טלפון זה"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"אין שיתוף אינטרנט"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"לא ניתן לשתף אינטרנט בין למעלה מ-<xliff:g id="MAXCONNECTION">%1$d</xliff:g> מכשירים."</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"רשתות לנייד"</string>
     <string name="location_title" msgid="1029961368397484576">"המיקום שלי"</string>
     <string name="location_network_based" msgid="5569673665032992664">"שירות המיקום של Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"אפשר ליישומים להשתמש בנתונים ממקורות כגון רשתות Wi-Fi ורשתות לנייד כדי לקבוע את המיקום המשוער שלך"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"אפשר שליחה של נתוני מיקום אנונימיים אל Google. כמו כן, אפשר ליישומים מורשים להשתמש בנתונים ממקורות כגון רשתות 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"לחץ על \'תפריט\' לקבלת עזרה."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"שחרר את האצבע כשתסיים."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"חבר <xliff:g id="NUMBER">%d</xliff:g> נקודות לפחות. נסה שוב:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"הקו תועד!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"הקו נרשם."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"צייר קו שוב כדי לאשר:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"קו ביטול הנעילה החדש:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"אשר"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"הבא"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"אבטחת הטבלט"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"אבטחת הטלפון"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"הגן על הטבלט שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי למסך. הסט את האצבע כדי לחבר את הנקודות בכל סדר שתבחר במסך הבא. עליך לחבר לפחות ארבע נקודות. "\n\n"מוכן להתחיל? גע באפשרות \'הבא\'."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"הגן על הטבלט שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי למסך. הסט את האצבע כדי לחבר את הנקודות בכל סדר שתבחר במסך הבא. עליך לחבר לפחות ארבע נקודות. "\n\n"מוכן להתחיל? גע ב\'הבא\'."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"הגן על הטלפון שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי במסך. השתמש באצבע כדי לחבר לפחות ארבע נקודות בכל סדר שהוא במסך הבא."\n\n"מוכן להתחיל? גע באפשרות \'הבא\'."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"נהל יישומים"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"נהל והסר יישומים מותקנים"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"ניהול יישומים, הגדרת קיצורי דרך להפעלה מהירה"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"הגדרות יישום"</string>
     <string name="install_applications" msgid="4872012136210802181">"מקורות לא ידועים"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"אישור להתקנת יישומים שאינם מ\'חנות Android\'"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"אפשר התקנת יישומים ממקורות לא ידועים"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"הטבלט והנתונים האישיים שלך חשופים יותר בפני התקפות על ידי יישומים ממקורות לא ידועים. אתה מסכים לכך שאתה האחראי הבלעדי לכל נזק שייגרם לטבלט שלך או לאובדן נתונים שעלולים להיגרם בעקבות שימוש ביישומים אלה."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"הטלפון והנתונים האישיים שלך חשופים יותר בפני התקפות של יישומים ממקורות לא ידועים. אתה מסכים לכך שאתה האחראי הבלעדי לכל נזק שנגרם לטלפון או לאובדן של נתונים שעשויים להיגרם כתוצאה משימוש ביישומים אלה."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"פרטי יישום"</string>
     <string name="storage_label" msgid="8700867073480107253">"אחסון"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"הפעל כברירת מחדל"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"ברירות מחדל"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"תאימות מסך"</string>
     <string name="permissions_label" msgid="2605296874922726203">"הרשאות"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"קובץ שמור"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"נקה נתונים"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"הסר התקנה של עדכונים"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"בחרת להפעיל יישום זה כברירת מחדל עבור פעולות מסוימות."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"בחרת לאפשר ליישום זה ליצור Widgets ולגשת לנתונים שלהם."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"לא הוגדרו ברירות מחדל."</string>
     <string name="clear_activities" msgid="7408923511535174430">"נקה ברירות מחדל"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"ייתכן שיישום זה אינו מיועד למסך שלך. תוכל לשלוט באופן שבו הוא מותאם למסך שלך כאן."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"מיין לפי גודל"</string>
     <string name="show_running_services" msgid="5736278767975544570">"הצג שירותים פועלים"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"הצג תהליכים המאוחסנים בקובץ שמור"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"אפס העדפות יישום"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"האם לאפס העדפות יישום?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"פעולה זו תאפס את כל ההעדפות עבור:"\n\n" "<li>"יישומים מושבתים"</li>\n" "<li>"התראות יישום מושבת"</li>\n" "<li>"יישומי ברירת מחדל לפעולות"</li>\n" "<li>"הגבלות נתוני רקע ליישומים"</li>\n\n" לא תאבד נתוני יישומים."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"אפס יישומים"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"נהל שטח אחסון"</string>
     <string name="filter" msgid="2018011724373033887">"סינון"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"בחר אפשרויות סינון"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"יישום זה יכול לגשת לפריטים הבאים בטבלט שלך:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"יישום זה יכול לגשת לפריטים הבאים בטלפון:"</string>
     <string name="computing_size" msgid="1599186977475211186">"מחשב..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"אין אפשרות לחשב את גודל החבילה"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"לא ניתן לחשב את גודל החבילה."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"לא מותקנים במכשיר שלך יישומים של צד שלישי."</string>
     <string name="version_text" msgid="9189073826278676425">"גרסה <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"העבר"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"שנה את מיקום ההתקנה המועדף עבור יישומים חדשים."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"להשבית יישום מובנה?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"אם תשבית יישום מובנה, יישומים אחרים עשויים שלא לפעול כהלכה."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"האם לבטל התראות?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"אם תבטל התראות עבור יישום זה, אתה עלול להחמיץ התראות ועדכונים חשובים."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"שימוש בשטח אחסון"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"הצג את שטח האחסון שנמצא בשימוש על ידי יישומים"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"שירותים פועלים"</string>
@@ -1084,21 +1120,40 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"ייתכן ששיטת קלט זו תוכל לאסוף את כל הטקסט שאתה מקליד, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיס אשראי. היא מגיעה מהיישום <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. האם להשתמש בשיטת קלט זו?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"ייתכן שבודק איות זה יוכל לאסוף את כל הטקסט שאתה מקליד, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיס אשראי. הוא מגיע מהיישום <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. להשתמש בבודק איות זה?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"הגדרות"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"שפה"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"פתיחת הגדרות עבור <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> נכשלה"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"עכבר/משטח עקיבה"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"מהירות המצביע"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"בקר משחק"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"השתמש ברטט"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"הפנה רטט לבקר משחק כאשר הוא מחובר."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"בחירת פריסת מקלדת"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"הגדר פריסות מקלדת"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"כדי להחליף פריסה, הקש Control-מקש רווח"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ברירת מחדל"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"פריסות מקלדת"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"מילון משתמש"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"מילון אישי"</string>
     <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_add_screen_title" msgid="742580720124344291">"ביטוי"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"יותר אפשרויות"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"פחות אפשרויות"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"אישור"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"מילה:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"קיצור דרך:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"שפה:"</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="8165273379942105271">"לא מוגדרות מילים במילון המשתמש. הוסף מילה על ידי נגיעה בלחצן \'הוסף\' (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"כל השפות"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"לכל השפות"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"שפות נוספות..."</string>
     <string name="testing" msgid="6584352735303604146">"בדיקה"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"פרטי טבלט"</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>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"הגדרת אפשרויות לפיתוח יישומים"</string>
     <string name="enable_adb" msgid="7982306934419797485">"ניקוי באגים ב-USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"מצב תיקון באגים כאשר USB מחובר"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"מזהה פיתוח של המכשיר"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"מידע על המכשיר אינו זמין."</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="7316799925425402244">"ניקוי באגים באמצעות USB מיועד למטרות פיתוח בלבד. השתמש בו להעתקת נתונים בין המחשב והמכשיר שלך, להתקנת יישומים במכשיר ללא התראה ולקריאת נתוני יומן."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"האם להתיר הגדרות פיתוח?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"הגדרות אלה מיועדות לשימוש בפיתוח בלבד. הן עלולות לגרום למכשיר או ליישומים המותקנים בו לקרוס או לפעול באופן לא תקין."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"הגנה על אחסון USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"על יישומים לבקש רשות כדי לקרוא אחסון USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"האם להגן על אחסון USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"כאשר אחסון USB מוגן, על יישומים לבקש רשות כדי לקרוא נתונים מאחסון חיצוני."\n\n"ייתכן שיישומים מסוימים לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"הגנה על כרטיס SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"על יישומים לבקש רשות כדי לקרוא כרטיס SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"האם להגן על כרטיס ה-SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"כאשר כרטיס ה-SD מוגן, על יישומים לבקש רשות כדי לקרוא נתונים מאחסון חיצוני."\n\n"ייתכן שיישומים מסוימים לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"בחר גאדג\'ט"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"בחר Widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"האם ליצור Widget‏ ולאפשר גישה?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"לאחר יצירת ה-Widget‏, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> יוכל לגשת לכל הנתונים שהוא מציג."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"אפשר תמיד ל-<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ליצור Widgets ולגשת לנתונים שלהם"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"טקסט גדול"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"לחצן ההפעלה מסיים שיחה"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"אמירת סיסמאות"</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="3264723681038625967">"התקן סקריפטים של אינטרנט"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"שיפור נגישות האינטרנט"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"אין שירותים מותקנים"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"זקוק לקורא מסך?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack מספק משוב מוקרא בקול רם כדי לעזור למשתמשים עיוורים ולקויי ראייה. האם ברצונך להתקין אותו ללא תשלום מ\'חנות Android\'?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"להתקין סקריפטים של אינטרנט?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"האם ברצונך שהיישומים יתקינו סקריפטים מ-Google שהופכים את תוכן האינטרנט שלהם לנגיש יותר?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"תכונה זו משנה את האופן שבו המכשיר מגיב למגע. להפעיל?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"לא סופק תיאור."</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_not_available" msgid="3214000535532434353">"אין נתונים זמינים על השימוש בסוללה."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1215,14 +1276,14 @@
     <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" product="tablet" msgid="4612478572401640759">"טבלט לא פעיל"</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="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>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"לא ניתן להפעיל את המנוע שבחרת."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"הגדר"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"בחר מנוע אחר"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"ייתכן שמנוע סינתזת דיבור זה יכול לאסוף את כל הטקסט המדובר, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיסי אשראי. הוא מגיע מהמנוע <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. להפוך את השימוש במנוע סינתזת דיבור זה לפעיל?"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"הפעל את המנוע החדש לפני השימוש."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"שרטט את קו ביטול הנעילה"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"עליך לשרטט את קו ביטול הנעילה כדי לאשר התקנת הסמכות."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"הקלד את הסיסמה עבור אחסון אישורים."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"הסיסמה הנוכחית:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"אחסון האישורים נמחק."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"לא ניתן למחוק את האמצעי לאחסון אישורים."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"אחסון האישורים מופעל."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"עליך להגדיר את קוד PIN או סיסמה לנעילת המסך כדי שתוכל להשתמש באמצעי לאחסון אישורים."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"עליך להגדיר PIN או סיסמה לנעילת המסך כדי שתוכל להשתמש באחסון אישורים."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"צליל חירום"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"הגדר אופן פעולה בעת ביצוע שיחת חירום"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"גיבוי ואיפוס"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"שחזור אוטומטי"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"לאחר התקנה מחדש של יישום, שחזר את ההגדרות והנתונים המגובים"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"סיסמת גיבוי מקומי"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"גיבויים מלאים של Google Desktop אינם מוגנים כרגע."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"בחר לשנות או להסיר את הסיסמה עבור גיבויים מלאים מקומיים"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"גיבויים מלאים בשולחן העבודה אינם מוגנים כעת"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"גע כדי לשנות או להסיר את הסיסמה עבור גיבויים מלאים בשולחן העבודה"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"להפסיק לגבות את סיסמאות ה-Wi-Fi, הסימניות, הגדרות אחרות ונתוני היישומים שלך ולמחוק את כל העותקים משרתי Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"הגדרות ניהול מכשיר"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"מנהל מערכת זה פעיל ומאפשר ליישום <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">"רינגטונים והתראות"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"התראות"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"מערכת"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"צלצול ורטט שיחה"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"מערכת"</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="3747859666621319757">"מתחבר לרשת Wi-Fi‏ <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"הסנכרון נכשל"</string>
+    <string name="sync_active" msgid="8476943765960863040">"סנכרון פעיל"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"סנכרון"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"הסינכרון נתקל כעת בבעיות. הוא ימשיך תוך זמן קצר."</string>
     <string name="add_account_label" msgid="7811707265834013767">"הוסף חשבון"</string>
     <string name="background_data" msgid="5779592891375473817">"נתוני רקע"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"סינכרון מופעל"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"סינכרון כבוי"</string>
     <string name="sync_error" msgid="5060969083117872149">"שגיאת סינכרון"</string>
+    <string name="last_synced" msgid="4242919465367022234">"סונכרן לאחרונה ב-<xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"מסנכרן כעת…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"ברוכים הבאים אל סינכרון Google‏!"</font>" "\n"זוהי גישה של Google לסינכרון נתונים במטרה לאפשר לך גישה לאנשי קשר, לפגישות ועוד מכל מקום שבו אתה נמצא."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"הגדרות סנכרון יישומים"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"נתונים וסינכרון"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"שנה סיסמה"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"יישומים מסוימים מחייבים שימוש בחשבון זה. ניתן להסירו רק על ידי איפוס הטבלט לערכי ברירת המחדל של היצרן (פעולה זו מוחקת את כל הנתונים האישיים) ב\'הגדרות\' &gt; \'גיבוי ואיפוס\'."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"יישומים מסוימים מחייבים שימוש בחשבון זה. ניתן להסירו רק על ידי איפוס הטלפון לערכי ברירת המחדל של היצרן (פעולה זו מוחקת את כל הנתונים האישיים) בנתיב \'הגדרות\' &gt; \'גיבוי ואיפוס\'."</string>
     <string name="provider_label" msgid="7724593781904508866">"מנויי Push"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"סנכרן <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"לא ניתן לסנכרן באופן ידני"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"אפשרות הסנכרון עבור פריט זה מושבתת כרגע. כדי לשנות את ההגדרה, הפעל באופן זמני את נתוני הרקע והסנכרון האוטומטי."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"הגדרות ‎4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"כתובת ‎4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"הקלד סיסמה לפענוח ההצפנה של אמצעי האחסון"</string>
     <string name="try_again" msgid="4272075051293936921">"נסה שוב."</string>
-    <string name="service_busy" msgid="2325014135156127705">"השירות עסוק. נסה שוב."</string>
     <string name="delete" msgid="4219243412325163003">"מחק"</string>
     <string name="misc_files" msgid="6720680815969643497">"קובצי \'שונות\'"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"בחר הכול"</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="debug_debugging_category" msgid="6781250159513471316">"ניקוי באגים"</string>
+    <string name="debug_app" msgid="8349591734751384446">"בחר יישום לניקוי באגים"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"לא הוגדר יישום לניקוי באגים"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"יישום ניקוי באגים: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"בחר יישום"</string>
+    <string name="no_application" msgid="2813387563129153880">"כלום"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"המתן למנקה באגים"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"יישום שנוקו בו הבאגים ממתין למנקה הבאגים לצירוף לפני ביצוע"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"קלט"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"ציור"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"מעקב"</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_screen_updates" msgid="5470814345876056420">"הצג עדכונים על פני השטח"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"הבזק את כל שטחי החלון כשהם מתעדכנים"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"הצג עדכוני תצוגה של GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"הבזק תצוגות בתוך חלונות בעת ציור באמצעות ה-GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"השבת שכבות על של HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"השתמש תמיד ב-GPU להרכבת מסך"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"הפעל עקבות"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"בחירת עקבות פעילים"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"אין עקבות פעילים כעת"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"יש כעת <xliff:g id="NUM">%1$d</xliff:g> עקבות פעילים"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"כל העקבות הפעילים כעת"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"הצג את גבולות הפריסה"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"הצג גבולות קליפ, שוליים וכו\'"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"הצג את השימוש ב-CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"שכבת על של מסך שמציגה את השימוש הנוכחי ב-CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"אלץ עיבוד ב-GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"השתמש בהאצת חומרה מסוג 2D ביישומים"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"אכוף שימוש ב-GPU לציור דו-מימדי"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"עיבוד פרופיל ב-GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"מדוד את משך העיבוד ב-adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"קנה מידה להנפשה של חלון"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"קנה מידה של הנפשת מעבר"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"קנה מידת משך זמן למנפיש"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Google Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"אל תשמור פעילויות"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"השמד כל פעילות ברגע שהמשתמש עוזב אותה"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"נקודות חמות לנייד"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"סנכרון אוטומטי של נתונים"</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="8621855507876539282">"אף יישום לא השתמש בנתונים במהלך פרק זמן זה."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"חזית"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"רקע"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"נמדד על ידי הטבלט שלך. חישוב נפח העברת הנתונים של ספק השירות שלך עשוי להיות שונה."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"נמדד על ידי הטלפון שלך. חישוב נפח העברת הנתונים של ספק השירות שלך עשוי להיות שונה."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"מוגבל"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"להשבית נתונים לנייד?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"הגדר מגבלת נתונים לנייד"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"הגדר מגבלת נתונים של 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"ניידים"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"ללא"</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="8430240158135453271">"הצג את הגדרות היישום"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"הגבל נתוני רקע"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"השבת נתוני רקע ברשת נתונים לנייד בלבד. ייעשה שימוש ב-Wi-Fi אם הוא זמין."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"השבת נתוני רקע ברשתות לנייד. ייעשה שימוש ברשתות שאינן לנייד, אם יהיו זמינות."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"כדי להגביל נתוני רקע עבור יישום זה, הגדר תחילה מגבלת נתונים לנייד."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"להגביל נתוני רקע?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"תכונה זו עלולה לגרום ליישום התלוי בנתוני הרקע להפסיק לפעול כאשר Wi-Fi אינו זמין."\n\n"ניתן למצוא פקדים מתאימים יותר של שימוש בנתונים בהגדרות הזמינות בתוך היישום."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"תכונה זו עלולה לגרום ליישום התלוי בנתוני רקע להפסיק לפעול כאשר רק רשתות לנייד זמינות."\n\n"ניתן למצוא אמצעים מתאימים יותר לבקרת השימוש בנתונים דרך ההגדרות הזמינות ביישום."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"הגבלת נתוני הרקע אפשרית רק אם הגדרת מגבלת נתונים לנייד."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"האם להפעיל סנכרון אוטומטי של נתונים?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"שינויים כלשהם שתבצע בחשבונך באינטרנט יועתקו אוטומטית אל הטאבלט."\n\n"חשבונות מסוימים עשויים גם להעתיק אוטומטית אל האינטרנט שינויים שאתה מבצע בטאבלט. חשבון Google פועל בצורה כזאת."\n\n"כדי לבחור את סוגי הפרטים שיסונכרנו בכל חשבון, עבור אל \'הגדרות\' &gt; \'חשבונות\'."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"שינויים כלשהם שתבצע בחשבונך באינטרנט יועתקו אוטומטית אל הטלפון."\n\n"חשבונות מסוימים עשויים גם להעתיק אוטומטית אל האינטרנט שינויים שאתה מבצע בטלפון. חשבון Google פועל בצורה כזאת."\n\n"כדי לבחור את סוגי הפרטים שיסונכרנו בכל חשבון, עבור אל \'הגדרות\' &gt; \'חשבונות\'."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"האם לכבות סנכרון אוטומטי של נתונים?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"פעולה זו תחסוך בשימוש בנתונים ובעוצמת סוללה, אך יהיה עליך לסנכרן כל חשבון באופן ידני על מנת לאסוף מידע עדכני. לא תקבל התראות כאשר יתרחשו עדכונים."</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_warning_editor_title" msgid="3704136912240060339">"הגדר אזהרת שימוש בנתונים"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"הגדר מגבלת שימוש בנתונים"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"הגבלת שימוש בנתונים"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"חיבור הנתונים שלך ב-<xliff:g id="NETWORKS">%1$s</xliff:g> יושבת כאשר תגיע למגבלה שצוינה."\n\n"מכיוון שנפח העברת הנתונים נמדד על ידי הטלפון, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"חיבור הנתונים שלך ב-<xliff:g id="NETWORKS">%1$s</xliff:g> יושבת כאשר תגיע למגבלה שצוינה."\n\n"מכיוון שנפח העברת הנתונים נמדד על ידי הטלפון, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה."\n\n"מכיוון שנפח העברת הנתונים נמדד על ידי הטאבלט, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה."\n\n"מכיוון שנפח העברת הנתונים נמדד על ידי הטלפון, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"להגביל נתוני רקע?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"אם תגביל נתונים ניידים ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם קיים חיבור Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: בערך <xliff:g id="TOTAL">%1$s</xliff:g> בשימוש"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: נעשה שימוש בערך ב-<xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g> : נעשה שימוש בערך ב-<xliff:g id="TOTAL">%1$s</xliff:g>, כפי שנמדד על ידי הטאבלט. ייתכן שספק השירות שלך יחשב את נפח העברת הנתונים בצורה אחרת."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g> : נעשה שימוש בערך ב-<xliff:g id="TOTAL">%1$s</xliff:g>, כפי שנמדד על ידי הטלפון. ייתכן שספק השירות שלך יחשב את נפח העברת הנתונים בצורה אחרת."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"נקודות חמות לנייד"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"בחר את רשתות ה-Wi-Fi שהן נקודות חמות לנייד. ניתן להגביל את השימוש שיישומים עושים ברשתות אלה כאשר הם פועלים ברקע. יישומים יכולים גם להציג אזהרה לפני שימוש ברשתות אלה לביצוע הורדות גדולות."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"רשתות לנייד"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"רשתות Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"כדי לבחור נקודות חמות לנייד, הפעל את ה-Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"עריכת פרופיל VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"התחברות אל <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"הוספת פרופיל VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"ערוך פרופיל"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"מחק פרופיל"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"אין חיבור לרשת. נסה שוב מאוחר יותר."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"חסר אישור. ערוך את הפרופיל."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"לאחר הפעלת האפשרות \'חקור על ידי מגע\', תוכל לגעת במסך כדי לגלות מה נמצא בקצות אצבעותיך. לדוגמה, המסך הנוכחי מכיל סמלי יישומים. מצא אחד מהם על ידי נגיעה במסך והסטת האצבע מסביב."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"יפה מאוד, המשך להחליק את האצבע ברחבי המסך עד שתמצא לפחות סמל אחד נוסף."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"כדי להפעיל פריט שאתה נוגע בו, הקש עליו. הסט את האצבע עד שתמצא את הסמל של <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="8764686624055084454">"כדי לגלול ברשימה, תוכל להסיט שתי אצבעות לאורך המסך. לדוגמה, המסך הנוכחי מכיל רשימה של שמות יישומים שניתן לגלול בה כלפי מעלה או מטה. תחילה, נסה לזהות כמה מהפריטים ברשימה על ידי הסטת אצבע אחת מסביב."</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="3055831259260848004">"השלמת את מערך השיעור. כדי לצאת, אתר את הלחצן <xliff:g id="FINISH">%s</xliff:g> וגע בו."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"תיקון שגיאות איות"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"בודק איות"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"הקלד כאן את הסיסמה הנוכחית שלך לגיבוי מלא"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"הקלד סיסמה חדשה לגיבויים מלאים כאן"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"הקלד מחדש את הסיסמה החדשה שלך לגיבוי מלא כאן"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ביטול"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"עדכוני מערכת נוספים"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"משתמשים והגבלות"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"משתמשים"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"הוסף משתמש"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"ערוך פרטים"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"פרטי משתמש"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"שם"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"הגבלות תוכן"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"דרוש הזנת מספר PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"דירוג תוכן"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"יישומי מערכת"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"יישומים מותקנים"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"מחק"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"הסר משתמש"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"ילד מציק"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"האם להסיר משתמש?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"האם אתה בטוח שאתה רוצה להסיר את המשתמש ואת כל הנתונים המשויכים מהמכשיר?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"הצג התראות"</string>
+    <string name="help_label" msgid="1107174367904110532">"עזרה"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 2b23122..578d4a7 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"切断中..."</item>
     <item msgid="1634960474403853625">"切断されました"</item>
     <item msgid="746097431216080650">"失敗しました"</item>
+    <item msgid="6367044185730295334">"ブロック中"</item>
+    <item msgid="503942654197908005">"接続不良により一時的に無効"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から切断中..."</item>
     <item msgid="197508606402264311">"切断されました"</item>
     <item msgid="8578370891960825148">"失敗しました"</item>
+    <item msgid="5660739516542454527">"ブロック中"</item>
+    <item msgid="1805837518286731242">"接続不良により一時的に無効"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ボタンを押す"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"なし"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"アクセスポイントのPIN"</item>
-    <item msgid="7364462169350112617">"このデバイスのPIN"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"静的"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"リムーバブルSDカード"</item>
     <item msgid="4498124044785815005">"システムで判断する"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"OFF"</item>
-    <item msgid="4804571292609523335">"バイブレーション"</item>
-    <item msgid="595707141547423573">"ミュート"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短め"</item>
     <item msgid="2560532955514699713">"中"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"アニメーションスケール5x"</item>
     <item msgid="6660750935954853365">"アニメーションスケール10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"アニメーションオフ"</item>
+    <item msgid="1138649021950863198">"アニメーションスケール.5x"</item>
+    <item msgid="4394388961370833040">"アニメーションスケール1x"</item>
+    <item msgid="8125427921655194973">"アニメーションスケール1.5x"</item>
+    <item msgid="3334024790739189573">"アニメーションスケール2x"</item>
+    <item msgid="3170120558236848008">"アニメーションスケール5x"</item>
+    <item msgid="1069584980746680398">"アニメーションスケール10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準の上限"</item>
     <item msgid="4071574792028999443">"バックグラウンドプロセスを使用しない"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c55b080..93756f9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"はい"</string>
     <string name="no" msgid="6731231425810196216">"いいえ"</string>
+    <string name="create" msgid="3578857613172647409">"作成"</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>
@@ -113,6 +114,8 @@
     <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_device_details" msgid="4594773497930028085">"端末の設定"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"プロフィール設定"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"名前が設定されていない場合、アカウント名を使用する"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"端末をスキャン"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"タブレットの名前を変更"</string>
@@ -133,13 +136,12 @@
     <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="5655704645616731277">"タップしてペアに設定"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"周辺に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="1931617700075106801">"タップして<xliff:g id="DEVICE_NAME">%1$s</xliff:g>をペアに設定"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"タップして<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="device_picker" msgid="8398232791303186677">"Bluetoothデバイスの選択"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth許可リクエスト"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"アプリがBluetoothをONにしようとしています。許可しますか？"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスからこのタブレットを検出可能にしようとしています。許可しますか？"</string>
@@ -157,7 +159,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"「<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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -186,7 +188,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"入力したホスト名は無効です。"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"入力された除外リストの形式が正しくありません。除外するドメインをカンマ区切りリスト形式で入力してください。"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"[ポート]フィールドに入力してください。"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"ポートフィールドを入力してください。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"[ホスト]フィールドが空の場合は、[ポート]フィールドも空にしてください。"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"入力したポートは無効です。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTPプロキシはブラウザで使用されていますが、他のアプリでは使用できません。"</string>
@@ -226,23 +228,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"USBケーブルの再接続時に変更が有効になります"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"USBストレージが未マウント"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"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="6691584887397909775">"ストレージを安全に取り外せます"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"SDカードを安全に取り外せます"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USBストレージをマスストレージデバイスとして使用中"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SDカードをマスストレージデバイスとして使用中"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"USBストレージを安全に取り外せます。"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"SDカードを読み取り専用でマウント"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SDカードを読み取り専用としてマウントしました。"</string>
     <string name="skip_label" msgid="47510779345218297">"スキップ"</string>
     <string name="next_label" msgid="4693520878012668114">"次へ"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"言語"</string>
@@ -268,8 +270,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"ローミング中にデータサービスに接続します"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"データローミングをOFFにしたままホームネットワークの外に出たためデータ接続が切断されました。"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"ONにする"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"ローミングにより高額な通信料が発生することがあります。データローミングを許可しますか？"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"注意"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"データローミングを許可すると高額な通信料が発生することがあります。"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"データ ローミングを許可しますか？"</string>
     <string name="networks" msgid="6333316876545927039">"通信事業者の選択"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"通信事業者を選択する"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日付と時刻"</string>
@@ -285,12 +287,14 @@
     <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="6951498879879281102">"日付形式の選択"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"顔認識の精度を改善"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"生体検知"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"まばたきが必要"</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>
@@ -308,26 +312,27 @@
     <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="923629233459331136">"アカウント、設定、ダウンロード済みアプリとそのデータ、メディア、その他のファイルを暗号化できます。タブレットを暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。データを初期化してユーザーデータをすべて消去しない限り、タブレットの暗号化を解除することはできません。"\n\n"暗号化の処理には1時間以上かかります。暗号化を開始する前に充電し、暗号化が完了するまでタブレットを電源に接続しておく必要があります。暗号化処理を中断すると、データの一部またはすべてが失われます。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"アカウント、設定、ダウンロード済みアプリとそのデータ、メディア、その他のファイルを暗号化できます。端末を暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。データを初期化してユーザーデータをすべて消去しない限り、端末の暗号化を解除することはできません。"\n\n"暗号化の処理には1時間以上かかります。暗号化を開始する前に充電し、暗号化が完了するまで端末を電源に接続しておく必要があります。暗号化処理を中断すると、データの一部またはすべてが失われます。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。タブレットを一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、タブレットを出荷時設定にリセットしてすべてのデータを消去しなければなりません。"\n\n"暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。端末を一度暗号化すると、電源を入れるたびに数値の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="2029407131227814893">"充電してからもう一度お試しください。"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"電源に接続してもう一度お試しください。"</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_dialog_need_password_message" msgid="4071395977297369642">"暗号化を開始するには、画面ロックのPINまたはパスワードを設定する必要があります。"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"暗号化しますか？"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"この暗号化操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中でタブレットが何度か再起動されます。"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"この暗号化操作は元に戻すことができず、途中で中断するとデータが失われます。暗号化には1時間以上かかり、途中で端末が何度か再起動されます。"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"暗号化しています"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"タブレットを暗号化しています。しばらくお待ちください。<xliff:g id="PERCENT">^1</xliff:g>%完了。"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"携帯端末を暗号化しています。しばらくお待ちください。<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="2223340178473871064">"パスワードを入力してください"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"暗号化できませんでした"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"暗号化処理が中断され完了できなかったため、タブレット上のデータにアクセスできなくなりました。"\n\n"タブレットの使用を再開するには、出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択することができます。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"暗号化処理が中断され完了できなかったため、携帯端末上のデータにアクセスできなくなりました。"\n\n"携帯端末の使用を再開するには、出荷時設定にリセットする必要があります。リセット後、携帯端末のセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択することができます。"</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"画面ロックを選択"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"暗号化処理が中断されて完了できなかったためタブレット上のデータにアクセスできなくなりました。"\n\n"タブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"暗号化処理が中断されて完了できなかったため端末上のデータにアクセスできなくなりました。"\n\n"端末の使用を再開するには出荷時設定にリセットする必要があります。リセット後、端末のセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"入力方法の切り替え"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"画面ロックを選択"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"バックアップのロックの選択"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"画面のロック"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ロック解除方法を変更する"</string>
@@ -350,9 +355,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"フェイスアンロック"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"パターン"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"パスワード"</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>
@@ -364,44 +369,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"パスワードは<xliff:g id="NUMBER">%d</xliff:g>文字未満で指定してください。"</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PINは<xliff:g id="NUMBER">%d</xliff:g>桁未満で指定してください。"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PINに使用できるのは数字0～9のみです。"</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"最近使用したPINは使用できません。"</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"パスワードに無効な文字が含まれています。"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"パスワードには英字が1文字以上必要です。"</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"パスワードには数字が1つ以上必要です。"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"パスワードには記号が1つ以上必要です。"</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"パスワードには英字が1文字以上必要です"</item>
-    <item quantity="other" msgid="7278096339907683541">"パスワードには英字が%d文字以上必要です"</item>
+    <item quantity="one" msgid="3063853802158131458">"パスワードには英字が1文字以上必要です。"</item>
+    <item quantity="other" msgid="8186027808415585970">"パスワードには英字が%d文字以上必要です。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"パスワードには小文字の英字が1文字以上必要です"</item>
-    <item quantity="other" msgid="588499075580432178">"パスワードには小文字の英字が%d文字以上必要です"</item>
+    <item quantity="one" msgid="5583986519662091001">"パスワードには小文字の英字が1文字以上必要です。"</item>
+    <item quantity="other" msgid="2693910942679679225">"パスワードには小文字の英字が%d文字以上必要です。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"パスワードには大文字の英字が1文字以上必要です"</item>
-    <item quantity="other" msgid="2183090598541826806">"パスワードには大文字の英字が%d文字以上必要です"</item>
+    <item quantity="one" msgid="2611909966725502768">"パスワードには大文字の英字が1文字以上必要です。"</item>
+    <item quantity="other" msgid="3030801209112209245">"パスワードには大文字の英字が%d文字以上必要です。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"パスワードには数字が1つ以上必要です"</item>
-    <item quantity="other" msgid="995673409754935278">"パスワードには数字が%d個以上必要です"</item>
+    <item quantity="one" msgid="3820355568839621231">"パスワードには数字が1つ以上必要です。"</item>
+    <item quantity="other" msgid="4703982391407595924">"パスワードには数字が%d個以上必要です。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"パスワードには記号が1つ以上必要です"</item>
-    <item quantity="other" msgid="3047460862484105274">"パスワードには記号が%d個以上必要です"</item>
+    <item quantity="one" msgid="8456579939292408631">"パスワードには記号が1つ以上必要です。"</item>
+    <item quantity="other" msgid="1221290525051187757">"パスワードには記号が%d個以上必要です。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"パスワードには記号または数字が1つ以上必要です"</item>
-    <item quantity="other" msgid="5574191164708145973">"パスワードには記号または数字が%d個以上必要です"</item>
+    <item quantity="one" msgid="4594051152085925921">"パスワードには記号または数字が1つ以上必要です。"</item>
+    <item quantity="other" msgid="3952508584649046404">"パスワードには記号または数字が%d個以上必要です。"</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"最近使用されたパスワードは使用できません"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"最近使用したパスワードは使用できません。"</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="lock_setup" msgid="1759001157415978959">"セットアップ完了"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"設定が完了しました。"</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>
@@ -415,8 +420,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>をペアに設定するには、デバイスに必要なパスキーを入力してください:"</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_enter_pin_other_device" msgid="4637977124526813470">"もう一方のデバイスでも、このPINの入力が必要な場合があります。"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"もう一方のデバイスでも、このパスキーの入力が必要な場合があります。"</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="2796550001376088433">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>をペアに設定するには、「<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>」と入力してから、ReturnキーまたはEnterキーを押します。"</string>
@@ -427,7 +432,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PINまたはパスキーが正しくないため、<xliff:g id="DEVICE_NAME">%1$s</xliff:g>をペアに設定できませんでした。"</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<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_connecting_error_message" msgid="229861986106185022">"<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>
@@ -480,19 +485,23 @@
     <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="5237208142892767592">"端末が他のデバイスと接触したときのデータ交換を許可する"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"タブレットが他のデバイスと接触したときのデータ交換を許可する"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"端末が他のデバイスと接触したときのデータ交換を許可する"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Androidビーム"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"アプリコンテンツをNFCで転送する準備が整いました"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"OFF"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFCがOFFのため使用できません"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Androidビーム"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"この機能をONにすると、別のNFC対応の端末を近づけて持ち、アプリのコンテンツをビームすることができます。たとえば、ブラウザのページ、YouTubeの動画、連絡先などをビームできます。"\n\n"2 つの端末を近づけて（通常は背面を向かい合わせにして）、画面をタップします。何をビームするかはアプリが判断します。"</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"ネットワークサービスの検出"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"別の端末上のアプリにこの端末上のアプリを検出することを許可する"</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="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_setup_wizard_title" msgid="70277346338812325">"Wi-Fiの選択"</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>
@@ -500,25 +509,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ネットワークをスキャンできません"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ネットワークの通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"オープンネットワークが利用可能なときに通知する"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"接続不良のとき無効にする"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"安定したインターネット接続があるときのみWi-Fiネットワークを使用する"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"接続不良のとき無効にする"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"安定したインターネット接続があるときのみWi-Fiネットワークを使用する"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"スリープ時に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_wps_pbc" msgid="2668564692207863017">"WPSプッシュボタン"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN入力"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Wi-Fiネットワークを検索中…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"他のネットワーク…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"その他"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定（WPS）"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"詳細オプションを表示"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"アクセスポイントのPINを入力してください"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPSのセットアップ"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"アクセスポイントでの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_wps_setup_title" msgid="6034518116333042484">"Wi-Fi保護設定"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPSを開始しています…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"ルーターのWi-Fi保護設定ボタンを押します。「WPS」と表記されている場合や、次のような記号が表示されている場合もあります:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Wi-FiルーターでPIN「<xliff:g id="NUMBER">%1$s</xliff:g>」を入力します。セットアップの完了まで最大2分ほどかかることがあります。"</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPSの設定に成功しました。ネットワークに接続しています…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Wi-Fiネットワーク<xliff:g id="NETWORK_NAME">%s</xliff:g>に接続しました"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPSを設定中です。完了まで最大2分程度かかることがあります。"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPSの設定に失敗しました。数分後にもう一度お試しください。"</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"無線ルーターのセキュリティ設定（WEP）はサポートされていません"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"無線ルーターのセキュリティ設定（TKIP）はサポートされていません"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"認証に失敗しました。もう一度お試しください。"</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"別のWPSセッションが検出されました。数分後にもう一度お試しください。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"ネットワークSSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"セキュリティ"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"電波強度"</string>
@@ -539,21 +561,21 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"保存済み"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"無効"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"インターネット接続不良により無効"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"接続不良のためネットワークが無効になりました。[設定]&gt;[Wi-Fi]画面の[詳細設定]メニューでこの機能をOFFにできます。"</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="3538912605343585226">"保護されているネットワークが利用可能"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" （保護されているネットワークが利用可能）"</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_failed_connect_message" msgid="8491902558970292871">"ネットワークに接続できませんでした"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"切断"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ネットワークから切断できませんでした"</string>
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"ネットワークを保存できませんでした"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"キャンセル"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"別のWi-Fi保護セッションが検出されました。数分後にまたお試しください。"</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"高度なWi-Fi設定"</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>
@@ -570,33 +592,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"ゲートウェイ"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ネットワークプレフィックス長"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"ピアツーピア接続のセットアップ"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"デバイス情報"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi保護設定"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"グループを削除"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"詳細設定"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"使用可能なデバイス"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"デバイスの検索"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"検索しています…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"デバイス名を変更"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"ピアデバイス"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"接続できませんでした。"</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"端末の名前を変更できませんでした。"</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"切断しますか？"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"切断すると、<xliff:g id="PEER_NAME">%1$s</xliff:g>との接続が停止します。"</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"切断すると、<xliff:g id="PEER_NAME">%1$s</xliff:g>と他の<xliff:g id="PEER_COUNT">%2$s</xliff:g>個のデバイスの接続が停止します。"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"招待状のキャンセル"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>との接続への招待をキャンセルしますか？"</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_ap_text" msgid="61237027772641155">"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="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"マナーモード"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"着信音"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"サウンド効果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"着信音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"マナーモード時のバイブレーション"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"バイブと着信音をON"</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>
@@ -616,6 +639,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"着信音と通知音をミュート"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"音楽やメディアをミュート"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"通知音をミュート"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"アラームをミュート"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"着信時のバイブレーション"</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>
@@ -625,14 +653,14 @@
     <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="9015625921245904495">"ホルダーの音声をセットアップするにはタブレットをホルダーに装着する必要があります。"</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"ホルダーの音声をセットアップするには携帯端末をホルダーに装着する必要があります。"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ホルダーの音声を設定するにはタブレットをホルダーに装着する必要があります。"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ホルダーの音声を設定するには端末をホルダーに装着する必要があります。"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"ホルダー装着時の音"</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="account_settings" msgid="6403589284618783461">"アカウント"</string>
     <string name="search_settings" msgid="1910951467596035063">"検索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"検索設定と履歴の管理"</string>
     <string name="display_settings" msgid="7965901687241669598">"ディスプレイ"</string>
@@ -704,7 +732,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -825,7 +853,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"個人情報とダウンロードしたアプリをすべて削除しますか？この操作を元に戻すことはできません。"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"すべて消去"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"ロック解除パターンを入力してください"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"データの初期化を確定するにはロック解除パターンを入力する必要があります。"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"データの初期化を確定するにはロック解除パターンを入力する必要があります。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"System Clearサービスが利用できないため、リセットされませんでした。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"リセットしますか？"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USBストレージ内データを消去"</string>
@@ -840,8 +868,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"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="nosdcard" msgid="2192044794228379224">"USBストレージ内のデータを消去してよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"USBテザリング"</string>
@@ -872,7 +900,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"モバイルネットワーク"</string>
     <string name="location_title" msgid="1029961368397484576">"現在地"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Googleの位置情報サービス"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Wi-Fiやモバイルネットワークなどのデータを使用しておおよその現在地を特定することをアプリに許可する"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"匿名の現在地データのGoogleへの送信を許可します。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>
@@ -917,7 +945,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"MENUキーでヘルプ表示"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"描き終わりの点で指を離します。"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"少なくとも<xliff:g id="NUMBER">%d</xliff:g>つの点を結んでください。"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"パターンが記録されました。"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"パターンが記録されました。"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"確認のため、もう一度パターンを入力してください"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"新しいロック解除パターン:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"確認"</string>
@@ -939,7 +967,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"次へ"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"タブレットの保護"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"携帯端末の保護"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"秘密の画面ロック解除パターンを作成してタブレットを不正使用から守ります。次の画面で指を使って点を好きな順序で結んでください。4つ以上の点を結ぶ必要があります。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"秘密の画面ロック解除パターンを作成してタブレットを不正使用から守ります。次の画面で指を使って、4つ以上の点を好きな順序で結んでください。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"秘密の画面ロック解除パターンを作成して端末を不正使用から守ります。次の画面で指を使って点を好きな順序で結んでください。4つ以上の点を結ぶ必要があります。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"アプリを管理"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"インストール済みアプリを管理、削除する"</string>
@@ -947,7 +975,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"アプリの管理やクイック起動ショートカットのセットアップ"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"アプリの設定"</string>
     <string name="install_applications" msgid="4872012136210802181">"提供元不明のアプリ"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"サードパーティ製アプリのインストールを許可する"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"提供元不明のアプリのインストールを許可する"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"提供元不明のアプリからタブレットや個人データが攻撃を受ける可能性が高くなります。このようなアプリの使用により生じる可能性があるタブレットへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"提供元不明のアプリから携帯端末や個人データが攻撃を受ける可能性が高くなります。このようなアプリの使用により生じる可能性がある携帯端末への損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"詳細設定"</string>
@@ -955,6 +983,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"アプリ情報"</string>
     <string name="storage_label" msgid="8700867073480107253">"メモリ"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"デフォルトでの起動"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"デフォルト"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"画面の互換性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"許可"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"キャッシュ"</string>
@@ -974,6 +1003,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"データを消去"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"アップデートのアンインストール"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"特定の操作で使用するデフォルトのアプリとして設定されています。"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"このアプリによるウィジェットの作成とデータへのアクセスを許可しました。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"設定されていません。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"設定を消去"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"このアプリはお使いの画面用に設計されていない可能性があります。ここでお使いの画面に合わせて設定できます。"</string>
@@ -984,6 +1014,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"サイズ順"</string>
     <string name="show_running_services" msgid="5736278767975544570">"実行中のサービスを表示"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"キャッシュしたプロセスを表示"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"アプリの設定をリセット"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"設定をリセットしますか？"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"この操作により、次の設定がすべてリセットされます:"\n\n" "<li>"無効化されているアプリ"</li>\n" "<li>"無効化されているアプリの通知"</li>\n" "<li>"特定の操作で使用するデフォルトのアプリ"</li>\n" "<li>"アプリのバックグラウンドデータの制限"</li>\n\n" アプリのデータが失われることはありません。"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"アプリをリセット"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"容量を管理"</string>
     <string name="filter" msgid="2018011724373033887">"フィルタ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"フィルタオプションの選択"</string>
@@ -1012,7 +1046,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"このアプリは下記にアクセスする場合があります:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"このアプリは下記にアクセスする場合があります:"</string>
     <string name="computing_size" msgid="1599186977475211186">"計算中..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"パッケージのサイズを計算できません"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"パッケージのサイズを計算できませんでした。"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"サードパーティ製のアプリはインストールされていません。"</string>
     <string name="version_text" msgid="9189073826278676425">"バージョン<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移動"</string>
@@ -1034,6 +1068,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"新しいアプリの優先インストール先を変更する"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"内蔵アプリを無効にしますか？"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"内蔵アプリを無効にすると、他のアプリが正常に動作しなくなることがあります。"</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"通知をOFFにしますか？"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"このアプリの通知をOFFにすると、重要なアラートや更新を見逃すおそれがあります。"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ストレージ使用状況"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"アプリのストレージ使用状況を表示する"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"実行中のサービス"</string>
@@ -1086,19 +1122,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"この入力方法を選択すると、すべての入力内容の収集をアプリ（<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>）に許可することになります。これにはパスワードやクレジットカード番号などの個人情報も含まれます。この入力方法を使用しますか？"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"このスペルチェッカーを選択すると、入力する全文字列の収集をアプリ（<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>）に許可することになります。これにはパスワードやクレジットカード番号などの個人情報も含まれます。このスペルチェッカーを使用しますか？"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"設定"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"言語"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>の設定を開くことができませんでした"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"マウス/トラックパッド"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ポインタの速度"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"ゲーム用コントローラ"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"バイブレーションの使用"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"接続時に、バイブレーションをゲーム用コントローラにリダイレクトします。"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"キーボードレイアウトの選択"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"キーボードレイアウトの設定"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"切り替えるにはCtrl+スペースを押します"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"デフォルト"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"キーボードレイアウト"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"単語リスト"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"ユーザー辞書"</string>
     <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_add_screen_title" msgid="742580720124344291">"フレーズ"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"詳細設定を表示"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"詳細設定を隠す"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"単語:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"ショートカット:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"言語:"</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="8165273379942105271">"単語リストに登録がありません。追加ボタン[+]をタップすると単語を追加できます。"</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"すべての言語"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"すべての言語用"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"その他の言語..."</string>
     <string name="testing" msgid="6584352735303604146">"テスト中"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"タブレット情報"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"携帯電話情報"</string>
@@ -1135,16 +1190,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"アプリ開発オプションを設定する"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USBデバッグ"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB接続時はデバッグモードにする"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"開発端末ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"端末情報を取得できません"</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="7316799925425402244">"USBデバッグは開発専用に設計されています。パソコンと端末の間でデータをコピーする場合や、アプリを通知なしで端末にインストールする場合、ログデータを読み取る場合に使用できます。"</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"開発用の設定を許可しますか？"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"これらの設定は開発専用に設計されています。そのため端末や端末上のアプリが故障したり正常に動作しなくなったりするおそれがあります。"</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USBストレージの保護"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"アプリによるUSBストレージの読み取り権限のリクエストが必要"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USBストレージの保護"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USBストレージが保護されている場合、アプリは外部ストレージからデータを読み取る権限をリクエストする必要があります。"\n\n"一部のアプリについては、デベロッパーによって更新されるまで動作しない可能性があります。"</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SDカードの保護"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"アプリによるSDカードの読み取り権限のリクエストが必要"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SDカードの保護"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SDカードが保護されている場合、アプリは外部ストレージからデータを読み取る権限をリクエストする必要があります。"\n\n"一部のアプリについては、デベロッパーによって更新されるまで動作しない可能性があります。"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"ガジェットを選択"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"ウィジェットを選択"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ウィジェットの作成とアクセスの許可"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ウィジェットを作成すると、<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>は表示されるすべてのデータにアクセスできるようになります。"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>によるウィジェットの作成とデータへのアクセスを常に許可する"</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>
@@ -1162,12 +1228,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"大きい文字サイズ"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"電源ボタンで通話を終了"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"パスワードの音声出力"</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="3264723681038625967">"ウェブスクリプトをインストール"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"ウェブアクセシビリティの拡張"</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>
@@ -1182,14 +1245,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"インストールされているサービスはありません"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"スクリーンリーダーをご利用になりますか？"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkbackは音声で応答するアプリで、目の不自由なユーザーや低視力のユーザーを支援します。Androidマーケットから無料でインストールできます。"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"ウェブスクリプトをインストールしますか？"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"アプリからウェブコンテンツへのアクセスを容易にするためのスクリプトをGoogleからインストールしてもよろしいですか？"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"この機能を有効にすると、タップに対するデバイスの反応が変更されます。有効にしますか？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"説明はありません。"</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_not_available" msgid="3214000535532434353">"電池使用量データがありません。"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1287,7 +1348,7 @@
     <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" msgid="3305141107104670703">"選択したエンジンは実行できません。"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"設定"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"別のエンジンを選択"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"この音声合成エンジンを使用すると、読み上げるすべてのテキストの収集をエンジン（<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>）に許可することになります。これにはパスワードやクレジットカード番号などの個人情報も含まれます。この音声合成エンジンを有効にしますか？"</string>
@@ -1303,7 +1364,7 @@
     <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">"使用前に新エンジンをONにします"</string>
+    <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"使用前に新エンジンを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>
@@ -1320,6 +1381,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"ロック解除パターンを入力してください"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"認証情報をインストールするには、ロック解除パターンを入力する必要があります。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"認証情報ストレージのパスワードを入力してください。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"現在のパスワード:"</string>
@@ -1331,7 +1394,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"認証情報ストレージを消去"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"認証情報ストレージを消去不可"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"認証情報ストレージが有効になりました。"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"認証情報ストレージを使用する前に、ロック解除PINまたはパスワードを設定する必要があります。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"認証情報ストレージを使用するには、画面ロックのPINまたはパスワードを設定する必要があります。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急時の音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"バックアップとリセット"</string>
@@ -1345,8 +1408,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"自動復元"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"アプリを再インストールする際に、バックアップした設定とデータを復元する"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"PCバックアップパスワード"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"デスクトップのフルバックアップは現在保護されていません。"</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"デスクトップのフルバックアップ用のパスワードを変更または削除する場合に選択します"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"デスクトップのフルバックアップは現在保護されていません"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"デスクトップのフルバックアップ用のパスワードを変更または削除する場合にタップします"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Wi-Fiパスワード、ブックマーク、その他の設定とアプリのデータのバックアップを停止し、Googleサーバー上のすべてのコピーを消去しますか？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"デバイス管理の設定"</string>
@@ -1361,9 +1424,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"この管理者は有効であり、アプリ<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">"着信音と通知音"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"システム"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"通話着信音とバイブレーション"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"システム"</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="3747859666621319757">"Wi-Fiネットワーク「<xliff:g id="NETWORK_NAME">%s</xliff:g>」に接続中..."</string>
@@ -1395,7 +1458,9 @@
     <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_failed" msgid="1696499856374109647">"同期失敗"</string>
+    <string name="sync_active" msgid="8476943765960863040">"同期有効"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"同期"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"現在同期で問題が発生しています。しばらくお待ちください。"</string>
     <string name="add_account_label" msgid="7811707265834013767">"アカウントを追加"</string>
     <string name="background_data" msgid="5779592891375473817">"バックグラウンドデータ"</string>
@@ -1406,6 +1471,8 @@
     <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="last_synced" msgid="4242919465367022234">"最終同期日時: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"今すぐ同期…"</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>
@@ -1415,7 +1482,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google Syncへようこそ"</font>\n"このサービスを使用すると、データを同期してどこからでも連絡先や予定などにアクセスできます。"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"アプリの同期設定"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"データと同期"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"パスワードを変更"</string>
@@ -1429,7 +1496,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"このアカウントは一部のアプリに必要です。アカウントを削除するには、タブレットを出荷時設定にリセットする必要があります（個人データはすべて削除されます）。リセットは[設定] &gt; [バックアップとリセット]で行います。"</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"このアカウントは一部のアプリに必要です。アカウントを削除するには、携帯端末を出荷時設定にリセットする必要があります（個人データはすべて削除されます）。リセットは[設定] &gt; [バックアップとリセット]で行います。"</string>
     <string name="provider_label" msgid="7724593781904508866">"プッシュ型登録"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g>を同期"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"手動では同期できません"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"このアイテムの同期は現在無効になっています。この設定を変更するには、バックグラウンドデータと自動同期を一時的にONにします。"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G設定"</string>
@@ -1437,7 +1505,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MACアドレス"</string>
     <string name="enter_password" msgid="4131758584074246224">"ストレージを復号化するパスワードを入力してください"</string>
     <string name="try_again" msgid="4272075051293936921">"もう一度お試しください。"</string>
-    <string name="service_busy" msgid="2325014135156127705">"サービスはビジーです。もう一度お試しください。"</string>
     <string name="delete" msgid="4219243412325163003">"削除"</string>
     <string name="misc_files" msgid="6720680815969643497">"その他のファイル"</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>
@@ -1445,21 +1512,45 @@
     <string name="select_all" msgid="1562774643280376715">"すべて選択"</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="debug_debugging_category" msgid="6781250159513471316">"デバッグ"</string>
+    <string name="debug_app" msgid="8349591734751384446">"デバッグアプリを選択"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"デバッグアプリケーションが設定されていません"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"デバッグアプリケーション: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"アプリを選択"</string>
+    <string name="no_application" msgid="2813387563129153880">"なし"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"デバッガを待機"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"アプリは実行前にデバッガのアタッチを待機します"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"入力"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"描画"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"監視"</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_screen_updates" msgid="5470814345876056420">"表示面の更新を表示"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"更新時にウィンドウの表示面全体を点滅させる"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU表示の更新を表示"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPUでの描画時にウィンドウ内の表示を点滅させる"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"HWオーバーレイを無効"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"画面合成に常にGPUを使用する"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"トレースを有効にする"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"有効なトレースを選択"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"現在有効なトレースはない"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"現在<xliff:g id="NUM">%1$d</xliff:g>件のトレースが有効"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"現在トレースはすべて有効"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"レイアウト境界を表示"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"クリップの境界線、マージンなどを表示"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU使用状況を表示"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"現在のCPU使用状況をオーバーレイ表示する"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPUレンダリングを使用"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"アプリで2Dハードウェアアクセラレーションを使用"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"2D描画にGPUを常に使用する"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"GPUレンダリングのプロフィール作成"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"adb shell dumpsys gfxinfoでレンダリング時間を測定"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"ウィンドウアニメスケール"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"トランジションアニメスケール"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator再生時間スケール"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"アプリ"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"アクティビティを保持しない"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ユーザーが離れたアクティビティを直ちに破棄する"</string>
@@ -1473,13 +1564,14 @@
     <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_menu_metered" msgid="5056695223222541863">"モバイルアクセスポイント"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"データの自動同期"</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="8621855507876539282">"この期間中にデータを使用したアプリはありません。"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"フォアグラウンド"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"バックグラウンド"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"タブレットでの記録です。携帯通信会社のデータ利用明細は異なる可能性があります。"</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"携帯端末での記録です。携帯通信会社のデータ利用明細は異なる可能性があります。"</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"制限あり"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"モバイルデータを無効にしますか？"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"モバイルデータの制限を設定する"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4Gデータの制限を設定する"</string>
@@ -1490,33 +1582,45 @@
     <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_list_mobile" msgid="5588685410495019866">"モバイル"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"なし"</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="8430240158135453271">"アプリの設定を表示"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"バックグラウンドデータを制限する"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"モバイルデータネットワーク上でのみバックグラウンドデータを無効にします。Wi-Fiが使用可能な場合はWi-Fiが使用されます。"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"モバイルネットワークでバックグラウンドデータを無効にし、可能な場合はモバイル以外を使用。"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"このアプリのバックグラウンドデータを制限するには、最初にモバイルデータの上限を設定してください。"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"バックグラウンドデータを制限しますか？"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"この機能をONにすると、Wi-Fiが使用できないとき、バックグラウンドデータに依存するアプリが停止する可能性があります。"\n\n"データ使用をより適切に管理できるオプションがアプリの設定画面にないか確認してください。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"この機能をONにすると、モバイルネットワークしか使用できない場合にバックグラウンドデータに依存するアプリが停止する可能性があります。"\n\n"データ使用をより適切に管理できるオプションがアプリの設定画面にないかどうかを確認してください。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"バックグラウンドデータを制限できるのは、モバイルデータの上限が設定済みの場合のみです。"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"データ自動同期をONにしますか？"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"ウェブでアカウントに変更を加えると自動的にタブレットに反映されます。"\n\n"Googleアカウントなど、アカウントによっては、タブレットでウェブに変更を加えた場合も自動的に反映されます。"\n\n"各アカウント内で同期する情報の種類は[設定]&gt;[アカウント]で選択できます。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"ウェブでアカウントに変更を加えると自動的に携帯端末に反映されます。"\n\n"Googleアカウントなど、アカウントによっては、携帯端末でウェブに変更を加えた場合も自動的に反映されます。"\n\n"各アカウント内で同期する情報の種類は[設定]&gt;[アカウント]で選択できます。"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"データ自動同期をOFFにしますか？"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"無効にすると、データと電池の使用を節約できますが、最新情報を取得するには手動で各アカウントを同期する必要があります。また、更新があったときに通知されません。"</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_warning_editor_title" msgid="3704136912240060339">"データ使用の警告の設定"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"データ使用の上限の設定"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"データ使用上限の設定"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"<xliff:g id="NETWORKS">%1$s</xliff:g>データ接続は指定の制限に達した場合無効になります。"\n\n"データ利用はタブレットで記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"<xliff:g id="NETWORKS">%1$s</xliff:g>データ接続は指定の制限に達した場合無効になります。"\n\n"データ利用は携帯端末で記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"モバイルデータ接続は指定の制限に達した場合無効になります。"\n\n"データ利用はタブレットで記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"モバイルデータ接続は指定の制限に達した場合無効になります。"\n\n"データ利用は携帯端末で記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"バックグラウンドデータを制限しますか？"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: 約<xliff:g id="TOTAL">%1$s</xliff:g>使用"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: 約<xliff:g id="TOTAL">%1$s</xliff:g>使用"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: 約<xliff:g id="TOTAL">%1$s</xliff:g>使用（タブレットでの記録。携帯通信会社の利用明細は異なる場合があります）"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: 約<xliff:g id="TOTAL">%1$s</xliff:g>使用（携帯端末での記録。携帯通信会社の利用明細は異なる場合があります）"</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"モバイルアクセスポイント"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"モバイルアクセスポイントであるWi-Fiネットワークを選択します。このネットワークの使用をバックグラウンド中のアプリに禁止することができます。このネットワークで大量のダウンロードをする前に、アプリが警告することもできます。"</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"モバイルネットワーク"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fiネットワーク"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"モバイルアクセスポイントを選択するには、Wi-FiをONにします。"</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>
@@ -1542,12 +1646,14 @@
     <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_edit" msgid="8647191407179996943">"VPNプロフィールの編集"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"VPNプロフィールの追加"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"プロフィールを編集"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"プロフィールを削除"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"ネットワークに接続できません。しばらくしてからもう一度お試しください。"</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"証明書がありません。プロフィールを編集してください。"</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>
@@ -1556,25 +1662,7 @@
     <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="477937585801538951">"タッチガイドを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="3973201880357468747">"指で触れたアイテムを有効にするにはタップします。指をスライドさせて<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="8764686624055084454">"リストをスクロールするには、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="3055831259260848004">"チュートリアルを完了しました。終了するには、[<xliff:g id="FINISH">%s</xliff:g>]ボタンを探してタップしてください。"</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"スペルチェッカー"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"スペルチェック"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"現在のフルバックアップパスワードをここに入力してください"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"フルバックアップ用の新しいパスワードをここに入力してください"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"新しいフルバックアップパスワードをここに再入力してください"</string>
@@ -1582,4 +1670,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"キャンセル"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"その他のシステムアップデート"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"ユーザーと制限"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"ユーザー"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"ユーザーを追加"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"詳細情報の編集"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"ユーザー情報"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"名前"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"コンテンツ制限"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"PINが必要"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"コンテンツレーティング"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"システムアプリ"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"インストール済みアプリ"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"破棄"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"ユーザーを削除"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"ユーザーを削除しますか？"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"ユーザーとすべての関連データを端末から削除してもよろしいですか？"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"通知を表示"</string>
+    <string name="help_label" msgid="1107174367904110532">"ヘルプ"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 87eee7b..571d522 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"연결을 끊는 중…"</item>
     <item msgid="1634960474403853625">"연결 끊김"</item>
     <item msgid="746097431216080650">"실패"</item>
+    <item msgid="6367044185730295334">"차단됨"</item>
+    <item msgid="503942654197908005">"연결 불량 일시적으로 방지"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 연결을 끊는 중..."</item>
     <item msgid="197508606402264311">"연결 끊김"</item>
     <item msgid="8578370891960825148">"실패"</item>
+    <item msgid="5660739516542454527">"차단됨"</item>
+    <item msgid="1805837518286731242">"연결 상태 불량 일시적으로 방지"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"누름 버튼"</item>
@@ -141,12 +146,12 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"항상"</item>
-    <item msgid="844721238536786870">"연결되어 있는 경우에만"</item>
+    <item msgid="844721238536786870">"충전 중인 경우에만"</item>
     <item msgid="2990218920631468642">"안함(데이터 사용 증가)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"항상"</item>
-    <item msgid="7433294150916905997">"연결되어 있는 경우에만"</item>
+    <item msgid="7433294150916905997">"충전 중인 경우에만"</item>
     <item msgid="1390404486722375028">"안함"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"없음"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"액세스 포인트의 PIN"</item>
-    <item msgid="7364462169350112617">"이 기기의 PIN"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"고정"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"이동식 SD 카드"</item>
     <item msgid="4498124044785815005">"시스템에서 결정"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"사용 안함"</item>
-    <item msgid="4804571292609523335">"진동"</item>
-    <item msgid="595707141547423573">"음소거"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"짧게"</item>
     <item msgid="2560532955514699713">"보통"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"애니메이션 배율 5x"</item>
     <item msgid="6660750935954853365">"애니메이션 배율 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"애니메이션 사용 안함"</item>
+    <item msgid="1138649021950863198">"애니메이션 배율 .5x"</item>
+    <item msgid="4394388961370833040">"애니메이션 배율 1x"</item>
+    <item msgid="8125427921655194973">"애니메이션 배율 1.5x"</item>
+    <item msgid="3334024790739189573">"애니메이션 배율 2x"</item>
+    <item msgid="3170120558236848008">"애니메이션 배율 5x"</item>
+    <item msgid="1069584980746680398">"애니메이션 배율 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"표준 제한"</item>
     <item msgid="4071574792028999443">"백그라운드 프로세스 없음"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 85a1ffc..0bfda48 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"예"</string>
     <string name="no" msgid="6731231425810196216">"아니요"</string>
+    <string name="create" msgid="3578857613172647409">"만들기"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"화면 잠금 시 블루투스 다이얼러 사용 방지"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"블루투스 장치"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"장치 이름"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"기기 설정"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"프로필 설정"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"이름을 설정하지 않아 계정 이름 사용"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"장치 검색"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"태블릿 이름 바꾸기"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"페어링 중..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"이름이 없는 블루투스 기기"</string>
     <string name="progress_scanning" msgid="192587958424295789">"검색 중"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"페어링하려면 터치하세요."</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"근처에 블루투스 기기가 없습니다."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"블루투스 페어링 요청"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"페어링 요청"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하려면 터치"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"<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="device_picker" msgid="8398232791303186677">"블루투스 기기 선택기"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"블루투스 권한 요청"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"앱에서 블루투스를 사용하려고 합니다. 허용하시겠습니까?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"태블릿의 앱이 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에서 사용자의 태블릿을 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\'<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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"확인"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"입력한 호스트 이름이 잘못되었습니다."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"입력한 제외목록의 형식이 올바르지 않습니다. 제외된 도메인을 쉼표로 구분한 목록을 입력하시기 바랍니다."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"포트를 입력해야 합니다."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"포트 정보를 입력해야 합니다."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"호스트가 비어 있는 경우 포트를 입력할 수 없습니다."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"입력한 포트가 올바르지 않습니다."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP 프록시는 브라우저에서 사용되며 다른 앱에서는 사용되지 않을 수 있습니다."</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"변경사항을 적용하려면 USB 케이블을 다시 연결해야 합니다."</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"변경사항을 적용하려면 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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB 저장소가 마운트되지 않았습니다."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"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="6691584887397909775">"이제 USB 저장소를 안전하게 제거할 수 있습니다."</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"이제 SD 카드를 안전하게 제거할 수 있습니다."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB 저장소를 대용량 저장장치로 사용 중입니다."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD 카드를 대용량 저장장치로 사용 중입니다."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"이제 USB 저장소를 안전하게 제거할 수 있습니다."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"이제 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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB 저장소가 읽기전용으로 마운트되었습니다."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD 카드가 읽기전용으로 마운트되었습니다."</string>
     <string name="skip_label" msgid="47510779345218297">"건너뛰기"</string>
     <string name="next_label" msgid="4693520878012668114">"다음"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"언어"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"데이터 로밍을 허용하면 높은 로밍 요금이 부과될 수 있습니다."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"데이터 로밍을 허용하시겠습니까?"</string>
     <string name="networks" msgid="6333316876545927039">"운영자 선택"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"네트워크 운영자 선택"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"날짜 및 시간"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"날짜 형식 선택"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"얼굴 인식 잠금해제 개선"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"동적 이미지 확인"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"눈 깜박임 필요"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"계정, 설정, 다운로드한 앱과 해당 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력해야 합니다. 태블릿 암호화를 취소하려면 초기화를 수행해야 하며 이 때 데이터는 모두 지워집니다."\n\n"암호화에는 한 시간 이상이 걸립니다. 배터리가 충전되었을 때 시작해야 하며 암호화가 완료될 때까지 전원을 연결해야 합니다. 암호화 도중 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"계정, 설정, 다운로드한 앱과 해당 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력해야 합니다. 암호화를 취소하려면 초기화를 수행해야 하며 이 때 데이터는 모두 지워집니다."\n\n"암호화에는 한 시간 이상이 걸립니다. 배터리가 충전되었을 때 시작해야 하며 암호화가 완료될 때까지 전원을 연결해야 합니다. 암호화 도중 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 태블릿 암호화를 해제할 수 있습니다."\n\n"암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 태블릿의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 전원을 켤 때마다 숫자 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="2029407131227814893">"배터리를 충전한 다음 다시 시도하세요."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"충전기를 연결한 다음 다시 시도하세요."</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_dialog_need_password_message" msgid="4071395977297369642">"암호화를 시작하기 전에 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"암호화하시겠습니까?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"암호화 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화는 한 시간 이상이 걸리며 그 동안 태블릿은 몇 번 다시 시작됩니다."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"암호화 작업은 되돌릴 수 없으며 중단하면 데이터를 잃게 됩니다. 암호화는 한 시간 이상이 걸리며 그 동안 휴대전화는 몇 번 다시 시작됩니다."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"암호화 중"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"태블릿을 암호화하는 동안 잠시 기다려 주세요. <xliff:g id="PERCENT">^1</xliff:g>% 완료되었습니다."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"휴대전화를 암호화하는 동안 잠시 기다려 주세요. <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="2223340178473871064">"비밀번호 입력"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"암호화하지 못했습니다."</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"암호화가 중단되어 완료할 수 없습니다. 따라서 태블릿의 데이터에 더 이상 액세스할 수 없습니다. "\n\n" 태블릿을 다시 사용하려면 초기화해야 합니다. 초기화한 후 태블릿을 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"암호화가 중단되어 완료할 수 없습니다. 따라서 휴대전화의 데이터에 더 이상 액세스할 수 없습니다. "\n\n"휴대전화를 다시 사용하려면 초기화해야 합니다. 초기화한 후 휴대전화를 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"화면 잠금 선택"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"암호화가 중단되어 완료할 수 없습니다. 따라서 태블릿의 데이터에 더 이상 액세스할 수 없습니다. "\n\n" 태블릿을 다시 사용하려면 초기화해야 합니다. 초기화한 후 태블릿을 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"암호화가 중단되어 완료할 수 없습니다. 따라서 휴대전화의 데이터에 더 이상 액세스할 수 없습니다. "\n\n"휴대전화를 다시 사용하려면 초기화해야 합니다. 초기화한 후 휴대전화를 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"입력 방법 전환"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"화면 잠금 선택"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"백업 잠금 선택"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"화면 잠금"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"화면 잠금 변경"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"얼굴인식 잠금해제"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"패턴"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"비밀번호"</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>
@@ -362,44 +367,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"비밀번호는 <xliff:g id="NUMBER">%d</xliff:g>자 미만이어야 합니다."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN은 <xliff:g id="NUMBER">%d</xliff:g>자 미만이어야 합니다."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN에는 숫자 0-9만 사용할 수 있습니다."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"기기 관리자가 최근 PIN 사용을 허용하지 않습니다."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"비밀번호에 잘못된 글자가 들어 있습니다."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"비밀번호에는 적어도 하나의 문자가 포함되어야 합니다."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"비밀번호에는 적어도 하나의 숫자가 포함되어야 합니다."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"비밀번호에는 적어도 하나의 기호가 포함되어야 합니다."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"비밀번호에는 적어도 하나의 문자가 포함되어야 합니다."</item>
-    <item quantity="other" msgid="7278096339907683541">"비밀번호에는 적어도 %d개의 문자가 포함되어야 합니다."</item>
+    <item quantity="one" msgid="3063853802158131458">"비밀번호에는 적어도 하나의 문자가 포함되어야 합니다."</item>
+    <item quantity="other" msgid="8186027808415585970">"비밀번호에는 적어도 %d개의 문자가 포함되어야 합니다."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"비밀번호에는 적어도 하나의 소문자가 포함되어야 합니다."</item>
-    <item quantity="other" msgid="588499075580432178">"비밀번호에는 적어도 %d개의 소문자가 포함되어야 합니다."</item>
+    <item quantity="one" msgid="5583986519662091001">"비밀번호에는 적어도 하나의 소문자가 포함되어야 합니다."</item>
+    <item quantity="other" msgid="2693910942679679225">"비밀번호에는 적어도 %d개의 소문자가 포함되어야 합니다."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"비밀번호에는 적어도 하나의 대문자가 포함되어야 합니다."</item>
-    <item quantity="other" msgid="2183090598541826806">"비밀번호에는 적어도 %d개의 대문자가 포함되어야 합니다."</item>
+    <item quantity="one" msgid="2611909966725502768">"비밀번호에는 적어도 하나의 대문자가 포함되어야 합니다."</item>
+    <item quantity="other" msgid="3030801209112209245">"비밀번호에는 적어도 %d개의 대문자가 포함되어야 합니다."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"비밀번호에는 적어도 하나의 숫자가 포함되어야 합니다."</item>
-    <item quantity="other" msgid="995673409754935278">"비밀번호에는 적어도 %d개의 숫자가 포함되어야 합니다."</item>
+    <item quantity="one" msgid="3820355568839621231">"비밀번호에는 적어도 하나의 숫자가 포함되어야 합니다."</item>
+    <item quantity="other" msgid="4703982391407595924">"비밀번호에는 적어도 %d개의 숫자가 포함되어야 합니다."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"비밀번호에는 적어도 하나의 특수 기호가 포함되어야 합니다."</item>
-    <item quantity="other" msgid="3047460862484105274">"비밀번호에는 적어도 %d개의 특수 기호가 포함되어야 합니다."</item>
+    <item quantity="one" msgid="8456579939292408631">"비밀번호에는 적어도 하나의 특수 기호가 포함되어야 합니다."</item>
+    <item quantity="other" msgid="1221290525051187757">"비밀번호에는 적어도 %d개의 특수 기호가 포함되어야 합니다."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"비밀번호에는 글자가 아닌 문자가 한 개 이상 포함되어야 합니다."</item>
-    <item quantity="other" msgid="5574191164708145973">"비밀번호에는 적어도 %d개 이상의 글자가 아닌 문자가 포함되어야 합니다."</item>
+    <item quantity="one" msgid="4594051152085925921">"비밀번호에는 글자가 아닌 문자가 한 개 이상 포함되어야 합니다."</item>
+    <item quantity="other" msgid="3952508584649046404">"비밀번호에는 적어도 %d개 이상의 글자가 아닌 문자가 포함되어야 합니다."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"장치 관리자가 최근 비밀번호 사용을 허용하지 않습니다."</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"기기 관리자가 최근 비밀번호 사용을 허용하지 않습니다."</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="lock_setup" msgid="1759001157415978959">"설정 완료"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"설정이 완료되었습니다."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>와(과) 페어링하려면 기기 필수 비밀번호를 입력하세요."</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_enter_pin_other_device" msgid="4637977124526813470">"또한 다른 기기에 이 PIN을 입력해야 할 수도 있습니다."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"또한 경우에 따라 다른 기기에 이 패스키를 입력해야 합니다."</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="2796550001376088433">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>와(과) 페어링하려면 <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>을(를) 입력한 다음 Return 또는 Enter 키를 누르세요."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN 또는 패스키가 잘못되어 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하지 못했습니다."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<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_connecting_error_message" msgid="229861986106185022">"<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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"휴대전화가 다른 기기와 접촉하면 데이터 교환이 시작됩니다."</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"태블릿이 다른 기기와 접촉하면 데이터 교환이 시작됩니다."</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"휴대전화가 다른 기기와 접촉하면 데이터 교환 허용"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"앱 콘텐츠를 NFC를 통해 전송할 준비가 되었습니다."</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"앱 콘텐츠를 NFC를 통해 전송할 준비 완료"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"사용 안함"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC가 꺼져 있어 사용할 수 없음"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"이 기능을 사용하도록 설정하면 기기를 서로 가까이 두어 앱 콘텐츠를 다른 NFC 지원 기기로 전송할 수 있습니다. 예를 들어 브라우저 페이지, YouTube 동영상, 주소록 등을 전송할 수 있습니다."\n\n"서로 뒷면을 향하는 방식 등으로 기기를 맞댄 후에 화면을 터치하기만 하면 됩니다. 전송할 대상은 앱이 결정합니다."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"네트워크 서비스 검색"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"다른 기기의 앱에서 이 기기의 앱을 검색하도록 허용"</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="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_setup_wizard_title" msgid="70277346338812325">"Wi-Fi 선택"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"무선인터넷을 켜는 중"</string>
     <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi 사용 중지 중..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"오류"</string>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"네트워크를 검색할 수 없습니다."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"네트워크 알림"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"개방형 네트워크를 사용할 수 있을 때 알림"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"접속 불량 방지"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"인터넷 연결이 원활하지 않은 경우 Wi-Fi 네트워크를 사용하지 않음"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"불량 네트워크 방지"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"인터넷 연결이 원활하지 않은 경우 Wi-Fi 네트워크를 사용하지 않음"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"절전 모드 동안 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_wps_pbc" msgid="2668564692207863017">"WPS 푸시 버튼"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 입력"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Wi-Fi 네트워크를 찾는 중…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"다른 네트워크…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"더보기"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"자동 설정(WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"고급 옵션 표시"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"액세스 포인트에서 PIN 입력"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS 설정"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"액세스 포인트에 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_wps_setup_title" msgid="6034518116333042484">"WPS(Wi-Fi 간편 설정)"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS을 시작하는 중…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"공유기에서 Wi-Fi Protected 설정 버튼을 누르세요. \'WPS\'라고 줄여 부르기도 하며 다음 기호를 포함할 수도 있습니다."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Wi-Fi 공유기에 개인 식별 번호 <xliff:g id="NUMBER">%1$s</xliff:g>을(를) 입력하세요. 설정을 완료하는 데 최대 2분이 소요됩니다."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 성공. 네트워크에 연결 중…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결됨"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS를 이미 처리하고 있으며 완료하는 데 최대 2분이 소요됩니다."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS가 실패하였습니다. 잠시 후 다시 시도해 주세요."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"무선 공유기 보안 설정(WEP)은 지원되지 않습니다."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"무선 공유기 보안 설정(TKIP)은 지원되지 않습니다."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"인증하지 못했습니다. 다시 시도하세요."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"다른 WPS 세션이 감지되었습니다. 잠시 후 다시 시도해 주세요."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"네트워크 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"보안"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"신호 강도"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"저장됨"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"사용 중지됨"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"인터넷 접속 불량 방지"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"연결 상태가 좋지 않아 네트워크가 차단되었습니다. 설정 &gt; Wi-Fi 화면의 고급 메뉴 항목에서 네트워크 차단을 사용 중지할 수 있습니다."</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="3538912605343585226">"Protected 네트워크 사용 가능"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (Protected 네트워크 사용 가능)"</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_failed_connect_message" msgid="8491902558970292871">"네트워크 연결 실패"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"저장 안함"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"네트워크 기록 삭제 실패"</string>
     <string name="wifi_save" msgid="3331121567988522826">"저장"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"네트워크 저장 실패"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"취소"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"다른 Wi-Fi Protected 세션이 감지되었습니다. 몇 분 후에 다시 시도해 주세요."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"게이트웨이"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"네트워크 접두어 길이"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"P2P 연결 설정"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"기기 정보"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi Protected 설정"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"그룹 삭제"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"고급"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"기기 목록"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"기기 검색"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"검색 중…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"기기 이름 변경"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"P2P 기기"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"연결할 수 없습니다."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"기기 이름을 바꾸지 못했습니다."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"연결을 해제하시겠습니까?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"연결을 중단하면 <xliff:g id="PEER_NAME">%1$s</xliff:g>와(과)의 연결이 끊어집니다."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"연결을 중단하면 <xliff:g id="PEER_NAME">%1$s</xliff:g> 외 다른 <xliff:g id="PEER_COUNT">%2$s</xliff:g>개 기기와의 연결이 끊어집니다."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"초대를 취소하시겠습니까?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>와(과) 연결하려는 초대를 취소하시겠습니까?"</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_ap_text" msgid="61237027772641155">"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="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"무음 모드"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"볼륨"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"음악 효과"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"모드 설정"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"무음 시 진동"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"진동 및 벨소리"</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>
@@ -606,7 +629,7 @@
     <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="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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"벨소리 및 알림 음소거"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"음악 및 기타 미디어 음소거"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"알림 음소거"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"알람 음소거"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"전화 수신 시 진동"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"태블릿을 도킹해야 오디오 도크를 설정할 수 있습니다."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"휴대전화를 도킹해야 오디오 도크를 설정할 수 있습니다."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"태블릿을 도킹해야 오디오 도크를 설정할 수 있습니다."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"휴대전화를 도킹해야 오디오 도크를 설정할 수 있습니다."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"도크 삽입음"</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="account_settings" msgid="6403589284618783461">"계정"</string>
     <string name="search_settings" msgid="1910951467596035063">"검색"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"검색 설정 및 기록 관리"</string>
     <string name="display_settings" msgid="7965901687241669598">"디스플레이"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -768,7 +796,7 @@
     <string name="battery_level_title" msgid="2965679202786873272">"배터리 수준"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"액세스 포인트(APN) 편집"</string>
-    <string name="apn_not_set" msgid="4974192007399968164">"설정되지 않았습니다."</string>
+    <string name="apn_not_set" msgid="4974192007399968164">"설정되지 않음"</string>
     <string name="apn_name" msgid="4115580098369824123">"이름"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"프록시"</string>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"모든 개인 정보와 다운로드한 앱을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"모두 지우기"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"잠금해제 패턴을 그리세요."</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"공장 초기화를 실행하려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"초기화를 실행하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"시스템 지우기 서비스를 사용할 수 없어 초기화하지 못했습니다."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"재설정하시겠습니까?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB 저장소 지우기"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"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="nosdcard" msgid="2192044794228379224">"USB 저장소를 지우려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"USB 테더링"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"모바일 네트워크"</string>
     <string name="location_title" msgid="1029961368397484576">"사용자 위치"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google 위치 서비스"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"앱에서 Wi-Fi 및 모바일 네트워크와 같은 소스의 데이터를 사용하여 사용자의 대략적인 위치를 판단할 수 있게 합니다."</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"익명의 위치 정보를 Google에 전송하도록 허용합니다. 또한 허용된 앱에서 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"도움말을 보려면 메뉴를 누르세요."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"완료되면 손가락을 뗍니다."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"<xliff:g id="NUMBER">%d</xliff:g>개 이상의 점을 연결합니다. 다시 시도하세요."</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"패턴이 기록되었습니다."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"패턴이 기록되었습니다."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"확인을 위해 패턴 다시 그리기"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"새 잠금해제 패턴:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"확인"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"다음"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"태블릿 보안 설정"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"휴대전화 보안 설정"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 태블릿을 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 점을 연결하세요. 최소한 4개의 점을 연결해야 합니다. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 태블릿을 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 점을 연결하세요. 최소한 4개의 점을 연결해야 합니다. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 휴대전화를 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 최소한 4개의 점을 연결하세요. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"앱 관리"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"설치된 앱 관리 및 제거"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"앱 관리, 빠른실행 바로가기 설정"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"앱 설정"</string>
     <string name="install_applications" msgid="4872012136210802181">"알 수 없는 소스"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"마켓에 등록되지 않은 앱 설치 허용"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"알 수 없는 출처의 앱 설치 허용"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"태블릿 및 개인 정보는 출처를 알 수 없는 앱의 공격에 매우 취약합니다. 이러한 앱을 사용하여 발생할 수 있는 태블릿 손상이나 데이터 손실에 대해 사용자에게 책임이 있음에 동의합니다."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"휴대전화 및 개인 정보는 출처를 알 수 없는 앱의 공격에 매우 취약합니다. 이러한 앱을 사용하여 발생할 수 있는 휴대전화 손상이나 데이터 손실에 대해 사용자에게 책임이 있음에 동의합니다."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"고급 설정"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"앱 정보"</string>
     <string name="storage_label" msgid="8700867073480107253">"저장공간"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"기본으로 실행"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"기본"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"화면 호환성"</string>
     <string name="permissions_label" msgid="2605296874922726203">"권한"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"캐시"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"데이터 지우기"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"업데이트 제거"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"이 앱을 해당 작업에 대한 기본 프로그램으로 실행하도록 선택했습니다."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"이 앱이 위젯을 만들고 자체 데이터에 액세스할 수 있도록 선택했습니다."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"기본값이 설정되지 않았습니다."</string>
     <string name="clear_activities" msgid="7408923511535174430">"기본 작업 지우기"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"이 앱은 사용 중인 화면에 맞게 개발되지 않았을 수 있습니다. 여기에서 어떻게 앱을 화면에 맞출지 선택할 수 있습니다."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"크기순 정렬"</string>
     <string name="show_running_services" msgid="5736278767975544570">"실행 중인 서비스 표시"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"캐시된 프로세스 표시"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"앱 환경설정 재설정"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"앱 환경설정을 재설정하시겠습니까?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"이 작업을 수행하면 다음 환경설정이 모두 재설정됩니다."\n\n" "<li>"사용 중지된 앱"</li>\n" "<li>"사용 중지된 앱 알림"</li>\n" "<li>"작업을 수행할 때 사용하는 기본 애플리케이션"</li>\n" "<li>"앱에 대한 백그라운드 데이터 제한"</li>\n\n" 앱 데이터는 손실되지 않습니다."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"앱 재설정"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"공간 관리"</string>
     <string name="filter" msgid="2018011724373033887">"필터"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"필터 옵션 선택"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"이 앱은 태블릿에서 다음에 액세스할 수 있습니다."</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"이 앱은 휴대전화의 다음 항목에 액세스할 수 있습니다."</string>
     <string name="computing_size" msgid="1599186977475211186">"계산 중..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"패키지 크기를 계산할 수 없습니다."</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"패키지 크기를 계산할 수 없습니다."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"설치된 타사 앱이 없습니다."</string>
     <string name="version_text" msgid="9189073826278676425">"버전 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"이동"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"새 앱의 기본 설치 위치를 변경합니다."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"내장 앱을 사용중지하시겠습니까?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"내장 앱을 사용중지하면 다른 앱에 예기치 않은 오류가 발생할 수 있습니다."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"알림을 사용 중지하시겠습니까?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"이 앱에서 알림을 사용하도록 설정하지 않으면 중요한 알리미와 업데이트를 놓칠 수 있습니다."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"저장공간 사용량"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"앱에서 사용 중인 용량 보기"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"실행 중인 서비스"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 앱에서 지원하는 이 입력 방법을 사용하면 비밀번호 및 신용카드 번호와 같은 개인 정보를 비롯하여 입력한 모든 텍스트가 수집될 수 있습니다. 사용하시겠습니까?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> 앱에서 지원하는 이 맞춤법 검사기를 사용하면 비밀번호 및 신용카드 번호와 같은 개인 정보를 비롯하여 입력한 모든 텍스트가 수집될 수 있습니다. 사용하시겠습니까?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"설정"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"언어"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> 설정을 열지 못했음"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"마우스/트랙패드"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"포인터 속도"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"게임 컨트롤러"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"진동 사용"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"연결되면 진동을 게임 컨트롤러에 리디렉션함"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"키보드 레이아웃 선택"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"키보드 레이아웃 설정"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"전환하려면 Control-Spacebar를 누름"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"기본값"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"키보드 레이아웃"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"사용자 사전"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"개인 사전"</string>
     <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_add_screen_title" msgid="742580720124344291">"구문"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"옵션 더보기"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"옵션 숨기기"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"확인"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"단어:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"바로가기:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"언어:"</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="8165273379942105271">"사용자 사전에 단어가 없습니다. 추가(+) 버튼을 터치하여 단어를 추가할 수 있습니다."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"모든 언어"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"모든 언어로 설정"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"다른 언어"</string>
     <string name="testing" msgid="6584352735303604146">"테스트 중"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"태블릿 정보"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"휴대전화 정보"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"앱 개발 옵션 설정"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 디버깅"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB가 연결된 경우 디버그 모드"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"개발 장치 ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"기기 정보가 없습니다."</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="7316799925425402244">"USB 디버깅은 개발용으로만 설계되었습니다. 이 기능을 사용하면 컴퓨터와 기기 간에 데이터를 복사하고 알림 없이 기기에 앱을 설치하며 로그 데이터를 읽을 수 있습니다."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"개발자 설정을 허용하시겠습니까?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"이 설정은 개발자용으로만 설계되었습니다. 이 설정을 사용하면 기기 및 애플리케이션에 예기치 않은 중단이나 오류가 발생할 수 있습니다."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB 저장소 보호"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"USB 저장소를 읽으려면 앱이 권한을 요청해야 합니다."</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB 저장소를 보호하시겠습니까?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB 저장소를 보호하도록 설정한 경우 앱이 외부 저장소에서 데이터를 읽을 수 있는 권한을 요청해야 합니다."\n\n"일부 앱은 개발자가 업데이트할 때까지 작동하지 않을 수 있습니다."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD 카드 보호"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"SD카드를 읽으려면 앱이 권한을 요청해야 합니다."</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD 카드를 보호하시겠습니까?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD 카드를 보호하도록 설정한 경우 앱이 외부 저장소에서 데이터를 읽을 수 있는 권한을 요청해야 합니다."\n\n"일부 앱은 개발자가 업데이트할 때까지 작동하지 않을 수 있습니다."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"가젯 선택"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"위젯 선택"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"위젯을 만들고 액세스를 허용하시겠습니까?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"위젯을 만든 다음에는 <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>에서 위젯이 표시하는 모든 데이터에 액세스할 수 있습니다."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>에서 위젯을 만들고 자체 데이터에 액세스할 수 있도록 항상 허용"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"텍스트 확대"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"전원 버튼으로 통화 종료"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"비밀번호 말하기"</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="3264723681038625967">"웹 스크립트 설치"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"웹 접근성 향상"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"설치된 서비스가 없습니다."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"스크린 리더가 필요하십니까?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack은 시각 장애인을 위한 음성 피드백을 제공합니다. Android 마켓에서 무료로 설치하시겠습니까?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"웹 스크립트를 설치하시겠습니까?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"앱에 Google에서 제공하는 스크립트를 설치하도록 허용하시겠습니까? 설치하면 웹 콘텐츠에 더 쉽게 액세스할 수 있습니다."</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"이 기능을 사용하면 기기가 터치에 반응하는 방식이 바뀝니다. 사용하시겠습니까?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"제공된 설명이 없습니다."</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_not_available" msgid="3214000535532434353">"배터리 사용 데이터가 없습니다."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"선택한 엔진을 실행할 수 없습니다."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"구성"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"다른 엔진 선택"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"이 음성 합성 엔진은 비밀번호와 신용카드 번호 등의 개인 데이터를 비롯한 모든 음성 데이터를 수집할 수 있습니다. 이것은 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 엔진의 기능입니다. 음성 합성 엔진을 사용하도록 설정하시겠습니까?"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"사용 전에 새 엔진을 사용 설정하세요."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"잠금해제 패턴을 그리세요."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"자격증명 설치를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"자격증명 저장소 비밀번호를 입력하세요."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"현재 비밀번호:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"자격증명 저장소가 삭제되었습니다."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"자격증명 저장소를 삭제하지 못했습니다."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"자격증명 저장소를 사용합니다."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"자격증명 저장소를 사용하려면 먼저 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"자격증명 저장소를 사용하려면 먼저 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"긴급 신호음"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"긴급 통화 중 동작 설정"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"백업 및 초기화"</string>
@@ -1341,10 +1404,10 @@
     <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="4235615056371993807">"앱을 다시 설치하면 백업된 설정과 데이터가 복원됩니다."</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"앱을 다시 설치하면 백업된 설정과 데이터 복원"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"데스크톱 백업 비밀번호"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"데스크톱 전체 백업에 비밀번호가 설정되어 있지 않습니다."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"데스크톱 전체 백업에 대한 비밀번호를 변경하거나 삭제하려면 선택하세요."</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"데스크톱 전체 백업에 비밀번호가 설정되어 있지 않습니다."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"데스크톱 전체 백업에 대한 비밀번호를 변경하거나 삭제하려면 터치하세요."</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Wi-Fi 비밀번호, 북마크, 기타 설정 및 앱 데이터 백업을 중지하고 Google 서버에 있는 모든 사본을 지우시겠습니까?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"기기 관리 설정"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"관리자가 활성 상태이며 <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">"벨소리 및 알림"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"알림"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"시스템"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"전화 벨소리 및 진동"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"시스템"</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="3747859666621319757">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결 중..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"동기화 실패"</string>
+    <string name="sync_active" msgid="8476943765960863040">"동기화 사용 중"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"동기화"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"현재 동기화에 문제가 발생했습니다. 잠시 후에 다시 실행됩니다."</string>
     <string name="add_account_label" msgid="7811707265834013767">"계정 추가"</string>
     <string name="background_data" msgid="5779592891375473817">"백그라운드 데이터"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"동기화 사용 중"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"동기화 사용 안함"</string>
     <string name="sync_error" msgid="5060969083117872149">"동기화 오류"</string>
+    <string name="last_synced" msgid="4242919465367022234">"마지막 동기화 시간: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"지금 동기화하는 중..."</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google 동기화에 오신 것을 환영합니다."</font>" "\n"Google 동기화는 사용자가 어디에서든지 연락처, 일정 등에 액세스할 수 있도록 데이터를 동기화하는 Google 서비스입니다."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"앱 동기화 설정"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"데이터 및 동기화"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"비밀번호 변경"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"일부 앱의 경우 이 계정이 필요합니다. 설정 &gt; 백업 및 재설정에서 태블릿을 초기화해야 계정을 삭제할 수 있으며 이 경우 모든 개인정보가 삭제됩니다."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"일부 앱의 경우 이 계정이 필요합니다. 설정 &gt; 백업 및 재설정에서 휴대전화를 초기화해야 계정을 삭제할 수 있으며 이 경우 모든 개인정보가 삭제됩니다."</string>
     <string name="provider_label" msgid="7724593781904508866">"구독정보 푸시"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g> 동기화"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"수동으로 동기화할 수 없음"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"현재 이 항목에 대해 동기화를 사용할 수 없습니다. 이 설정을 변경하려면 백그라운드 데이터 및 자동 동기화를 일시적으로 사용하도록 설정하세요."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G 설정"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 주소"</string>
     <string name="enter_password" msgid="4131758584074246224">"저장소 암호를 해독하려면 비밀번호를 입력하세요."</string>
     <string name="try_again" msgid="4272075051293936921">"다시 시도해 보세요."</string>
-    <string name="service_busy" msgid="2325014135156127705">"서비스를 사용할 수 없습니다. 다시 시도해 주세요."</string>
     <string name="delete" msgid="4219243412325163003">"삭제"</string>
     <string name="misc_files" msgid="6720680815969643497">"기타 파일"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"모두 선택"</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="debug_debugging_category" msgid="6781250159513471316">"디버깅"</string>
+    <string name="debug_app" msgid="8349591734751384446">"디버깅할 앱 선택"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"디버깅할 애플리케이션이 설정되지 않음"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"디버깅할 애플리케이션: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"애플리케이션 선택"</string>
+    <string name="no_application" msgid="2813387563129153880">"없음"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"디버거 연결을 위해 대기"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"디버깅된 애플리케이션이 실행되기 전에 디버거 연결을 위해 대기"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"입력"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"그림"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"모니터링"</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_screen_updates" msgid="5470814345876056420">"표면 업데이트 표시"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"전체 창 표면이 업데이트되었을 때 플래시 처리"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU 보기 업데이트 표시"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU로 드로잉했을 때 창 내부 보기 플래시 처리"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"HW 오버레이 사용 안함"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"화면 합성 목적으로 항상 GPU 사용"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"추적 사용"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"추적 사용 선택"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"현재 사용하도록 설정된 추적이 없습니다."</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"현재 추적 <xliff:g id="NUM">%1$d</xliff:g>개를 사용할 수 있습니다."</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"현재 모든 추적을 사용할 수 있습니다."</string>
+    <string name="debug_layout" msgid="5981361776594526155">"레이아웃 범위 표시"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"클립 경계, 여백 등을 표시합니다."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU 사용량 표시"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"현재 CPU 사용량 오버레이 표시"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU 렌더링 강제 설정"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"애플리케이션에서 2D 하드웨어 가속 사용"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"2D 드로잉용으로 GPU 강제 사용"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"프로필 GPU 렌더링"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"adb shell dumpsys gfxinfo에서 렌더링 시간 측정"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"창 애니메이션 배율"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"전환 애니메이션 배율"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator 길이 배율"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"앱"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"액티비티 유지 안함"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"사용자가 종료하는 즉시 바로 제거"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"모바일 핫스팟"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"데이터 자동 동기화"</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="8621855507876539282">"이 기간 동안 데이터를 사용한 앱이 없습니다."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"포그라운드"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"백그라운드"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"태블릿을 기준으로 측정됩니다. 이동통신사의 데이터 사용량 계산은 다를 수 있습니다."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"휴대전화를 기준으로 측정됩니다. 이동통신사의 데이터 사용량 계산은 다를 수 있습니다."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"제한됨"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"모바일 데이터를 사용하지 않도록 설정하시겠습니까?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"모바일 데이터 제한 설정"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G 데이터 제한 설정"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"모바일"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"없음"</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="8430240158135453271">"앱 설정 보기"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"백그라운드 데이터 제한"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"모바일 데이터 네트워크에서만 백그라운드 데이터를 사용하지 않도록 설정합니다. 가능한 경우 Wi-Fi가 사용됩니다."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"모바일 네트워크에서 백그라운드 데이터를 사용하지 않도록 설정합니다. 가능한 경우 모바일이 아닌 네트워크가 사용됩니다."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"이 앱에 대해 백그라운드 데이터를 제한하려면 먼저 모바일 데이터 제한을 설정하세요."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"백그라운드 데이터 사용 제한"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"이 기능은 백그라운드 데이터에 의존하는 앱이 Wi-Fi를 사용할 수 없는 경우에 중단될 수 있습니다."\n\n"앱 설정에서 데이터 사용을 더 적절하게 관리할 수 있는 설정을 찾아 보세요."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"모바일 네트워크만 사용할 수 있는 경우 백그라운드 데이터에 의존하는 앱이 중단될 수 있습니다."\n\n"앱 설정에서 데이터 사용을 더 적절하게 관리할 수 있는 컨트롤을 찾아볼 수 있습니다."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"백그라운드 데이터는 모바일 데이터 한도를 설정한 경우에만 제한할 수 있습니다."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"데이터 자동 동기화를 사용하시겠습니까?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"웹에서 변경한 계정 정보는 모두 태블릿에 자동으로 복사됩니다."\n\n"또한 일부 계정은 태블릿의 변경사항을 웹에 자동으로 복사할 수 있습니다. Google 계정은 이러한 자동 동기화를 지원합니다."\n\n"각 계정에서 동기화하려는 정보의 종류를 선택하려면 \'설정 &gt; 계정\'으로 이동하세요."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"웹에서 변경한 계정 정보는 모두 휴대전화에 자동으로 복사됩니다."\n\n"또한 일부 계정은 휴대전화의 변경사항을 웹에 자동으로 복사할 수 있습니다. Google 계정은 이러한 자동 동기화를 지원합니다."\n\n"각 계정에서 동기화하려는 정보의 종류를 선택하려면 \'설정 &gt; 계정\'으로 이동하세요."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"데이터 자동 동기화를 사용 중지하시겠습니까?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"이 경우 데이터와 배터리 사용량이 절약되지만, 최근 정보를 수집하려면 각 계정을 직접 동기화해야 합니다. 또한 업데이트가 발생해도 알림을 받지 못합니다."</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_warning_editor_title" msgid="3704136912240060339">"데이터 사용 경고 설정"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"데이터 사용 한도 설정"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"데이터 사용 제한 중"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"지정된 한도에 도달하면 <xliff:g id="NETWORKS">%1$s</xliff:g> 데이터 연결 사용이 중지됩니다."\n\n"태블릿을 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"지정된 한도에 도달하면 <xliff:g id="NETWORKS">%1$s</xliff:g> 데이터 연결 사용이 중지됩니다."\n\n"휴대전화를 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"지정된 한도에 도달하면 모바일 데이터 연결 사용이 중지됩니다."\n\n"태블릿을 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"지정된 한도에 도달하면 모바일 데이터 연결 사용이 중지됩니다."\n\n"휴대전화를 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"백그라운드 데이터 사용을 제한하시겠습니까?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: 약 <xliff:g id="TOTAL">%1$s</xliff:g> 사용됨"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: 약 <xliff:g id="TOTAL">%1$s</xliff:g> 사용됨"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: 약 <xliff:g id="TOTAL">%1$s</xliff:g> 사용됨 - 태블릿을 기준으로 측정된 데이터 사용량이며 이동통신사에서는 사용량을 다르게 계산할 수 있습니다."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: 약 <xliff:g id="TOTAL">%1$s</xliff:g> 사용됨 - 휴대전화를 기준으로 측정된 데이터 사용량이며 이동통신사에서는 사용량을 다르게 계산할 수 있습니다."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"모바일 핫스팟"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"모바일 핫스팟인 Wi-Fi 네트워크를 선택하세요. 앱이 백그라운드에 있을 때 해당 네트워크를 사용할 수 없도록 제한할 수 있습니다. 또한 앱에서 대용량 다운로드 전에 네트워크 사용에 대해 경고해 줍니다."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"모바일 네트워크"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi 네트워크"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"모바일 핫스팟을 선택하려면 Wi-Fi를 사용하도록 설정합니다."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"VPN 프로필 수정"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"VPN 프로필 추가"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"프로필 수정"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"프로필 삭제"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"네트워크에 연결되어 있지 않습니다. 잠시 후 다시 시도해 주세요."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"인증서가 누락되었습니다. 프로필을 수정하세요."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"\'터치하여 탐색\'을 사용하면 화면을 터치하여 손가락으로 터치하는 항목이 무엇인지 알 수 있습니다. 예를 들어, 현재 화면에 앱 아이콘이 있습니다. 화면을 터치하고 손가락을 움직여 앱을 찾아 보세요."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"최소 하나 이상의 아이콘을 찾을 때까지 화면을 손가락으로 계속 슬라이드합니다."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"터치하고 있는 항목을 활성화하려면 해당 항목을 탭합니다. <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="8764686624055084454">"목록을 스크롤하려면 두 손가락으로 화면을 따라 슬라이드하면 됩니다. 예를 들어 현재 화면에 위/아래로 스크롤할 수 있는 앱 이름 목록이 있습니다. 먼저 한 손가락으로 화면을 슬라이드하여 목록에 어떤 앱이 있는지 확인해 보세요."</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="3055831259260848004">"안내서를 완료했습니다. 종료하려면 <xliff:g id="FINISH">%s</xliff:g> 버튼을 찾아서 터치하세요."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"맞춤법 수정"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"맞춤법 검사기"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"여기에 전체 백업에 대한 현재 사용중인 비밀번호를 입력하세요."</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"여기에 전체 백업에 대한 새 비밀번호를 입력하세요."</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"여기에 전체 백업에 대한 새 비밀번호를 다시 입력하세요."</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"취소"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"추가 시스템 업데이트"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"사용자/제한사항"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"사용자"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"사용자 추가"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"세부정보 수정"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"사용자 정보"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"이름"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"콘텐츠 제한"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN 필요"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"콘텐츠 등급"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"시스템 앱"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"설치된 앱"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"삭제"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"사용자 삭제"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"칭얼대는 아이"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"사용자를 삭제하시겠습니까?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"기기에서 사용자와 모든 관련 데이터를 삭제하시겠습니까?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"알림 표시"</string>
+    <string name="help_label" msgid="1107174367904110532">"도움말"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index fada382..39d788a 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Atjungiama..."</item>
     <item msgid="1634960474403853625">"Atsijungęs (-usi)"</item>
     <item msgid="746097431216080650">"Nesėkminga"</item>
+    <item msgid="6367044185730295334">"Užblokuota"</item>
+    <item msgid="503942654197908005">"Laikinai vengiama prasto ryšio"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Atjungiama nuo <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"Atsijungęs (-usi)"</item>
     <item msgid="8578370891960825148">"Nesėkminga"</item>
+    <item msgid="5660739516542454527">"Užblokuota"</item>
+    <item msgid="1805837518286731242">"Laikinai vengiama prasto ryšio"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Mygtuko paspaudimas"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nėra"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Prieigos taško PIN kodas"</item>
-    <item msgid="7364462169350112617">"Šio įrenginio PIN kodas"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statinis"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Keičiama SD kortelė"</item>
     <item msgid="4498124044785815005">"Leisti nuspręsti sistemai"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Išjungta"</item>
-    <item msgid="4804571292609523335">"Vibruoti"</item>
-    <item msgid="595707141547423573">"Nutildyti"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Trumpas"</item>
     <item msgid="2560532955514699713">"Vidutinis"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animacijos mastelis 5x"</item>
     <item msgid="6660750935954853365">"Animacijos mastelis 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animacija išjungta"</item>
+    <item msgid="1138649021950863198">"Animacijos mastelis 0,5 x"</item>
+    <item msgid="4394388961370833040">"Animacijos mastelis 1 x"</item>
+    <item msgid="8125427921655194973">"Animacijos mastelis 1,5 x"</item>
+    <item msgid="3334024790739189573">"Animacijos mastelis 2 x"</item>
+    <item msgid="3170120558236848008">"Animacijos mastelis 5 x"</item>
+    <item msgid="1069584980746680398">"Animacijos mastelis 10 x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standartinis apribojimas"</item>
     <item msgid="4071574792028999443">"Nėra fono procesų"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c439cbc..d53d9aa 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Taip"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
+    <string name="create" msgid="3578857613172647409">"Kurti"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neleisti naudoti „Bluetooth“ numerio rinkiklio, kai ekranas užrakintas"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"„Bluetooth“ įrenginiai"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Įrenginio pavadinimas"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Įrenginio nustatymai"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profilio nustatymai"</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_rename_device" product="tablet" msgid="787970073150631155">"Pervardyti planšet. kompiuterį"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Susiejama..."</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="5655704645616731277">"Kad susietum., pal."</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nerasta netol. esanč. „Bluetooth“ įreng."</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="1931617700075106801">"Jei norite susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“, palieskite"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Jei norite susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“, palieskite."</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="device_picker" msgid="8398232791303186677">"„Bluetooth“ įrenginio pasirinkimo priemonė"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"„Bluetooth“ leidimo užklausa"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Programoje norima įjungti „Bluetooth“. Leisti?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Programoje planšetiniame kompiuteryje norima padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių. Leisti?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Gerai"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Įvestas prieglobos serverio pavadinimas netinkamas."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Į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_port" msgid="5539106187558215246">"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="2671425042711054494">"Prievadas, kurį įvedėte, netinkamas."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP įgaliotąjį serverį naudoja naršyklė, bet jo negali naudoti kitos programos."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Nustatyti"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Nesėkminga"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Sėkmingas"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Pakeitimai įsigalioja, kai USB kabelis įjungiamas iš naujo"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Pakeitimai įsigalioja, kai USB laidas prijungiamas iš naujo."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Įgalinti nuolatinį USB saugojimą"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Iš viso baitų:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB atmintinė neprijungta"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nėra SD kortelės"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB atmintis neįdėta."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Nėra SD kortelės."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Galimi baitai:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USD atm. naud. kaip didel. talp. atm. įr."</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD kortelė naudojama kaip nuolatinio saugojimo įrenginys"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Dabar saugu pašal. USB atmintį"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Dabar saugu pašalinti SD kortelę"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB atm. naud. kaip did. įren."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD kortelė naudojama kaip didelės talpos atminties įrenginys"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Dabar saugu pašal. USB atmint."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Dabar saugu pašalinti SD kortelę."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB atm. pašal. jai veikiant!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD kortelė buvo pašalinta tuo metu, kai buvo naudojama!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Panaudota baitų:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Ieškoma medijos USB atm..."</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Įdėta tik skait. USB atmin."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Įdėta tik skait. SD kortelė."</string>
     <string name="skip_label" msgid="47510779345218297">"Praleisti"</string>
     <string name="next_label" msgid="4693520878012668114">"Kitas"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Kalba"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Veikiant tarptinkliniam ryšiui, prisijungti prie duomenų paslaugų"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Praradote duomenų jungiamumą, nes pagrindinį tinklą palikote išjungę tarptinklinį ryšį."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Įjungti"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Leisti tarptinklinį duomenų ryšį? Galite būti apmokestinti nemažais tarptinklinio ryšio mokesčiais!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Dėmesio"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Leisdami tarptinklinį duomenų ryšį, galite būti apmokestinti nemažais tarptinklinio ryšio mokesčiais!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Leisti tarptinklinį duomenų ryšį?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatoriaus pasirinkimas"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pasirinkite tinklo operatorių"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data ir laikas"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Nustatyti laiką"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pasirinkti laiko zoną"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Nustatyti datą"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Pasirinkti datos formatą"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Pasirinkite 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="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Laikas"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Patobulinti veido atitikimą"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Tikrinimas, ar matomas veidas"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Reikia sumirksėti akimis"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją bei kitus failus. Kai užšifruosite planšetinį kompiuterį, turėsite įvesti skaitinį PIN kodą ar slaptažodį, kad iššifruotumėte jį kaskart įjungę: panaikinti planšetinio kompiuterio šifravimą galima tik iš naujo nustačius gamyklinius duomenis ištrinant visus duomenis."\n\n"Šifravimas trunka valandą ar ilgiau. Pradėti šifravimą reikia įkrovus akumuliatorių ir iki šifravimo pabaigos laikant planšetinį kompiuterį įjungtą į lizdą. Jei nutrauksite šifravimą, prarasite visus duomenis ar jų dalį."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją bei kitus failus. Kai užšifruosite telefoną, turėsite įvesti skaitinį PIN kodą ar slaptažodį, kad iššifruotumėte jį kaskart įjungę: panaikinti telefono šifravimą galima tik iš naujo nustačius gamyklinius duomenis ištrinant visus duomenis."\n\n"Šifravimas trunka valandą ar ilgiau. Pradėti šifravimą reikia įkrovus akumuliatorių ir iki šifravimo pabaigos laikant telefoną įjungtą į lizdą. Jei nutrauksite šifravimą, prarasite visus duomenis ar jų dalį."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę planšetinį kompiuterį turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Planšetinio kompiuterio iššifruoti negalite, išskyrus atvejus, kai atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis."\n\n"Šifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti planšetinį kompiuterį prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę telefoną turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Telefono iššifruoti negalite, išskyrus atvejus, atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis."\n\n"Šifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti telefoną prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</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="2029407131227814893">"Įkraukite akumuliatorių ir bandykite dar kartą."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Į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_dialog_need_password_message" msgid="4071395977297369642">"Prieš pradėdami šifravimo procesą turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Užšifruoti?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Šifravimo 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="5682944380460921880">"Šifravimo 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="6689952371032099350">"Palaukite, kol šifruojamas planšetinis kompiuteris. Baigta <xliff:g id="PERCENT">^1</xliff:g> %."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"Įveskite slaptažodį"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifruotė nepavyko"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Šifravimas buvo pertrauktas ir nepavyko jo užbaigti. Todėl duomenys planšetiniame kompiuteryje nebepasiekiami. "\n\n" Jei norite vėl naudoti planšetinį kompiuterį, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite planšetinį kompiuterį, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Šifravimas buvo pertrauktas ir nepavyko jo užbaigti. Todėl duomenys telefone nebepasiekiami. "\n\n"Jei norite vėl naudoti telefoną, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite telefoną, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Pasir. ekrano užraktą"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys planšetiniame kompiuteryje nebepasiekiami. "\n\n" Jei norite vėl naudoti planšetinį kompiuterį, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite planšetinį kompiuterį, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys telefone nebepasiekiami. "\n\n"Jei norite vėl naudoti telefoną, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite telefoną, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Perjungti įvesties metodą"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pasir. ekrano užrak."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pasirinkti atsarginį užrakinimą"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Atrakinimas pagal veidą"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Šablonas"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kodas"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Slaptažodis"</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>
@@ -358,48 +363,48 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Keisti atrakinimo modelį"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pakeisti atrakinimo PIN kodą"</string>
     <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_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="122706614386757182">"Atlikę spustelėkite „Tęsti“"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tęsti"</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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Slaptažodį turi sudaryti mažiau nei <xliff:g id="NUMBER">%d</xliff:g> simboliai (-ių)."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN kodą turi sudaryti mažiau nei <xliff:g id="NUMBER">%d</xliff:g> skaitmenys (-ų)."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN kodas turi būti sudarytas tik iš skaitmenų 0–9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Įrenginio administratorius neleidžia naudoti pastarojo PIN kodo."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Slaptažodyje yra neleistinas simbolis."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Slaptažodyje turi būti bent viena raidė."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Slaptažodyje turi būti bent vienas skaitmuo."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Slaptažodyje turi būti bent 1 raidė."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Slaptažodyje turi būti bent 1 mažoji raidė."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Slaptažodyje turi būti bent 1 didžioji raidė."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Slaptažodyje turi būti bent 1 skaičius."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Slaptažodyje turi būti bent 1 specialus simbolis."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Slaptažodyje turi būti bent 1 neraidinis simbolis."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Į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="lock_setup" msgid="1759001157415978959">"Sąranka baigta"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Sąranka baigta."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Įrenginio administravimas"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Susieti su: <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Įveskite įrenginio reikalaujamą 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_enter_pin_other_device" msgid="4637977124526813470">"Galbūt reikės šį PIN kodą įvesti kitame įrenginyje."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Susieti su: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Įveskite: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, tada paspauskite „Grįžti“ arba „Enter“."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nepavyko susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ dėl netinkamo PIN kodo ar prieigos rakto."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nepavyksta užmegzti ryšio su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Nepavyko prisijungti prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Leisti keistis duomenimis, kai telefonas paliečia kitą įrenginį"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Leisti keistis duomenimis, kai planšetinis kompiuteris aptinka kitą įrenginį"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Leisti keistis duomenimis, kai telefonas paliečia kitą įrenginį"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Parengta perduoti programos turinį naudojant ALR"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Išjungta"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Negalima, nes išjungtas ALR"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Kai ši funkcija įjungta, galite programos turinį perduoti į kitą ALR palaikantį įrenginį laikydami du įrenginius šalia. Pavyzdžiui, galite perduoti Naršyklės puslapius, „YouTube“ vaizdo įrašus, žmonių kontaktus ir daugiau."\n\n"Tiesiog sudėkite du įrenginius vieną šalia kito (suglaudę galinėmis dalimis) ir palieskite ekraną. Programa nustato, kas bus perduodama."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Tinklo paslaugos aptikimas"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Leisti kitų įrenginių programoms aptikti šio įrenginio programas"</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="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_setup_wizard_title" msgid="70277346338812325">"Pasirinkti „Wi-Fi“"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nepavyksta nuskaityti tinklų"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Tinklo įspėjimas"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Pranešti, kai bus galimas atviras tinklas"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Vengti prasto ryšio"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Nenaudoti „Wi-Fi“ tinklo, jei jo interneto ryšys nėra geras"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vengti prasto ryšio"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nenaudoti „Wi-Fi“ tinklo, jei jo interneto ryšys nėra geras"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Išlaikyti „Wi-Fi“, kai veikia miego režimas"</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_wps_pbc" msgid="2668564692207863017">"WPS paspaudimo mygt."</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN kodo įrašas"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Tiesiog. „Wi-Fi“ r."</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_empty_list_wifi_on" msgid="3354911729026237372">"Ieškoma „Wi-Fi“ ryšio tinklų…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Kitas tinklas…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Daugiau"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatinė sąranka (WPS)"</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="8242979682530043184">"Įvesti PIN kodą iš prieigos taško"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS sąranka"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"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_wps_setup_title" msgid="6034518116333042484">"Apsaugota „Wi-Fi“ sąranka"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Pradedama WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Maršruto parinktuve paspauskite mygtuką „Wi-Fi“ apsaugota sąranka“. Jis gali būti pavadintas WPS arba nurodytas šis simbolis:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Įveskite „Wi-Fi“ maršruto parinktuvo PIN kodą <xliff:g id="NUMBER">%1$s</xliff:g>. Sąranka gali trukti iki dviejų min."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS pavyko. Prisijungiama prie tinklo…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Prisijungta prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS jau vykdoma ir gali užtrukti iki dviejų min., kol bus baigta"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS neįvykdyta. Po kelių minučių bandykite dar kartą."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Belaidžio maršruto parinktuvo saugos nustatymas (WEP) nepalaikomas"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Belaidžio maršruto parinktuvo saugos nustatymas (TKIP) nepalaikomas"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Nepavyko autentifikuoti. Bandykite dar kartą."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Aptikta kita WPS sesija. Po kelių minučių 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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Išvengta prasto interneto ryšio"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Tinklas buvo praleistas dėl silpno ryšio. Išjunkite šį veiksmą ekrane „Nustatymai“ &gt; „Wi-Fi“, pasirinkę meniu elementą „Išplėstiniai“."</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_wps_available_first_item" msgid="3538912605343585226">"Pasiekiamas apsaugotas tinklas"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (pasiekiamas apsaugotas tinklas)"</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_failed_connect_message" msgid="8491902558970292871">"Jungiantis prie tinklo įvyko klaida."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pamiršti"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ištrinant tinklą įvyko klaida."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Išsaugoti"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Išsaugant tinklą įvyko klaida."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Atšaukti"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Aptikta dar viena „Wi-Fi“ apsaugota sesija. Band. dar kartą po kelių min."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Tinklų sietuvas"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tinklo kodo ilgis"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Tiesioginis „Wi-Fi“ ryšys"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Nustatyti ryšį tarp lygiaverčių įrenginių"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Tiesioginis „Wi-Fi“ ryšys"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Įrenginio informacija"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Apsaugota „Wi-Fi“ sąranka"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Įvesti 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_remove_group" msgid="4844634506540667517">"Pašalinti grupę"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Išplėstiniai"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Pasiekiami įrenginiai"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Ieškoti įrenginių"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Ieškoma…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Pervardyti įrenginį"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Lygiaverčiai įrenginiai"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Nepavyko prijungti."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Nepavyko pervardyti įrenginio."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Atsijungti?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Atsijungus, bus nutrauktas ryšys su „<xliff:g id="PEER_NAME">%1$s</xliff:g>“."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Atsijungus, bus nutrauktas ryšys su „<xliff:g id="PEER_NAME">%1$s</xliff:g>“ ir <xliff:g id="PEER_COUNT">%2$s</xliff:g> kitais (-ų) įrenginiais (-ių)."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Atšaukti kvietimą?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ar norite atšaukti kvietimą prisijungti prie <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Konfigūruoti „Wi-Fi“ aktyviąją sritį"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nustatyti „Wi-Fi“ viešosios interneto prieigos tašką"</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="display_settings_title" msgid="1708697328627382561">"Pateiktis"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Tylus režimas"</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="4296957391257836961">"Garsumas"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muzikos efektai"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Skambučio garsumas"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibruoti, kai veikia tyliuoju režimu"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibruoti ir skambėti"</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="incoming_call_volume_title" msgid="8073714801365904099">"Skambėjimo tonas"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Nutildyti skambėjimo toną ir pranešimus"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Nutildyti muziką ir kitą mediją"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Nutildyti pranešimus"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Nutildyti signalus"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibruoti, kai skambina"</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>
@@ -623,17 +651,17 @@
     <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" product="tablet" msgid="9015625921245904495">"Prieš nustatydami doko garsą, turite įtraukti planšetinį kompiuterį į doką."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Prieš nustatydami doko garsą, turite įtraukti telefoną į doką."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Prieš nustatydami prijungimo garso įrašą turėsite prijungti planšetinį kompiuterį."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Prieš nustatydami prijungimo garso įrašą turėsite prijungti telefoną."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Doko įstatymo garsas"</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="account_settings" msgid="6403589284618783461">"Paskyros"</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="7965901687241669598">"Pateikti"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Ekranas"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatiškai sukti ekraną"</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>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mano telefono numeris"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN."</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"PRL versija"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Ištrinti visą asmeninę informaciją ir atsisiųstas programas? Šio veiksmo negalėsite atšaukti!"</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="2234954758550554549">"Kad patvirtintumėte gamyklinių duomenų nustatymą iš naujo, turite nubrėžti atrakinimo šabloną."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Kad patvirtintumėte gamyklinių duomenų nustatymą iš naujo, turite nubrėžti atrakinimo šabloną."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nebuvo nustatyta iš naujo, nes paslauga „Sistemos išvalymas“ nepasiekiama."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Nustatyti iš naujo?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ištrinti USB atmintinę"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ištrinti SD kortelę ištrinant visus joje saugomus failus? Šio veiksmo negalėsite atšaukti!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ištrinti viską"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Nustatyti atrakinimo modelį"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Kad patvirtintumėte, jog norite ištrinti USB atmintinę, turite nubrėžti atrakinimo šabloną."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Kad patvirtintumėte, jog norite ištrinti USB atmintinę, turite nubrėžti atrakinimo šabloną."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"USB susiejimas"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilūs tinklai"</string>
     <string name="location_title" msgid="1029961368397484576">"Mano vieta"</string>
     <string name="location_network_based" msgid="5569673665032992664">"„Google“ vietos paslauga"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Leisti programai naudoti duomenis iš šaltinių, pvz., „Wi-Fi“ ir mobiliojo ryšio tinklų, kad būtų nustatyta apytikslė vieta"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Leis. siųsti „Google“ an. vietos duom. Taip pat leis. pr. naud. duom. iš „Wi-Fi“ ir mob. r. tinklų, kad būtų nust. jūsų apyt. vt."</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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Jei norite gauti pagalbos, paspauskite „Meniu“."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Baigę atleiskite pirštą."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Prijunkite mažiausiai <xliff:g id="NUMBER">%d</xliff:g> taškus. Bandykite dar kartą:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Modelis įrašytas!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Modelis įrašytas."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Dar kartą nustatykite modelį, kad patvirtintumėte:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Naujas atrakinimo modelis:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Patvirtinti"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Kitas"</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="1075370160667458122">"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="tablet" msgid="8616353869251700776">"Apsaugokite planšetinį kompiuterį nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo šabloną. 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="8393155371327584659">"Apsaugokite telefoną nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo modelį. 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="7041951105633616745">"Valdyti programas"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Tvarkykite ir pašalinkite įdiegtas programas"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Valdyti programas, nustatyti greitojo paleidimo sparčiuosius klavišus"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Programos nustatymai"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nežinomi šaltiniai"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Leisti įdiegti ne Prekyvietės programas"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Leisti diegti programas iš nežinomų šaltinių"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Planšetinis kompiuteris ir asmeniniai duomenys prastai apsaugoti nuo programų iš nežinomų šaltinių atakų. Sutinkate, kad tik jūs atsakote už visus planšetinio kompiuterio pažeidimus ar duomenų praradimą naudojant šias programas."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonas ir asmeniniai duomenys prastai apsaugoti nuo programų iš nežinomų šaltinių atakų. Sutinkate, kad tik jūs atsakote už visus telefono pažeidimus ar duomenų praradimą naudojant šias programas."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Išplėstiniai nustatymai"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"Numatytieji"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Išvalyti duomenis"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Pašalinti naujinius"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Pasirinkote pagal numatytuosius nustatymus paleisti šią programą atliekant tam tikrus veiksmus."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Pasirinkote leisti šiai programai kurti valdiklius ir pasiekti jų duomenis."</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="1616155457673106022">"Ši programa gali būti nepritaikyta jūsų ekranui. Čia galite valdyti jos pritaikymą pagal ekraną."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Rūšiuoti pagal dydį"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Rodyti vykdomas paslaugas"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Rodyti padėtus procesus"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Iš naujo nustat. nuostat."</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Iš naujo nust. nuostat.?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Bus iš naujo nustatytos visos toliau nurodytų elementų nuostatos:"\n\n" "<li>"Neleidžiamos programos"</li>\n" "<li>"Neleidžiami programų pranešimai"</li>\n" "<li>"Numatytosios veiksmų programos"</li>\n" "<li>"Programų fono duomenų apribojimai"</li>\n\n" Nebus prarasti jokie programų duomenys."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Iš naujo nustat. program."</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Valdyti vietą"</string>
     <string name="filter" msgid="2018011724373033887">"Filtruoti"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Pasirinkti filtro parinktis"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ši programa planšetiniame kompiuteryje gali pasiekti:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ši programa telefone gali 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="invalid_size_value" msgid="7563537715280712285">"Nepavyko apskaičiuoti paketo dydžio."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Pakeisti pageidaujamą naujų programų diegimo vietą"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Neleisti integruotos programos?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jei neleisite integruotos programos, kitos programos gali neveikti tinkamai."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Išjungti pranešimus?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jei išjungsite šios programos pranešimus, galite praleisti svarbius įspėjimus ir naujinius."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Atmintinės naudojimas"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Žiūrėti programų naudojamą atmintinę"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Vykdomos paslaugos"</string>
@@ -1042,7 +1078,7 @@
     <string name="service_started_by_app" msgid="818675099014723551">"Paleista programos."</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> nemokama"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> laisva"</string>
     <string name="service_foreground_processes" msgid="7583975676795574276">"Panaudota <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Naudojant šį įvesties metodą galima rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., slaptažodžius ir kredito kortelių numerius. Jis pateikiamas naudojant programą „<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>“. Naudoti šį įvesties metodą?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Naudojant šią rašybos tikrinimo programą galima rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., slaptažodžius ir kredito kortelių numerius. Ji pateikiama naudojant programą „<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>“. Naudoti šią rašybos tikrinimo programą?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Nustatymai"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Kalba"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Nepavyko atidaryti „<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>“ nustatymų"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Pelė / jutiklinis kilimėlis"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Žymiklio greitis"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Žaidimų valdiklis"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Naudoti vibravimą"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Nukreipkite vibravimą į žaidimų valdiklį, kai jis prijungtas."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Pasirinkite klaviatūros išdėstymą"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Nustatyti klaviatūros išdėstymus"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Kad perj., pasp. vald. ir tarpo kl."</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Numatytasis"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klaviatūros išdėstymai"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Naudotojo žodynas"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Asmeninis žodynas"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Asmeniniai žodynai"</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_add_screen_title" msgid="742580720124344291">"Frazė"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Daugiau parink."</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Mažiau parink."</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"Gerai"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Žodis:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Spartusis klavišas:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Kalba:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Visos kalbos"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Daugiau kalbų..."</string>
     <string name="testing" msgid="6584352735303604146">"Bandymas"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Planšetinio kompiuterio informacija"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefono informacija"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Kūrimo įrenginio ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Įrenginio informacija nepasiekiama"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Veikti"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Kraunant ekranas niekada neveiks miego režimu"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Leisti USB perkrovimą?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB derinimas skirtas naudoti tik kūrimo tikslais. Jis gali būti naudojamas norint kopijuoti duomenis iš kompiuterio į įrenginį ir atvirkščiai, įdiegti programas įrenginyje be pranešimo ir skaityti žurnalo duomenis."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Leisti kūrėjų nustatymus?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Šie nustatymai skirti tik kūrėjams. Nustačius juos įrenginys ir jame naudojamos programos gali nustoti veikti arba veikti netinkamai."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Apsaugoti USB atmintį"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Programos turi prašyti leidimo skaityti USB atmintį"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Apsaugoti USB atmintį?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jei USB atmintis yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis."\n\n"Kai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Apsaugoti SD kortelę"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Programos turi prašyti leidimo skaityti SD kortelę"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Apsaugoti SD kortelę?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jei SD kortelė yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis."\n\n"Kai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pasirinkti programėlę"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pasirinkti valdiklį"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Sukurti valdiklį ir leisti prieigą?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Sukūrus valdiklį, „<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>“ gali pasiekti visus jame pateikiamus duomenis."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Visada leisti „<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>“ kurti valdiklius ir pasiekti jų duomenis"</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> val. <xliff:g id="MINUTES">%3$d</xliff:g> min. <xliff:g id="SECONDS">%4$d</xliff:g> sek."</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> val. <xliff:g id="MINUTES">%2$d</xliff:g> min. <xliff:g id="SECONDS">%3$d</xliff:g> sek."</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> sek."</string>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Sakyti slaptažodžius"</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="3264723681038625967">"Įdiegti žiniatinklio scenarijus"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Padidinti žiniatinklio pasiekiamumą"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nėra įdiegta jokių paslaugų"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Reikia ekrano skaitytuvo?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"„TalkBack“ teikia atsiliepimus žodžiu, kad padėtų akliems ir sutrikusio regėjimo naudotojams. Ar norite nemokamai įdiegti šią funkciją iš „Android“ prekyvietės?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Įdiegti žiniatinklio scenarijus?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Ar norite programose įdiegti scenarijus iš „Google“, kurie padarytų jų turinį geriau pasiekiamą?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Įjungus šią funkciją, pasikeis įrenginio reakcija į palietimą. Įjungti?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nepateikta jokių aprašų."</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_not_available" msgid="3214000535532434353">"Akum. naudoj. duom. nepasiek."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"Nepavyksta paleisti pasirinkto variklio."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigūruoti"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pasirinkite kitą variklį"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Šis kalbos sintezės variklis gali rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., kredito kortelės numerius, išskyrus slaptažodžius. Tai vyksta dėl variklio <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Įgalinti šio kalbos sintezės variklio naudojimą?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Moteris"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Prieš naud. įgal. nauj. varik."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Nubrėžti atrakinimo piešinį"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kad patvirtintumėte kredencialų diegimą, turite nubrėžti atrakinimo piešinį."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Įveskite kredencialų atmintinės slaptažodį."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Dabartinis slaptažodis:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Įgaliojimų atmintinė ištrinta."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Nepavyko ištr. kreden. atmint."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Įgaliojimų saugykla įgalinta."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Jei norite naudoti kredencialų atmintinę, pirmiausia turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Jei norite naudoti kredencialų atmintinę, pirmiausia turite nustatyti ekrano užrakto PIN kodą arba slaptažodį."</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="5446972770562918934">"Kurti atsarginę kopiją ir nustatyti iš naujo"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatinis atkūrimas"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Iš naujo įdiegdami programą atkurkite nustatymus ir duomenis, kurių atsarginės kopijos buvo sukurtos"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Viet. atsrg. kop. slapt."</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Šiuo metu visos darbalaukio 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="local_backup_password_summary_none" msgid="393503434408227110">"Šiuo metu visos vietinės atsarginės kopijos neapsaugotos"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Jei norite pakeisti ar pašalinti visų vietinių atsarginių kopijų slaptažodį, palieskite"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Nebekurti atsarginių „Wi-Fi“ slaptažodžių, žymių, kitų nustatymų ir programų duomenų kopijų ir ištrinti visas „Google“ serveriuose esančias kopijas?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Įrenginio administravimo nustatymai"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Sistema"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Skambinimo tonas ir vibracija"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Jungiamasi prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Įvyko sinchronizavimo klaida"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sinchronizavimas aktyvus"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Sinchronizavimas"</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="background_data" msgid="5779592891375473817">"Foniniai duomenys"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Pastarąjį kartą sinchronizuota <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Sinchronizuojama dabar…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Sveiki! Tai – „Google“ sinchronizavimas!"</font>" "\n"Tai yra „Google“ požiūris į duomenų sinchronizavimą, kad būtų galima pasiekti kontaktus, susitikimus ir dar daugiau, nesvarbu, kur būtumėte."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Ši paskyra reikalinga kelioms programoms. Ją galite pašalinti tik iš naujo nustatę numatytuosius gamyklinius planšetinio kompiuterio nustatymus (taip bus ištrinti visi asmeniniai duomenys) skiltyje „Nustatymai“ &gt; „Kurti atsarginę kopiją ir nustatyti iš naujo“."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Ši paskyra reikalinga kelioms programoms. Ją galite pašalinti tik iš naujo nustatę numatytuosius gamyklinius telefono nustatymus (taip bus ištrinti visi asmeniniai duomenys) skiltyje „Nustatymai“ &gt; „Kurti atsarginę kopiją ir nustatyti iš naujo“."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Negalima sinchronizuoti rankiniu būdu"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Šiuo metu šio elemento sinchronizavimas neleidžiamas. Jei norite pakeisti šį nustatymą, laikinai įjunkite foninius duomenis ir automatinį sinchronizavimą."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G nustatymai"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresas"</string>
     <string name="enter_password" msgid="4131758584074246224">"Kad iššifruotumėte atmintinę, įveskite slaptažodį"</string>
     <string name="try_again" msgid="4272075051293936921">"Bandykite dar kartą."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Paslauga užimta. Bandykite dar kartą."</string>
     <string name="delete" msgid="4219243412325163003">"Ištrinti"</string>
     <string name="misc_files" msgid="6720680815969643497">"Į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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Derinimas"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Pasirinkite derinimo programą"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nenustatyta jokia derinimo programa"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Derinimo programa: „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string>
+    <string name="select_application" msgid="5156029161289091703">"Pasirinkti programą"</string>
+    <string name="no_application" msgid="2813387563129153880">"Nieko"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Laukti derintuvės"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Derinta progr. laukia derint., kad galėtų tęsti."</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Įvestis"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Atvaizdavimas"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Stebėjimas"</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_screen_updates" msgid="5470814345876056420">"Rodyti paviršiaus naujin."</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Naujinant mirginti visus langų paviršius"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Rodyt GPU rodinių naujin."</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"„Flash“ rodiniai languose atvaizduojant su GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Neleisti HW perdangų"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Komponuojant ekraną visada naudoti GPU"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Įgalinti pėdsakus"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Pasir. įgalintus pėdsakus"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Šiuo metu neįgalinta jokių pėdsakų"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Šiuo metu įgalinta pėdsakų: <xliff:g id="NUM">%1$d</xliff:g>"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Šiuo metu visi pėdsakai įgalinti"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Rodyti išdėstymo ribas"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Rodyti iškarpų ribas, kraštines ir t. t."</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="force_hw_ui" msgid="6426383462520888732">"Priverst. GPU atvaizd."</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Programose naudoti 2D aparat. įrang. spartinimą"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Priverstinai naudoti GPU atvaizduojant 2D formatą"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profiliuotas GPU atvaizd."</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Skaič. atvaizd. laiką „adb shell dumpsys gfxinfo“"</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="animator_duration_scale_title" msgid="3406722410819934083">"Animator. trukmės skalė"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Mob. vieš. inter. prieig. tšk."</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Automatinis duomenų sinchronizavimas"</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="8621855507876539282">"Šiuo laikotarpiu jokios program. 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_disclaimer" product="tablet" msgid="2591250607795265503">"Apskaičiuota pagal planšetinį komp. Operat. duomenų naud. apskaita gali skirtis."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Apskaičiuota pagal telefoną. Operatoriaus duomenų naud. apskaita gali skirtis."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"ribotas"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Neleisti duomenų mobiliesiems?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Nustatyti mobiliųjų duomenų apribojimą"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Nustatyti 4G duomenų apribojimą"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobilusis"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Žiūrėti programos nustatymus"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Fono duomenų ribojimas"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Nel. fon. duom. tik mob. duom. tin. „Wi-Fi“ bus naud., jei pas."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Nel. fon. duom. mob. tinkl. Ne mob. tinkl. bus naud., jei pas."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Kad aprib. šios progr. fon. duom., pirm. nustat. mob. duom. apr."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Apriboti foninius duomenis?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Dėl šios funkcijos programa, kuri priklauso nuo fono duomenų, gali sustoti, kai nėra „Wi-Fi“."\n\n"Daugiau atitinkamų duomenų naudojimo valdiklių galite rasti programoje galimuose nustatymuose."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Dėl šios funkcijos, kai pasiekiami tik mobilieji tinklai, gali neveikti programos, kurių veikimas priklauso nuo foninių duomenų."\n\n"Programos nustatymuose galite rasti tinkamesnių duomenų naudojimo valdiklių."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Apriboti foninius duomenis galima tik nustačius mobiliojo ryšio duomenų apribojimą."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Įjungti autom. sinchronizavimą?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į planšetinį kompiuterį."\n\n"Iš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi planšetiniame kompiuteryje atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje."\n\n"Jei norite pasirinkti, kokią kiekvienos paskyros informaciją sinchronizuoti, eikite į „Nustatymai“ &gt; „Paskyros“."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į telefoną."\n\n"Iš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi telefone atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje."\n\n"Jei norite pasirinkti, kokią kiekvienos paskyros informaciją sinchronizuoti, eikite į „Nustatymai“ &gt; „Paskyros“."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Išjungti autom. sinchronizavimą?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Tai atlikus bus saikingai naudojami duomenys ir akumuliatoriaus energija, tačiau, jei norėsite surinkti naujausią informaciją, turėsite sinchronizuoti kiekvieną paskyrą rankiniu būdu. Be to, negausite pranešimų, kai atsiras naujinių."</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_warning_editor_title" msgid="3704136912240060339">"Nustatyti duomenų naudojimo įspėjimą"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nustatyti duomenų naudojimo apribojimą"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Duomenų naudojimo ribojimas"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Jūsų <xliff:g id="NETWORKS">%1$s</xliff:g> duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas."\n\n"Kadangi sunaudoti duomenys skaičiuojami pagal planšetinį kompiuterį ir operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Jūsų <xliff:g id="NETWORKS">%1$s</xliff:g> duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas."\n\n"Kadangi sunaudoti duomenys skaičiuojami pagal telefoną ir operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobiliųjų duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas."\n\n"Kadangi sunaudoti duomenys skaičiuojami planšetiniu kompiuteriu, o operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobiliųjų duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas."\n\n"Kadangi sunaudoti duomenys skaičiuojami telefonu, o operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Apriboti foninius duomenis?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jei apribosite fono duomenis mobiliesiems, neveiks kai kurios programos ir paslaugos, nebent būsite prisijungę prie „Wi-Fi“ tinklo."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: naudojama apie <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: sunaudota apie <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: planš. komp. apskaič., kad sunaud. <xliff:g id="TOTAL">%1$s</xliff:g>. Operat. duomenis gali apskaič. kitaip."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: telef. apskaič., kad sunaudota <xliff:g id="TOTAL">%1$s</xliff:g>. Oper. sunaud. duom. gali apskaič. kitaip."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobil. vieš. inter. prieig. tšk."</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Pasirinkite „Wi-Fi“ tinklus, kurie yra mobiliojo ryšio viešosios interneto prieigos taškai. Programose galima apriboti šių tinklų naudojimą, kai jos veikia fone. Be to, programose gali būti įspėjama prieš naudojant šiuos tinklus dideliems kiekiams duomenų atsisiųsti."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiliojo ryšio tinklai"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"„Wi-Fi“ tinklai"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Kad pasir. mob. ryšio vieš. intern. prieigos tašk., įj. „Wi-Fi“."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Redaguoti VPN profilį"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Prisijungti prie <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Pridėti VPN profilį"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Redaguoti profilį"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Ištrinti profilį"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Šiuo metu nėra tinklo ryšio. Bandykite dar kartą vėliau."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Nėra sertifikato. Redaguokite profilį."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"Kai įjungsite funkciją „Naršyti liečiant“, palietę ekraną sužinosite, kas yra po jūsų pirštu. Pvz., dabartiniame ekrane yra programų piktogramų. Raskite vieną iš jų palietę ekraną ir slinkdami 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="3973201880357468747">"Jei norite suaktyvinti tai, ką liečiate, palieskite tai. Slinkite pirštu, kol rasite „<xliff:g id="APP_NAME">%s</xliff:g>“ piktogramą. Tada 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="8764686624055084454">"Jei norite slinkti sąrašu, galite dviem pirštais slinkti ekranu. Pvz., dabartiniame ekrane yra programų pavadinimų, kuriais galima slinkti į viršų ar į 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="3055831259260848004">"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="spellcheckers_settings_title" msgid="399981228588011501">"Rašybos tikrinimas"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Čia įveskite visą dabartinį atsarginį slaptažodį"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Čia įveskite naują visų atsarginių kopijų slaptažodį"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Čia iš naujo įveskite visą atsarginį slaptažodį"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Atšaukti"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g> %%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Papildomi sistemos naujiniai"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Naudotojai ir apribojimai"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Naudotojai"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Pridėti naudotoją"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Redaguoti informaciją"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Naudotojo informacija"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Vardas"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Turinio apribojimai"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Reikalauti PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Turinio įvertinimas"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Sistemos programos"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Įdiegtos programos"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Atmesti"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Pašalinti naudotoją"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Įkyrus vaikas"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Pašalinti naudotoją?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Ar tikrai norite pašalinti naudotoją ir visus susijusius duomenis iš įrenginio?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rodyti pranešimus"</string>
+    <string name="help_label" msgid="1107174367904110532">"Pagalba"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 805a8c6..de78636 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -68,7 +68,7 @@
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Ļoti lēni"</item>
     <item msgid="2361722960903353554">"Lēni"</item>
-    <item msgid="1145554631248513562">"Normāls"</item>
+    <item msgid="1145554631248513562">"Normāli"</item>
     <item msgid="7553665153391107454">"Ātri"</item>
     <item msgid="2538100882620724753">"Ļoti ātri"</item>
   </string-array>
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Notiek atvienošana..."</item>
     <item msgid="1634960474403853625">"Atvienots"</item>
     <item msgid="746097431216080650">"Neizdevās"</item>
+    <item msgid="6367044185730295334">"Bloķēts"</item>
+    <item msgid="503942654197908005">"Pagaidām netiek izmantots vājš savienojums."</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Notiek atvienošana no <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Atvienots"</item>
     <item msgid="8578370891960825148">"Neizdevās"</item>
+    <item msgid="5660739516542454527">"Bloķēts"</item>
+    <item msgid="1805837518286731242">"Pagaidām netiek izmantots vājš savienojums."</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"Parole"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Spiedpoga"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"Parole"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nav"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Piekļuves punkta PIN kods"</item>
-    <item msgid="7364462169350112617">"Šīs ierīces PIN kods"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statisks"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Izņemama SD karte"</item>
     <item msgid="4498124044785815005">"Ļaut sistēmai izlemt"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Izslēgts"</item>
-    <item msgid="4804571292609523335">"Vibrozvans"</item>
-    <item msgid="595707141547423573">"Izslēgt skaņu"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Īss"</item>
     <item msgid="2560532955514699713">"Vidējs"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animācijas mērogs: 5x"</item>
     <item msgid="6660750935954853365">"Animācijas mērogs: 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animācija izslēgta"</item>
+    <item msgid="1138649021950863198">"Animācijas mērogs: 0,5x"</item>
+    <item msgid="4394388961370833040">"Animācijas mērogs: 1x"</item>
+    <item msgid="8125427921655194973">"Animācijas mērogs: 1,5x"</item>
+    <item msgid="3334024790739189573">"Animācijas mērogs: 2x"</item>
+    <item msgid="3170120558236848008">"Animācijas mērogs: 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2fe7124..fd28a09 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Jā"</string>
     <string name="no" msgid="6731231425810196216">"Nē"</string>
+    <string name="create" msgid="3578857613172647409">"Izveidot"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neļaut izmantot Bluetooth iezvanprogrammu, kad ekrāns ir bloķēts"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth ierīces"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Ierīces nosaukums"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Ierīces iestatījumi"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profila iestatījumi"</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_rename_device" product="tablet" msgid="787970073150631155">"Pārdēvēt planšetdatoru"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Notiek pāra izveide..."</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="5655704645616731277">"Piesk., lai sav.pārī"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Tuvumā nav 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="1931617700075106801">"Pieskarieties, lai izveidotu savienojumu pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Pieskarieties, lai izveidotu savienojumu pārī ar ierīci <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="device_picker" msgid="8398232791303186677">"Bluetooth ierīces izvēle"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth atļaujas pieprasījums"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu. Vai atļaut?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt planšetdatoru redzamu citām Bluetooth ierīcēm. Vai atļaut?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Labi"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Ierakstītais saimniekdatora nosaukums nav derīgs."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Ierakstītais izslēgšanas saraksts nav pareizi formatēts. Ierakstiet ar komatiem atdalītu izslēgto domēnu sarakstu."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Aizpildiet porta lauku."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Aizpildiet lauku Ports."</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="2671425042711054494">"Ierakstītais porta numurs nav derīgs."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP starpniekserveris tiek izmantots pārlūkprogrammā, taču, iespējams, netiek izmantots citās lietotnēs."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Iestatīt"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Neizdevās"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Izdevās"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Izmaiņas stājas spēkā, kad USB kabelis tiek no jauna pievienots"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Izmaiņas stājas spēkā, kad atkal tiek pievienots USB kabelis."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Iespējot USB lielapjoma krātuvi"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Kopējais baitu skaits:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB krātuve nav uzstādīta"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nav SD kartes"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB atmiņa nav uzstādīta."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Nav SD kartes."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Pieejamie baiti:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB kr. tiek izm. kā lielapj. atm. ier."</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD karte tiek lietota kā lielapjoma krātuves ierīce"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Var droši atvienot USB atmiņu"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Tagad var droši izņemt SD karti"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB atm. kā lielapj. atm. ier."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD karte tiek izmantota kā lielapjoma atmiņas ierīce."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Var droši atvienot USB atmiņu."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Tagad var droši izņemt SD karti."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB kr. liet. laikā tika noņ.!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD karte tika izņemta lietošanas laikā!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Izlietotie baiti:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Notiek USB kr. sken., lai atr. multividi"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB atm. uzst. kā tikai las."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD karte ir 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="5349877711342869319">"Valoda"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Viesabonēšanas laikā izveidot savienojumu ar datu pakalpojumiem"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Datu savienojamība ir zaudēta, jo mājas tīkls ar datu viesabonēšanu ir izslēgts."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ieslēgt"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Vai atļaut datu viesabonēšanu? Var rasties ievērojamas viesabonēšanas izmaksas."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Uzmanību!"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Atļaujot datu viesabonēšanu, var rasties ievērojamas viesabonēšanas izmaksas."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Vai atļaut datu viesabonēšanu?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatora atlase"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Izvēlēties tīkla operatoru"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datums un laiks"</string>
@@ -283,12 +285,14 @@
     <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>
     <string name="date_time_set_date" msgid="7021491668550232105">"Iestatīt datumu"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Datuma formāta atlasīšana"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Datuma formāta izvēle"</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="date_picker_title" msgid="1338210036394128512">"Datums"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Laiks"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Uzlabot sejas atbilstību"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Dzīvīguma pārbaude"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Jāpamirkšķina acis"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Varat šifrēt savus kontus, iestatījumus, lejupielādētās lietotnes un ar tām saistītos datus, multivides failus un citus failus. Ja planšetdators ir šifrēts, ikreiz, kad to ieslēdzat, ir jāveic atšifrēšana, ievadot ciparu 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. Pirms šifrēšanas ir jāuzlādē akumulators un planšetdators ir jāpievieno barošanas avotam līdz brīdim, kad šifrēšana ir pabeigta. Pārtraucot šifrēšanas procesu, tiks zaudēti visi dati vai daļa no tiem."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Varat šifrēt savus kontus, iestatījumus, lejupielādētās lietotnes un ar tām saistītos datus, multivides failus un citus failus. Ja tālrunis ir šifrēts, ikreiz, kad to ieslēdzat, ir jāveic atšifrēšana, ievadot ciparu PIN kodu vai paroli. Tālruņa š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. Pirms šifrēšanas ir jāuzlādē tālruņa akumulators, un tālrunis ir jāpievieno barošanas avotam līdz brīdim, kad šifrēšana ir pabeigta. Pārtraucot šifrēšanas procesu, tiks zaudēti visi dati vai to daļa."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet planšetdatoru, katru reizi ieslēdzot to, būs jāievada ciparu PIN vai parole, lai planšetdatoru atšifrētu. Planšetdatora šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati."\n\n"Šifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un planšetdatoram ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet tālruni, katru reizi to ieslēdzot, būs jāievada ciparu PIN vai parole, lai tālruni atšifrētu. Tālruņa šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati."\n\n"Šifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un tālrunim ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</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="2029407131227814893">"Uzlādējiet akumulatoru un mēģiniet vēlreiz."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Pievienojiet lādētāju 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_dialog_need_password_message" msgid="4071395977297369642">"Lai varētu sākt šifrēšanu, ir jāiestata bloķēšanas ekrāna PIN vai parole."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vai veikt šifrēšanu?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Šifrēšanas darbība ir neatgriezeniska; pārtraucot šifrēšanu, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, un tās laikā planšetdators vairākas reizes tiks restartēts."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Šifrēšanas darbība ir neatgriezeniska; pārtraucot šifrēšanu, dati tiks zaudēti. Šifrēšana ilgst vienu stundu vai ilgāk, un 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="6689952371032099350">"Uzgaidiet, kamēr tiek šifrēts jūsu planšetdators. Pabeigti <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Uzgaidiet, kamēr tiek šifrēts jūsu tālrunis. 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="2223340178473871064">"Ierakstiet paroli"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrēšana neizdevās."</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tādējādi planšetdatora dati vairs nav pieejami."\n\n"Lai atsāktu lietot planšetdatoru, ir jāveic atiestatīšana uz rūpnīcas iestatījumiem. Kad esat veicis atiestatīšanu, varat atjaunot jebkādus datus, kas tika dublēti jūsu Google kontā."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tādējādi tālruņa dati vairs nav pieejami."\n\n"Lai atsāktu lietot tālruni, ir jāveic atiestatīšana uz rūpnīcas iestatījumiem. Kad esat veicis atiestatīšanu, varat atjaunot jebkādus datus, kas tika dublēti jūsu Google kontā."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Ekrāna bloķēš. atlase"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Planšetdatora dati vairs nav pieejami."\n\n"Lai atsāktu lietot planšetdatoru, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis planšetdatora iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tālruņa dati vairs nav pieejami."\n\n"Lai atsāktu lietot tālruni, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis tālruņa iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Pārslēgt ievades metodi"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekrāna bloķēš. izvēle"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Rezerves bloķ. izvēle"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Autorizācija pēc sejas"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Shēma"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parole"</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>
@@ -362,44 +367,44 @@
     <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="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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"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="6419879099090294052">"PIN nedrīkst būt garāks par <xliff:g id="NUMBER">%d</xliff:g> cipariem."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN kodā var būt tikai cipari 0–9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Ierīces administrators neļauj izmantot nesen izveidotu PIN."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Parolē ir neatļauta rakstzīme."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Parolē ir jābūt vismaz vienam burtam."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Parolē ir jābūt vismaz vienam ciparam."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Parolē ir jābūt vismaz 1 burtam."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Parolē ir jābūt vismaz 1 mazajam burtam."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Parolē ir jābūt vismaz 1 lielajam burtam."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Parolē ir jābūt vismaz 1 ciparam."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Parolē ir jābūt vismaz 1 īpašajam simbolam."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Parolē ir jābūt vismaz 1 rakstzīmei, kas nav burts."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Ierīces administrators neļauj izmantot nesen izveidotu 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="lock_setup" msgid="1759001157415978959">"Iestatīšana pabeigta"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Iestatīšana ir pabeigta."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Ierīces administrācija"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Lai izveidotu savienojumu pārī ar ierīci <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, ierakstiet ierīcē pieprasīto 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_enter_pin_other_device" msgid="4637977124526813470">"Iespējams, šis PIN būs jāievada arī otrā ierīcē."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Lai izveidotu savienojumu pārī ar ierīci <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, ierakstiet tajā atslēgu <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> un pēc tam nospiediet ievadīšanas taustiņu."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nevarēja savienot pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, jo tika ievadīts nepareizs PIN kods vai nepareiza ieejas atslēga."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nevar sazināties ar ierīci <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> 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_connecting_error_message" msgid="229861986106185022">"Nevarēja izveidot savienojumu ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Atļaut datu apmaiņu, kad tālrunis saskaras ar citu ierīci"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Atļaut datu apmaiņu, kad planšetdators saskaras ar citu ierīci"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Atļaut datu apmaiņu, kad tālrunis saskaras ar citu ierīci"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Gatavs pārraidīt lietotnes saturu, izmantojot NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Izslēgta"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nav pieejams, jo NFC ir izslēgti."</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Ja šī funkcija ir ieslēgta, varat pārvietot lietotnes saturu uz citu ierīci, kas atbalsta NFC, novietojot ierīces blakus vienu otrai. Piemēram, varat pārvietot pārlūkprogrammas lapas, YouTube videoklipus, kontaktpersonas lietotnē Personas un citu saturu."\n\n"Vienkārši novietojiet ierīces blakus (parasti saskaroties to aizmugures daļai) un pieskarieties savam ekrānam. Lietotne noteiks pārvietojamo informāciju."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Tīkla pakalpojuma atrašana"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Atļaut citās ierīcēs esošām lietotnēm atrast šajā ierīcē esošās lietotnes"</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="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_setup_wizard_title" msgid="70277346338812325">"Izvēlēties Wi-Fi tīklu"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nevar skenēt tīklus"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Tīkla paziņojums"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Informēt mani, kad ir pieejams atvērts tīkls"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Novērst nekvalitatīvus savienojumus"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Nelietot Wi-Fi tīklu, ja vien tam nav kvalitatīvs interneta savienojums"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Nelietot nekvalitatīvus savienojumus"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nelietot Wi-Fi tīklu, ja vien tam nav kvalitatīvs interneta savienojums"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Aktivizēt Wi-Fi arī miega režīmā"</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_wps_pbc" msgid="2668564692207863017">"WPS spiedpoga"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN ievade"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Notiek Wi-Fi tīklu meklēšana…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Cits tīkls..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Vairāk"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. iestatīšana (WPS)"</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="8242979682530043184">"Ierakstiet piekļuves punkta PIN kodu"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS iestatīšana"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Piekļuves punktā ierakstiet PIN kodu <xliff:g id="WPS_PIN">%1$s</xliff:g>"</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_wps_setup_title" msgid="6034518116333042484">"Wi-Fi aizsargātā iestatīšana"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Notiek WPS sākšana..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Nospiediet maršrutētāja pogu “Wi-Fi aizsargātā iestatīšana”. Uz tās var būt rakstīts WPS, vai var būt redzams šāds simbols:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Ievadiet Wi-Fi maršrutētājā PIN numuru <xliff:g id="NUMBER">%1$s</xliff:g>. Iestatīšana var ilgt līdz pat divām minūtēm."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS bija veiksmīga. Notiek savienojuma izveide ar tīklu..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Ir izveidots savienojums ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS jau notiek, un tās pabeigšana var ilgt divas minūtes."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS neizdevās. Lūdzu, pēc dažām minūtēm mēģiniet vēlreiz."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Bezvadu maršrutētāja drošības iestatījums (WEP) netiek atbalstīts."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Bezvadu maršrutētāja drošības iestatījums (TKIP) netiek atbalstīts."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentificēšana neizdevās. Lūdzu, mēģiniet vēlreiz."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Tika noteikta cita WPS sesija. Lūdzu, pēc dažām minūtēm 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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Novērsts nekvalitatīvs interneta savienojums"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Vāja savienojuma signāla dēļ netika izveidots savienojums ar tīklu. Lai izslēgtu šo funkciju, ekrānos Iestatījumi &gt; Wi-Fi atlasiet izvēlnes vienumu Papildu."</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_wps_available_first_item" msgid="3538912605343585226">"Ir pieejams aizsargāts tīkls"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (ir pieejams aizsargāts tīkls)"</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_failed_connect_message" msgid="8491902558970292871">"Neizdevās izveidot savienojumu ar tīklu."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Neiegaumēt"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Neizdevās aizmirst tīklu."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Saglabāt"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Neizdevās saglabāt tīklu."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Atcelt"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Tika noteikta cita aizsarg. Wi-Fi ses. 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Vārteja"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tīkla prefiksa garums"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Iestatīt vienādranga savienojamību"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informācija par ierīci"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi aizsargātā iestatīšana"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Ierakstiet PIN kodu"</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_remove_group" msgid="4844634506540667517">"Noņemt grupu"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Papildu"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Pieejamās ierīces"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Meklēt ierīces"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Notiek meklēšana..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Pārdēvēt ierīci"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vienādranga ierīces"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Nevarēja izveidot savienojumu."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Neizdevās pārdēvēt ierīci."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Vai pārtraukt savienojumu?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Atvienojot tiks pārtraukts savienojums ar ierīci <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Atvienojot tiks pārtraukts savienojums ar ierīci <xliff:g id="PEER_NAME">%1$s</xliff:g> un vēl <xliff:g id="PEER_COUNT">%2$s</xliff:g> citām ierīcēm."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vai atcelt uzaicinājumu?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vai vēlaties atcelt uzaicinājumu izveidot savienojumu ar ierīci <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Konfigurēt Wi-Fi tīklāju"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Iestatī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="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Klusuma režīms"</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="4296957391257836961">"Skaļumi"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Mūzikas efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Zvanītāja skaļums"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrē klusuma režīmā"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrozvans un zvans"</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="incoming_call_volume_title" msgid="8073714801365904099">"Zvana signāls"</string>
@@ -605,7 +628,7 @@
     <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="8533399267725365088">"Numuru sastādīšanas tastatūras pieskāriena signāli"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Cipartastatūras skā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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Izslēgt zvana signāla un paziņojumu skaņu"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Izslēgt mūzikas un citu multivides failu skaņu"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Izslēgt paziņojumu skaņu"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Izslēgt brīdinājumu skaņu"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrēt zvanot"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Pirms doka audio iestatīšanas planšetdators ir jāpievieno dokam."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Pirms doka audio iestatīšanas tālrunis ir jāpievieno dokam."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Pirms dokošanas skaņas iestatīšanas veiciet planšetdatora dokošanu."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Pirms dokošanas skaņas iestatīšanas veiciet tālruņa dokošanu."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dokā ievietošanas skaņa"</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="account_settings" msgid="6403589284618783461">"Konti"</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="7965901687241669598">"Attēls"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mans tālruņa numurs"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"PRL versija"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vai dzēst visu jūsu personīgo informāciju un visas lejupielādētās lietotnes? Šo darbību nevar atcelt!"</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="2234954758550554549">"Ir jāuzzīmē atbloķēšanas shēma, lai apstiprinātu rūpnīcas datu atiestatīšanu."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Lai apstiprinātu rūpnīcas datu atiestatīšanu, norādiet grafisko atslēgu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Atiestatīšana netika veikta, jo nav pieejams pakalpojums Sistēmas tīrīšana."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vai atiestatīt?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Dzēst USB krātuvi"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vai izdzēst SD kartes saturu, tostarp visus tajā saglabātos failus? Šo darbību nevar atcelt!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Dzēst visu"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Zīmējiet atbloķēšanas kombināciju."</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Ir jāuzzīmē atbloķēšanas shēma, lai apstiprinātu, ka vēlaties dzēst USB krātuvi."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Lai apstiprinātu USB atmiņas satura dzēšanu, norādiet grafisko atslēgu."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Lai apstiprinātu SD kartes satura dzēšanu, norādiet grafisko atslēgu."</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="6688416425801386511">"USB saistīšana"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilo sakaru tīkli"</string>
     <string name="location_title" msgid="1029961368397484576">"Mana atrašanās vieta"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google atrašanās vietas pak."</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Ļaut lietotnēm izmantot datus no tādiem avotiem kā Wi-Fi un mobilie tīkli, lai aptuveni noteiktu jūsu atrašanās vietu."</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Ļaut nos. Google serv. anon. datus par vietu. Ļaut atļ. liet. izm. datus no Wi-Fi un mob. tīkliem, lai apt. not. 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Lai saņemtu palīdzību, nospiediet Izvēlne."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Atbrīvojiet pirkstu, kad esat pabeidzis."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Pievienojiet vismaz <xliff:g id="NUMBER">%d</xliff:g> punktus. Mēģiniet vēlreiz:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Kombinācija ir ierakstīta!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Kombinācija ir ierakstīta."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Vēlreiz zīmējiet kombināciju, lai apstiprinātu:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Jaunā atbloķēšanas kombinācija:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Apstiprināt"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"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="1075370160667458122">"Aizsargājiet savu planšetdatoru pret neatļautu lietošanu, izveidojot personalizētu ekrāna atbloķēšanas rakstu. Velkot ar pirkstu, jebkurā secībā savienojiet nākamajā ekrānā redzamos punktus. Ir jāsavieno vismaz četri punkti. "\n\n"Vai esat gatavs sākt? Pieskarieties vienumam Tālāk."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Aizsargājiet savu planšetdatoru pret neatļautu lietošanu, izveidojot personalizētu ekrāna grafisko atslēgu. Velkot ar pirkstu, jebkurā secībā savienojiet nākamajā ekrānā redzamos punktus. Ir jāsavieno vismaz četri punkti. "\n\n"Vai esat gatavs sākt? Pieskarieties vienumam Tālāk."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Aizsargājiet savu tālruni pret neatļautu lietošanu, izveidojot personalizētu ekrāna atbloķēšanas rakstu. Velkot ar pirkstu, jebkurā secībā savienojiet vismaz četrus no nākamajā ekrānā redzamajiem punktiem. "\n\n"Vai esat gatavs sākt? Pieskarieties vienumam Tālāk."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pārvaldīt lietotnes"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pārvaldiet un noņemiet instalētās lietotnes"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Pārvaldīt lietotnes, iestatīt ātrās palaišanas saīsnes"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Lietotnes iestatījumi"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nezināmi avoti"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Atļaut instalēt lietotnes, kas nav lejupielādētas no vietnes Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Atļaut instalēt lietotnes no nezināmiem avotiem"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Lietotnes no nezināmiem avotiem ir īpaši bīstamas jūsu planšetdatoram un personīgajiem datiem. Jūs piekrītat uzņemties vienpersonisku atbildību par jebkādiem planšetdatora bojājumiem vai datu zudumiem, ko var izraisīt šādu lietotņu izmantošana."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Lietotnes no nezināmiem avotiem ir īpaši bīstamas jūsu tālrunim un personīgajiem datiem. Jūs piekrītat uzņemties vienpersonisku atbildību par jebkādiem tālruņa bojājumiem vai datu zudumiem, ko var izraisīt šādu lietotņu izmantošana."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Papildu iestatījumi"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Informācija par lietotni"</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="auto_launch_label_generic" msgid="3230569852551968694">"Noklusējuma iestatījumi"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Notīrīt datus"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Atinstalēt atjauninājumus"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Jūs esat norādījis, ka, veicot noteiktas darbības, pēc noklusējuma ir jāpalaiž šī lietotne."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Jūs esat izvēlējies šai lietotnei ļaut veidot logrīkus un piekļūt to datiem."</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="1616155457673106022">"Iespējams, ka šī lietotne nav paredzēta jūsu ierīces ekrānam. Šeit varat norādīt, kā lietotne jārāda jūsu ekrānā."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Kārtot pēc izmēra"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Rādīt aktīvos pakalp."</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Rādīt kešatmiņā iev. pr."</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Atiest. lietotnes prefer."</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vai atiest. liet. pref.?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tādējādi tiks atiestatītas visas preferences saistībā ar:"\n\n<li>"atspējotajām lietotnēm;"</li>\n<li>"atspējoto lietotņu paziņojumiem;"</li>\n<li>"noklusējuma lietojumprogrammām attiecībā uz darbību veikšanu;"</li>\n<li>"fona datu ierobežojumiem attiecībā uz lietotnēm."</li>\n\n"Jūs nezaudēsiet lietotņu datus."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Atiestatīt lietotnes"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Vietas pārvaldība"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrs"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Izvēlēties filtra opcijas"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Šai lietotnei jūsu planšetdatorā ir šādas piekļuves tiesības:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Šai lietotnei tālrunī ir tiesības piekļūt šādam saturam:"</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="invalid_size_value" msgid="7563537715280712285">"Nevar aprēķināt pakotnes izmēru."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nav instalēta neviena trešās puses lietotne."</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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Mainīt jaunu lietotņu vēlamo instalēšanas vietu"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Vai atspējot iebūvēto lietotni?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ja atspējosiet iebūvētu lietotni, var rasties citu lietotņu darbības traucējumi."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vai izslēgt paziņojumus?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Izslēdzot paziņojumus šajā lietotnē, varat palaist garām svarīgus brīdinājumus un atjauninājumus."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Krātuves lietojums"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Skatīt lietotnēm izmantoto atmiņu"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktīvie pakalpojumi"</string>
@@ -1042,8 +1078,8 @@
     <string name="service_started_by_app" msgid="818675099014723551">"Startēja lietotne."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="6844156253576174488">"Br.: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="service_foreground_processes" msgid="7583975676795574276">"Izm.: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"Brīvs: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"Aizņemts: <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 />
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Izmantojot šo ievades metodi, var tikt vākta informācija par visu ierakstīto tekstu, tostarp personiskiem datiem, piemēram, parolēm un kredītkaršu numuriem. Šī metode ir saistīta ar lietotni <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vai lietot šo ievades metodi?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Izmantojot šo pareizrakstības pārbaudītāju, var tikt vākta informācija par visu ierakstīto tekstu, tostarp personīgiem datiem, piemēram, parolēm un kredītkaršu numuriem. Šis pareizrakstības pārbaudītājs ir saistīts ar lietotni <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vai izmantot šo pareizrakstības pārbaudītāju?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Iestatījumi"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Valoda"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Neizdevās atvērt lietotnes <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> iestatījumus."</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Pele/kursorplanšete"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Rādītāja ātrums"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Spēļu vadība"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Vibrosignāla izmantošana"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Novirziet vibrosignālu uz spēļu vadības ierīci, kad tā ir pievienota."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Tastatūras izkārtojuma izvēle"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Iestatīt tastatūras izkārtojumus"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Lai pārsl., nosp. Ctrl + atst. t."</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Noklusējums"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastatūras izkārtojumi"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Lietotāja vārdnīca"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personiskā vārdnīca"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personiskās 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_add_screen_title" msgid="742580720124344291">"Frāze"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Vairāk opciju"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Mazāk opciju"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"Labi"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Vārds:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Saīsne:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Valoda:"</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="8165273379942105271">"Lietotāja vārdnīcā nav neviena vārda. Lai pievienotu vārdu, pieskarieties pogai Pievienot (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Visas valodas"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Visās valodās"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Citas valodas..."</string>
     <string name="testing" msgid="6584352735303604146">"Testēšana"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informācija par planšetdatoru"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informācija par tālruni"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Iestatīt lietotņu izstrādes opcijas"</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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Izstrādes ierīces ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Informācija par ierīci nav pieejama"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Atstāt nomodā"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Uzlādes laikā ekrāns nekad nepārslēgsies miega režīmā"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vai atļaut USB atkļūdošanu?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB atkļūdošana ir paredzēta tikai ar izstrādi saistītām darbībām. Izmantojiet to datu kopēšanai no datora uz ierīci un pretēji, lietotņu instalēšanai ierīcē bez paziņojumiem un žurnāla datu lasīšanai."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Vai atļaut izstrādes iestatījumus?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Šie iestatījumi ir paredzēti tikai izstrādei. To dēļ var tikt pārtraukta vai traucēta ierīces un lietojumprogrammu darbība."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Aizsargāt USB atmiņu"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Lietotnēm ir jāpieprasa atļauja lasīt USB atmiņu."</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vai aizsargāt USB atmiņu?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Ja USB atmiņa ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas."\n\n"Dažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Aizsargāt SD karti"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Lietotnēm ir jāpieprasa atļauja lasīt SD karti."</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vai aizsargāt SD karti?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ja SD karte ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas."\n\n"Dažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Izvēlēties sīkrīku"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Izvēlēties logrīku"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vai izveidot logrīku un atļaut piekļuvi?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Pēc logrīka izveidošanas <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> var piekļūt visiem tajā attēlotajiem datiem."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Vienmēr ļaut <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> veidot logrīkus un piekļūt to datiem."</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>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Paroļu izrunāšana"</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="3264723681038625967">"Tīmekļa skriptu instalēšana"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Tīmekļa pieejamības uzlabošana"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nav instalēts neviens pakalpojums."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Vai jums ir nepieciešams ekrāna lasītājs?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Lietotne TalkBack par ekrānā notiekošo informē balss komentāru veidā, lai palīdzētu neredzīgiem un vājredzīgiem lietotājiem. Vai vēlaties to instalēt bez maksas no vietnes Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Vai instalēt tīmekļa skriptus?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vai vēlaties, lai lietotnes instalētu skriptus no Google, kas padara to tīmekļa saturu pieejamāku?"</string>
-    <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="1072730037861494125">"Apraksts nav sniegts."</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_not_available" msgid="3214000535532434353">"Akumul. liet. dati nav pieej."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"Izvēlēto programmu nevar palaist."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurēt"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Izvēlēties citu programmu"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Lietojot šo runas sintēzes programmu, var tikt apkopots viss ierunātais teksts, tostarp tāda personīgā informācija kā paroles un kredītkaršu numuri. Tā ir no <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> programmas. Vai iespējot šīs runas sintēzes programmas lietošanu?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Sieviete"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Iespējojiet jauno programmu."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Norādiet atbloķēšanas kombināciju."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Lai apstiprinātu akreditācijas datu instalēšanu, norādiet atbloķēšanas kombināciju."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ierakstiet akreditācijas datu krātuves paroli."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Pašreizējā parole:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Akreditācijas datu krātuve ir izdzēsta."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Akred. datus nevarēja izdzēst"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Akreditācijas datu krātuve ir iespējota."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Lai varētu izmantot akreditācijas datu atmiņu, ir jāiestata ekrāna bloķēšanas PIN kods vai parole."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Lai varētu izmantot akreditācijas datu atmiņu, ir jāiestata bloķēšanas ekrāna PIN vai parole."</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="5446972770562918934">"Dublēt un atiestatīt"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Automātiska atjaunošana"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Atkārtoti instalējot lietotni, atjaunot dublētos iestatījumus un datus"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Datora dublējuma parole"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Darbvirsmas 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="local_backup_password_summary_none" msgid="393503434408227110">"Darbvirsmas pilnie dublējumi pašlaik nav aizsargāti."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Pieskarieties, lai mainītu vai noņemtu paroli pilniem darbvirsmas dublējumiem."</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vai pārtraukt Wi-Fi paroļu, grāmatzīmju, lietotņu datu un citu iestatījumu dublēšanu un dzēst visas to kopijas Google serveros?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ierīces administrācijas iestatījumi"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Šis administrators ir aktivizēts un sniedz lietotnei <xliff:g id="APP_NAME">%1$s</xliff:g> atļauju 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_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="6047518536574673606">"Sistēma"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Zvana signāls un vibrozvans"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Notiek savienojuma izveide ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Sinhronizācija neizdevās"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sinhronizācija darbojas"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Sinhronizācija"</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="background_data" msgid="5779592891375473817">"Fona dati"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Pēdējoreiz sinhronizēts: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Pašlaik notiek sinhronizācija…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Laipni lūdzam pakalpojumā Google Sync!"</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="6205903695598000286">"Lietotnes 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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Šis konts ir nepieciešams dažām lietotnēm. To var noņemt, tikai atjaunojot planšetdatora rūpnīcas noklusējuma iestatījumus (tādējādi dzēšot visus personīgos datus) sadaļā Iestatījumi &gt; Dublēt un atiestatīt."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Šis konts ir nepieciešams dažām lietotnēm. To var noņemt, tikai atjaunojot tālruņa rūpnīcas noklusējuma iestatījumus (tādējādi dzēšot visus personīgos datus) sadaļā Iestatījumi &gt; Dublēt un atiestatīt."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nevar sinhronizēt manuāli"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Pašlaik ir atspējota šī vienuma sinhronizācija. Lai mainītu šo iestatījumu, īslaicīgi ieslēdziet fona datu lietojumu un automātisko sinhronizāciju."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G iestatījumi"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adrese"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ierakstiet paroli, lai atšifrētu atmiņu"</string>
     <string name="try_again" msgid="4272075051293936921">"Mēģiniet vēlreiz."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Pakalpojums ir aizņemts. Mēģiniet vēlreiz."</string>
     <string name="delete" msgid="4219243412325163003">"Dzēst"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Atkļūdošana"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Atlasīt atkļūdošanas lietotni"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nav iestatīta neviena atkļūdošanas lietotne"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Atkļūdošanas lietotne: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Lietojumprogrammas atlase"</string>
+    <string name="no_application" msgid="2813387563129153880">"Nekas"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Gaidīt atkļūdotāju"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Gaida atkļūdotāju, ko pirms izp. piev. atkļ. liet."</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Ievade"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Zīmējums"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Pārraudzība"</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_screen_updates" msgid="5470814345876056420">"Rādīt virsmas atjaunin."</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Atjaun. visa loga virsmas, kad tās tiek atjaunin."</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Rādīt GPU skat. atjaun."</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Atjaunināt logu skat., ja zīm. tiek liet. GPU."</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Atspējot HW pārklājumus"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Vienmēr izmantot GPU atveidi ekrāna salikšanai"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Iespējot trases"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Iespējoto trašu atlase"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Pašlaik nav iespējota neviena trase."</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Pašlaik iespējotas <xliff:g id="NUM">%1$d</xliff:g> trases."</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Pašlaik iespējotas visas trases."</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Rādīt izkārtojuma robežas"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Rādīt klipu robežas, malas utt."</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="force_hw_ui" msgid="6426383462520888732">"Veikt piespiedu GPU atv."</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Lietojumpr. izmantot 2D aparatūras paātrināšanu"</string>
+    <string name="force_hw_ui" msgid="6426383462520888732">"Piespiedu GPU render."</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Izmantot GPU atveidi divdimensiju zīmējumiem"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profila GPU atveide"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mērīt atveides laiku: adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Animācijas ilguma mērogs"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Lietotnes"</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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobilie tīklāji"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Datu automātiska sinhronizācija"</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="8621855507876539282">"Šajā periodā lietotnes neizmantoja datus."</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_disclaimer" product="tablet" msgid="2591250607795265503">"Aprēķināts planšetd. Jūsu mob. sak. oper. aprēķini par datu izm. var atšķirties."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Aprēķināts tālrunī. Jūsu mob. sak. oper. aprēķini par datu izm. var atšķirties."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"ierobežots"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Vai atspējot mobilos datus?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Iestatīt mobilo datu ierobež."</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Iestatīt 4G datu ierobežojumu"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mob. tīkli"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Neviens"</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="8430240158135453271">"Skatīt lietotnes iestatījumus"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ierobežot fona datus"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Atsp. fona d. tikai mob. d. tīklā. Wi-Fi tiks izm., ja pieejams."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Atsp. fona datus mob. tīklos. Tiks izm. citi tīkli, ja pieejami."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Lai ierob. fona d. šai liet., vispirms jāiest. mob. d. ierobež."</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="5651588785118290771">"Šīs funkcijas dēļ lietotnes, kas ir atkarīga no fona datiem, darbība var tikt pārtraukta, ja Wi-Fi nav pieejams."\n\n"Atbilstošākas datu izmantošanas vadīklas ir atrodamas iestatījumos, kas ir pieejami lietotnē."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ja būs pieejami tikai mobilie tīkli, šī funkcija var pārtraukt tādas lietotnes darbību, kurā tiek izmantoti fona dati."\n\n"Lietotnē pieejamajos iestatījumos varat skatīt citas piemērotas datu lietojuma vadīklas."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Fona datu ierobežošana ir iespējama tikai tad, ja ir iestatīts mobilo datu ierobežojums."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Vai ieslēgt datu automātisko sinhronizāciju?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Visas tīmekļa kontā veiktās izmaiņas tiks automātiski kopētas uz jūsu planšetdatoru."\n\n"Daži konti var arī automātiski kopēt visas planšetdatorā veiktās izmaiņas uz tīmekļa kontu. Google konts darbojas šādā veidā."\n\n"Lai izvēlētos sinhronizējamās informācijas veidu katrā kontā, skatiet: Iestatījumi &gt; Konti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Visas jūsu tīmekļa kontos veiktās izmaiņas tiks automātiski kopētas uz jūsu tālruni."\n\n"Daži konti var arī automātiski kopēt visas tālrunī veiktās izmaiņas uz tīmekļa kontu. Google konts darbojas šādā veidā."\n\n"Lai izvēlētos sinhronizējamās informācijas veidu katrā kontā, skatiet: Iestatījumi &gt; Konti."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vai izslēgt datu automātisko sinhronizāciju?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Tiks saglabāti dati un akumulatora lietojums, bet jums vajadzēs manuāli sinhronizēt katru kontu, lai apkopotu jaunāko informāciju. Un jūs nesaņemsiet paziņojumus par atjauninājumiem."</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_warning_editor_title" msgid="3704136912240060339">"Datu lietošanas brīdinājuma iestatīšana"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Datu lietošanas ierobežojuma iestatīšana"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Datu izmantošanas ierobežošana"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Jūsu <xliff:g id="NETWORKS">%1$s</xliff:g> datu savienojums tiks atspējots, tiklīdz tiks sasniegts noteiktais ierobežojums."\n\n"Tā kā datu izmantošanas apjoms tiek aprēķināts planšetdatorā un jūsu mobilo sakaru operatora aprēķini par datu izmantošanu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Jūsu <xliff:g id="NETWORKS">%1$s</xliff:g> datu savienojums tiks atspējots, tiklīdz tiks sasniegts noteiktais ierobežojums."\n\n"Tā kā datu izmantošanas apjoms tiek aprēķināts tālrunī un jūsu mobilo sakaru operatora aprēķini par datu izmantošanu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobilais datu savienojums tiks atspējots, tiklīdz būs sasniegts noteiktais ierobežojums."\n\n"Tā kā datu lietojuma apjoms tiek aprēķināts planšetdatorā un mobilo sakaru operatoru aprēķini par datu lietojumu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobilais datu savienojums tiks atspējots, tiklīdz būs sasniegts noteiktais ierobežojums."\n\n"Tā kā datu lietojuma apjoms tiek aprēķināts tālrunī un mobilo sakaru operatoru aprēķini par datu lietojumu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vai ierobežot fona datus?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ja tiks ierobežoti fona mobilie dati, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: izmantots aptuveni <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: izmantots apmēram <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: izm. apm. <xliff:g id="TOTAL">%1$s</xliff:g> (noteikts planšetdatorā). Mob. sak. oper. aprēķini var atšķirties."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: izmantots apm. <xliff:g id="TOTAL">%1$s</xliff:g> (noteikts tālrunī). Mob. sak. operat. aprēķini var atšķirties."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilie tīklāji"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Atlasiet Wi-Fi tīklus, kas ir mobilie tīklāji. Lietotnēm var  aizliegt izmantot šos tīklus, ja tās darbojas fonā. Lietotnes var brīdināt pirms šo tīklu izmantošanas, lai veiktu lielas lejupielādes."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilie tīkli"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi tīkli"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Lai atlasītu mobilos tīklājus, ieslēdziet Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"VPN profila rediģēšana"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Savienojuma izveide ar <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Pievienot VPN profilu"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Rediģēt profilu"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Dzēst profilu"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Nav tīkla savienojuma. Lūdzu, vēlāk mēģiniet vēlreiz."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Nav norādīts sertifikāts. Lūdzu, rediģējiet profilu."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"Kad ir ieslēgta iespēja Atklāt pieskaroties, varat pieskarties ekrānam, lai uzzinātu vairāk par vienumu, virs kura atrodas jūsu pirksts. Piemēram, pašreizējā ekrānā ir redzamas lietotņu ikonas. Atrodiet kādu no tām, pieskaroties ekrānam un velkot pa to 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="3973201880357468747">"Lai aktivizētu vienumu, pie kura atrodas jūsu pirksts, pieskarieties šim vienumam. Velciet ar 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="8764686624055084454">"Lai ritinātu sarakstu, varat ar diviem pirkstiem vilkt pa ekrānu. Piemēram, pašreizējā ekrānā ir redzams lietotņu nosaukumu saraksts, kuru var ritināt uz augšu vai uz leju. Vispirms mēģiniet sarakstā norādīt dažus vienumus, ar vienu pirkstu velkot pa ekrānu."</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="3055831259260848004">"Jūs esat pabeidzis mācības. 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="spellcheckers_settings_title" msgid="399981228588011501">"Pareizrakstības pārbaudītājs"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Šeit ierakstiet pašreizējo pilna dublējuma paroli"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Šeit ierakstiet jaunu pilna dublējuma paroli"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Šeit atkārtoti ierakstiet jauno pilna dublējuma paroli"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Atcelt"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Papildu sistēmas atjauninājumi"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Lietotāji un ierobežojumi"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Lietotāji"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Pievienot lietotāju"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Datu rediģēšana"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Lietotāja informācija"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nosaukums"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Satura ierobežojumi"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Pieprasīt PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Satura vērtējums"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Sistēmas lietotnes"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Instalētās lietotnes"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Atmest"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Noņemt lietotāju"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Neciešams bērns"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vai noņemt lietotāju?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Vai tiešām vēlaties no ierīces noņemt lietotāju un visus ar viņu saistītos datus?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rādīt paziņojumus"</string>
+    <string name="help_label" msgid="1107174367904110532">"Palīdzība"</string>
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 282b647..257c0b8 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Memutuskan sambungan..."</item>
     <item msgid="1634960474403853625">"Diputuskan sambungan"</item>
     <item msgid="746097431216080650">"Tidak berjaya"</item>
+    <item msgid="6367044185730295334">"Disekat"</item>
+    <item msgid="503942654197908005">"Mengelakkan sambungan lemah buat sementara"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <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>
+    <item msgid="5660739516542454527">"Disekat"</item>
+    <item msgid="1805837518286731242">"Mengelakkan sambungan lemah buat sementara"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Butang tekan"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Tiada"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN dari titik akses"</item>
-    <item msgid="7364462169350112617">"PIN dari peranti ini"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statik"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Kad SD boleh tanggal"</item>
     <item msgid="4498124044785815005">"Biar sistem menentukan"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Dimatikan"</item>
-    <item msgid="4804571292609523335">"Getar"</item>
-    <item msgid="595707141547423573">"Redam"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Pendek"</item>
     <item msgid="2560532955514699713">"Sederhana"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Skala animasi 5x"</item>
     <item msgid="6660750935954853365">"Skala animasi 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animasi dimatikan"</item>
+    <item msgid="1138649021950863198">"Skala animasi .5x"</item>
+    <item msgid="4394388961370833040">"Skala animasi 1x"</item>
+    <item msgid="8125427921655194973">"Skala animasi 1.5x"</item>
+    <item msgid="3334024790739189573">"Skala animasi 2x"</item>
+    <item msgid="3170120558236848008">"Skala animasi 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 0dcc3e9..14c456c 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -18,6 +18,7 @@
     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="create" msgid="3578857613172647409">"Buat"</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>
@@ -111,6 +112,8 @@
     <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_device_details" msgid="4594773497930028085">"Tetapan peranti"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Tetapan profil"</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>
@@ -131,13 +134,12 @@
     <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="5655704645616731277">"Sentuh untuk berpasangan"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Tiada peranti Bluetooth yang berdekatan yang ditemui."</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="1931617700075106801">"Sentuh untuk berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Sentuh 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="device_picker" msgid="8398232791303186677">"Pemilih peranti Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan kebenaran Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikasi mahu menghidupkan Bluetooth. Benarkan?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Satu aplikasi pada tablet anda ingin menjadikan tablet anda ditemui oleh peranti Bluetooth yang lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Benarkan?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Sentuh untuk menyambung ke \"<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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Nama hos yang anda taipkan tidak sah."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Senarai pengecualian yang anda taipkan tidak diformatkan dengan betul. Taip senarai domain yang dikecualikan yang dipisahkan dengan koma."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Anda perlu melengkapkan medan port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"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="2671425042711054494">"Port yang anda taipkan tidak sah."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi HTTP digunakan oleh penyemak imbas tetapi tidak boleh digunakan oleh aplikasi lain."</string>
@@ -224,23 +226,23 @@
     <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_changes_instructions" msgid="4482324130377280131">"Perubahan berkuatkuasa apabila kabel USB disambung 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_not_present_status" product="nosdcard" msgid="1636218515775929394">"Storan USB tidak dilekapkan."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"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="6691584887397909775">"Storan USB kini selamat untuk dialih keluar"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Kad SD kini selamat untuk dialih keluar"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Storan USB sbg peranti storan."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Kad SD sedang digunakan sebagai peranti storan massa."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Storan USB kini selamat untuk dialih keluar."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Kad SD kini selamat untuk dialih keluar."</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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Storan USB dilekap baca sahaja."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"Apabila anda membenarkan perayauan data,  anda boleh dikenakan caj perayauan yang tinggi!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Benarkan perayauan data?"</string>
     <string name="networks" msgid="6333316876545927039">"Pilihan pengendali"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pilih pengendali rangkaian"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tarikh &amp; masa"</string>
@@ -283,12 +285,14 @@
     <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="date_time_date_format" msgid="6951498879879281102">"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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Tingkatkan pemadanan muka"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Pemeriksaan liveness"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Perlu kelipan mata"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"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 menyahsulitkannya 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="3504519024884099702">"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_desc" product="tablet" msgid="3839235202103924154">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan tablet anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit tablet anda kecuali dengan melakukan penetapan semula data kilang, yang memadamkan semua data anda."\n\n"Penyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan tablet anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan telefon anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit telefon anda kecuali dengan melakukan tetapan semula data kilang, yang memadamkan semua data anda."\n\n"Penyulitan mengambil satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan fon anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua 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="2029407131227814893">"Cas bateri anda dan cuba lagi."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"Anda perlu menetapkan PIN atau kata laluan kunci skrin sebelum anda boleh memulakan penyulitan."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Sulitkan?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operasi penyegerakan ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih dan dalam masa yang sama tablet akan dimulakan semula beberapa kali."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operasi penyegerakan ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih, dalam masa yang sama fon 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="6689952371032099350">"Sila tunggu sementara tablet anda disulitkan. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"Taipkan 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="6891198717505120682">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Hasilnya, data pada tablet anda tidak lagi boleh diakses. "\n\n" Untuk menyambung semula menggunakan tablet anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan tablet anda selepas menetap semula, anda akan berpeluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada telefon anda tidak lagi boleh diakses. "\n\n"Untuk menyambung semula menggunakan telefon anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan telefon anda selepas menetap semula, anda akan mempunyai peluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Pilih kunci skrin"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada tablet anda tidak lagi boleh diakses. "\n\n" Untuk menyambung semula menggunakan tablet anda, anda perlu melakukan tetapan semula kilang. Apabila anda menyediakan tablet anda selepas menetap semula, anda akan berpeluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada telefon anda tidak lagi boleh diakses. "\n\n"Untuk menyambung semula menggunakan telefon anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan telefon anda selepas menetap semula, anda akan mempunyai peluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Tukar kaedah input"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci skrin"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih kunci sandaran"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Buka Kunci Wajah"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Corak"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Kata laluan mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> aksara."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> digit."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN mesti mengandungi 0-9 digit sahaja."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Pentadbir peranti tidak membenarkan menggunakan PIN yang baharu."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Kata laluan mengandungi aksara tidak sah."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Kata laluan mesti mengandungi sekurang-kurangnya satu huruf."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Kata laluan mesti mengandungi sekurang-kurangnya satu digit."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Kata laluan mesti mengandungi sekurang-kurangnya satu 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>
+    <item quantity="one" msgid="3063853802158131458">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf kecil."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf besar."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Kata laluan mesti mengandungi sekurang-kurangnya 1 digit angka."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Kata laluan mesti mengandungi sekurang-kurangnya 1 simbol khas."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Kata laluan mesti mengandungi sekurang-kurangnya 1 aksara bukan huruf."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Pentadbir peranti tidak membenarkan menggunakan kata laluan yang baharu."</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="lock_setup" msgid="1759001157415978959">"Persediaan selesai"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Persediaan selesai."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Untuk berpasangan dengan:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Taip kunci laluan peranti yang diperlukan:"</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_enter_pin_other_device" msgid="4637977124526813470">"Anda juga mungkin perlu menaipkan PIN ini pada peranti satu lagi."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Untuk berpasangan dengan:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Taip padanya:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kemudian tekan Kembali atau Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Tidak dapat berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kerana PIN atau kunci laluan yang salah."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Tidak boleh berkomunikasi 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_connecting_error_message" msgid="229861986106185022">"Tidak dapat 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>
@@ -478,19 +483,23 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk muzik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat tetapan"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="5237208142892767592">"Benarkan pertukaran data apabila telefon menyentuh peranti lain"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Benarkan pertukaran data apabila tablet menyentuh peranti lain"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Benarkan pertukaran data apabila telefon menyentuh peranti lain"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Bersedia untuk menghantar kandungan aplikasi melalui NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Mati"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Tidak tersedia kerana NFC dimatikan"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Apabila ciri ini dihidupkan, anda boleh memancarkan kandungan aplikasi ke peranti mampu NFC yang lain dengan merapatkan kedua-dua peranti itu. Sebagai contoh, anda boleh memancarkan halaman Penyemak Imbas, video YouTube, maklumat Hubungan orang dan banyak lagi."\n\n"Hanya rapatkan kedua-dua peranti (biasanya bersentuhan belakang dengan belakang) dan kemudian sentuh skrin anda. Aplikasi menentukan apa yang akan dipancarkan."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Penemuan perkhidmatan rangkaian"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Benarkan apl pada peranti lain untuk menemui apl pada peranti ini"</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_setup_wizard_title" msgid="70277346338812325">"Pilih Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Tidak boleh mengimbas untuk 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="4227430628962787616">"Jangan gunakan rangkaian Wi-Fi melainkan jika ia mempunyai sambungan internet yang baik"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Elakkan sambungan lemah"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Jangan gunakan rangkaian Wi-Fi melainkan jika ia mempunyai sambungan internet yang baik"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Biarkan Wi-Fi aktif semasa tidur"</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_wps_pbc" msgid="2668564692207863017">"Butang Tekan WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Masukan Pin WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Langsung"</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_empty_list_wifi_on" msgid="3354911729026237372">"Mencari rangkaian Wi-Fi..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Rangkaian lain..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Lagi"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Persediaan automatik (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Tunjukkan pilihan terperinci"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"Taip PIN dari titik akses"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Persediaan WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Taip 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_wps_setup_title" msgid="6034518116333042484">"Persediaan Terlindung Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulakan WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Tekan butang Persediaan Terlindung Wi-Fi di router anda. Namanya mungkin \"WPS\" atau mengandungi simbol ini:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada penghala Wi-Fi anda. Persediaan ini boleh mengambil masa sehingga dua minit untuk selesai."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS berjaya. Menyambung ke rangkaian…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Disambungkan ke rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS sudah pun dijalankan dan boleh mengambil masa sehingga dua minit untuk selesai"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS gagal. Sila cuba lagi dalam beberapa minit."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Tetapan keselamatan penghala wayarles (WEP) tidak disokong"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Tetapan keselamatan penghala wayarles (TKIP) tidak disokong"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pengesahan gagal. Sila cuba lagi."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Sesi WPS lain dikesan. Sila cuba lagi dalam beberapa minit."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Dinyahdayakan"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Sambungan Internet lemah dielakkan"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Rangkaian dielakkan kerana sambungan lemah. Matikan tindakan ini dari skrin Tetapan &gt; Wi-Fi, item menu Lanjutan."</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="3538912605343585226">"Rangkaian dilindungi tersedia"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (rangkaian dilindungi tersedia)"</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_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke rangkaian."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Gagal melupakan rangkaian"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Gagal menyimpan rangkaian"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Batal"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Satu lagi sesi dilindungi Wi-Fi telah dikesan. Cuba lagi 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>
@@ -568,33 +590,34 @@
     <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="5933614000444751775">"Wi-Fi langsung"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Sediakan sambungan rakan ke rakan"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Langsung"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Maklumat peranti"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Persediaan terlindung Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Taip 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_remove_group" msgid="4844634506540667517">"Alih keluar kumpulan"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Terperinci"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Peranti tersedia"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Mencari peranti"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Mencari..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Namakan semula peranti"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peranti setara"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Tidak boleh menyambung."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Gagal menamakan semula peranti."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Putuskan sambungan?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Jika anda menyahsambung, hubungan anda dengan <xliff:g id="PEER_NAME">%1$s</xliff:g> akan berakhir."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Jika anda menyahsambung, sambungan anda dengan <xliff:g id="PEER_NAME">%1$s</xliff:g> dan <xliff:g id="PEER_COUNT">%2$s</xliff:g> peranti lain akan berakhir."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Batalkan jemputan?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Adakah anda mahu membatalkan jemputan untuk berhubung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_ap_text" msgid="61237027772641155">"Sediakan tempat liputan 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="3415566786340790345">"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_on_ring_title" msgid="40343855247989536">"Bergetar dan berdering"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Redam nada dering &amp; pemberitahuan"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Redam muzik &amp; media lain"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Redam pemberitahuan"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Redam penggera"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Bergetar apabila berdering"</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>
@@ -623,14 +651,15 @@
     <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="9015625921245904495">"Anda mesti dok tablet sebelum menyediakan audio dok."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Anda mesti dok telefon sebelum menyediakan audio dok."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Anda perlu dok tablet sebelum menyediakan audio dok."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Anda perlu dok telefon sebelum menyediakan audio dok."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"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>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <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>
@@ -702,7 +731,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Padamkan semua maklumat peribadi anda dan aplikasi yang dimuat turun? Anda tidak boleh menterbalikkan tindakan ini!"</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_gesture_explanation" msgid="826193821455182780">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan tetapan semula data kilang."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Tiada penetapan semula dijalankan kerana perkhidmatan Padam Bersih Sistem tidak tersedia."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Tetapkan semula?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Padam storan USB"</string>
@@ -838,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Padamkan kad SD, turut memadamkan semua fail yang tersimpan padanya? Anda tidak boleh menterbalikkan tindakan ini!"</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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Anda perlu melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan storan USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Anda perlu 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>
@@ -870,7 +899,7 @@
     <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="5569673665032992664">"Perkhidmatan lokasi Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Benarkan aplikasi menggunakan data dari sumber seperti rangkaian Wi-Fi dan mudah alih untuk menentukan lokasi anggaran anda"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Membenarkan data lokasi tanpa nama dihantar ke Google. Juga membenarkan apl dibenarkan untuk menggunakan data dari sumber seperti 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>
@@ -915,7 +944,7 @@
     <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_pattern_entered_header" msgid="8378617839439987962">"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>
@@ -937,7 +966,7 @@
     <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="1075370160667458122">"Lindungi tablet anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Gelongsorkan 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="tablet" msgid="8616353869251700776">"Lindungi tablet anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Luncurkan 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="8393155371327584659">"Lindungi telefon anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Luncurkan 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="7041951105633616745">"Urus aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Urus dan alih keluar aplikasi yang dipasang"</string>
@@ -945,7 +974,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Urus aplikasi, sediakan pintasan pelancaran cepat"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Tetapan aplikasi"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sumber tidak diketahui"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Benarkan pemasangan aplikasi bukan Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Benarkan pemasangan apl dari sumber tidak diketahui"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tablet dan data peribadi anda lebih terdedah kepada serangan oleh aplikasi dari sumber yang tidak diketahui. Anda bersetuju bahawa anda bertanggungjawab sepenuhnya bagi apa-apa kerosakan kepada tablet atau kehilangan data yang mungkin berlaku akibat penggunaan aplikasi ini."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefon dan data peribadi anda lebih terdedah kepada serangan oleh aplikasi dari sumber yang tidak diketahui. Anda bersetuju bahawa anda bertanggungjawab sepenuhnya untuk apa-apa kerosakan kepada telefon anda atau kehilangan data yang mungkin berlaku akibat menggunakan aplikasi ini."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Tetapan terperinci"</string>
@@ -953,6 +982,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Maklumat aplikasi"</string>
     <string name="storage_label" msgid="8700867073480107253">"Storan"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Lancarkan secara lalai"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"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>
@@ -972,6 +1002,7 @@
     <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="2652825923953591251">"Anda telah memilih untuk melancarkan aplikasi ini secara lalai untuk beberapa tindakan."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Anda telah memilih untuk membenarkan apl ini membuat widget dan mengakses datanya."</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="1616155457673106022">"Aplikasi ini mungkin tidak direka untuk skrin anda. Anda boleh mengawal bagaimana ia disesuaikan pada skrin anda di sini."</string>
@@ -982,6 +1013,10 @@
     <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="reset_app_preferences" msgid="1321050641018356925">"Tetapkan semula pilihan apl"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Tetapkan semula pilihan app?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ini akan menetapkan semula semua pilihan untuk:"\n\n" "<li>"Apl dilumpuhkan"</li>\n" "<li>"Pemberitahuan apl dilumpuhkan"</li>\n" "<li>"Aplikasi lalai untuk tindakan"</li>\n" "<li>"Sekatan data latar belakang untuk apl"</li>\n\n" Anda tidak akan kehilangan sebarang data apl."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Tetapkan semula apl"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Urus ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Tapis"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Buat pilihan penapis"</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Aplikasi ini boleh mengakses yang berikut pada tablet anda:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"Tidak dapat mengira saiz pakej."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Anda tidak mempunyai 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>
@@ -1032,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Tukar lokasi pemasangan pilihan untuk aplikasi baru"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Lumpuhkan aplikasi terbina dalam?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jika anda melumpuhkan aplikasi terbina-dalam, aplikasi lain mungkin berfungsi secara salah."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Matikan pemberitahuan"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jika anda mematikan pemberitahuan untuk apl ini, anda mungkin terlepas amaran dan kemas kini penting."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan storan"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Lihat storan yang digunakan oleh aplikasi"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Perkhidmatan dijalankan"</string>
@@ -1084,19 +1121,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"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>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Penyemak ejaan ini mungkin mampu mengumpul semua teks yang anda taip, termasuk data peribadi seperti kata laluan dan nombor kad kredit. Ia datang dari aplikasi <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Gunakan penyemak ejaan ini?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Tetapan"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Bahasa"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Gagal membuka tetapan untuk <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Tetikus/Pad jejak"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kelajuan penuding"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Pengawal Permainan"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Gunakan penggetar"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Halakan semula penggetar ke pengawal permainan apabila disambungkan."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Pilih susun atur papan kekunci"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Tetapkan susun atur papan kekunci"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Untuk bertukar, tekan Control-Spacebar"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Lalai"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Susun atur papan kekunci"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamus peribadi"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kamus peribadi"</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_add_screen_title" msgid="742580720124344291">"Frasa"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Lagi pilihan"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Kurang pilihan"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Perkataan:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Pintasan:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Bahasa:"</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="8165273379942105271">"Anda tidak mempunyai sebarang perkataan dalam kamus pengguna. Tambah perkataan dengan menyentuh butang Tambah (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Semua bahasa"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Untuk semua bahasa"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Lebih banyak 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>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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="verifier_device_identifier" msgid="5079997701152411060">"ID peranti pembangunan"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Maklumat peranti tidak tersedia"</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="7316799925425402244">"Penyahpepijatan USB adalah dimaksudkan untuk tujuan pembangunan sahaja. Gunakannya untuk menyalin data antara komputer dan peranti anda, memasang aplikasi pada peranti anda tanpa pemberitahuan, dan membaca data log."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Benarkan tetapan pembangunan?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Tetapan ini adalah untuk penggunaan pembangunan sahaja. Peranti dan aplikasi yang terdapat padanya boleh rosak atau tidak berfungsi dengan betul."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Lindungi storan USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apl mesti meminta kebenaran untuk membaca storan USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Lindungi storan USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Apabila storan USB dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran."\n\n"Sesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Lindungi kad SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apl mesti meminta kebenaran untuk membaca kad SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Lindungi kad SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Apabila kad SD dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran."\n\n"Sesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pilih alat"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pilih widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Buat widget dan benarkan akses?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Selepas anda membuat widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> boleh mengakses semua data yang dipaparkan."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Sentiasa benarkan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> untuk membuat widget dan mengakses datanya"</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>
@@ -1160,12 +1227,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Tuturkan kata laluan"</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="3264723681038625967">"Pasang skrip web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Tingkatkan kebolehcapaian web"</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>
@@ -1180,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tiada perkhidmatan dipasang"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Perlukan pembaca skrin?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan maklum balas bersuara untuk membantu pengguna yang buta dan berpenglihatan kabur. Adakah anda ingin memasangnya secara percuma dari Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Pasang skrip web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Adakah anda mahu aplikasi memasang skrip daripada Google yang menjadikan kandungan laman web mereka lebih mudah diakses?"</string>
-    <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="1072730037861494125">"Tiada keterangan disediakan."</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_not_available" msgid="3214000535532434353">"Data penggunaan bateri tidak tersedia.."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1347,7 @@
     <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" msgid="3305141107104670703">"Enjin yang anda pilih tidak boleh berfungsi."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurasi"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"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>
@@ -1301,7 +1363,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"Dayakn enjin baharu sblm guna."</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>
@@ -1318,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Lukis corak buka kunci anda"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan pemasangan bukti kelayakan."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Taip kata laluan untuk storan bukti kelayakan."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kata laluan semasa:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Storan bukti kelayakan dipadamkan."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Storan bukti kelayakan tidak boleh dipadamkan."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Storan bukti klykn didayakan."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Anda mesti menetapkan kunci skrin PIN atau kata laluan sebelum anda boleh menggunakan storan bukti kelayakan."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Anda perlu menetapkan PIN kunci skrin atau kata laluan sebelum anda boleh menggunakan storan bukti kelayakan."</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>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan automatik"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Apabila memasang semula aplikasi, pulihkan tetapan dan data yang disandarkan"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kata laluan sandaran komputer meja"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Sandaran penuh desktop 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="local_backup_password_summary_none" msgid="393503434408227110">"Sandaran penuh meja komputer tidak dilindungi pada masa ini"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh untuk menukar atau mengalih keluar kata laluan untuk sandaran penuh komputer meja"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Berhenti membuat sandaran kata laluan Wi-Fi anda, penanda halaman, tetapan lain, dan data aplikasi, serta padamkan semua salinan di pelayan Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Tetapan pentadbir peranti"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Nada dering &amp; getaran panggilan"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Menyambung ke rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
@@ -1393,7 +1457,10 @@
     <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_failed" msgid="1696499856374109647">"Segerak gagal"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Segerak aktif"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <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="background_data" msgid="5779592891375473817">"Data latar belakang"</string>
@@ -1404,6 +1471,10 @@
     <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>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <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>
@@ -1413,7 +1484,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Selamat datang ke Google segerak!"</font>\n"Satu pendekatan Google kepada penyegerakan data untuk membenarkan akses kepada kenalan anda, janji temu dan banyak lagi dari mana-mana sahaja anda berada."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"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>
@@ -1427,7 +1498,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Akaun ini diperlukan oleh beberapa aplikasi. Anda hanya boleh mengalih keluar dengan menetapkan semula tablet kepada tetapan lalai kilang (yang memadamkan semua data peribadi anda) dalam Tetapan &gt; Sandaran &amp; tetapkan semula."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Akaun ini diperlukan oleh beberapa aplikasi. Anda hanya boleh mengalih keluar dengan menetapkan semula telefon kepada tetapan lalai kilang (yang memadamkan semua data peribadi anda) dalam Tetapan &gt; Sandaran &amp; tetapkan semula."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Tidak boleh menyegerakkan secara manual"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Penyegerakan untuk item ini dilumpuhkan pada masa ini. Untuk menukar tetapan ini, hidupkan data latar belakang dan penyegerakan automatik buat sementara waktu."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Tetapan 4G"</string>
@@ -1435,7 +1507,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Taip kata laluan untuk menyahsulit storan"</string>
     <string name="try_again" msgid="4272075051293936921">"Cuba lagi."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Perkhidmatan sedang sibuk. Sila cuba lagi."</string>
     <string name="delete" msgid="4219243412325163003">"Padam"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1514,46 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Menyahpepijat"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Pilih apl penyahpepijat"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Tiada aplikasi penyahpepijat ditentukan"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Menyahpepijat aplikasi: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Pilih aplikasi"</string>
+    <string name="no_application" msgid="2813387563129153880">"Tiada apa-apa"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Nantikan penyahpepijat"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Menanti penyahpepijat sebelum aplikasi melaksana"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Lukisan"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Memantau"</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_screen_updates" msgid="5470814345876056420">"Tunjuk kms kini permukaan"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Denyar permukaan tetingkap yg dikemas kini"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Tunjuk kemas kini GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Denyar pandangan dlm tetingkap yg dilukis dgn GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Lumpuhkan tindihan atas HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Sentiasa gunakan GPU untuk komposit skrin"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Dayakan kesan"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Pilih kesan yang didayakan"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Tiada kesan didayakan"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> kesan kini didayakan"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Semua kesan kini didayakan"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Tunjukkan batas reka letak"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <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="force_hw_ui" msgid="6426383462520888732">"Paksa penyerahan GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Gunakan pecutan perkakasan 2D dalam aplikasi"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Paksa penggunaan GPU untuk lukisan 2d"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Penyerahan GPU profil"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Ukur masa penyerahan dalam adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Skala tempoh juruanimasi"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1567,15 @@
     <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_menu_metered" msgid="5056695223222541863">"Tempat liputan mudah alih"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Diukur dengan tablet anda. Pengiraan penggunaan data pembekal perkhidmatan anda mungkin berbeza."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Diukur oleh telefon anda. Pengiraan penggunaan data oleh pembekal perkhidmatan anda mungkin berbeza."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"terhad"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Lumpuhkan data mudah alih?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Tetapkan had data mudah alih"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Tetapkan had data 4G"</string>
@@ -1488,33 +1586,50 @@
     <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_list_mobile" msgid="5588685410495019866">"Mudah alih"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Lihat tetapan aplikasi"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Hadkan data latar belakang"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Lumpuhkan data latar belakang pada rangkaian data mudah alih sahaja. Wi-Fi akan digunakan jika tersedia."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Lumpuhkan data latar belakang pada rangkaian mudah alih. Rangkaian bukan mudah alih akan digunakan jika tersedia."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Untuk menyekat data latar belakang untuk aplikasi ini, mula-mula tetapkan had data mudah alih."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Hadkan data latar belakang?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Ciri ini boleh menyebabkan aplikasi yang bergantung kepada data latar belakang berhenti berfungsi apabila Wi-Fi tidak tersedia."\n\n"Anda boleh dapati lebih banyak kawalan penggunaan data yang sesuai dalam tetapan yang tersedia dalam aplikasi."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ciri ini boleh menyebabkan apl yang bergantung kepada data latar belakang berhenti berfungsi apabila hanya rangkaian bermeter yang tersedia."\n\n"Anda boleh menemui lebih banyak kawalan penggunaan data dalam tetapan yang tersedia dalam apl."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Menyekat data latar belakang hanya boleh dilakukan apabila anda telah menetapkan had data mudah alih."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <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_warning_editor_title" msgid="3704136912240060339">"Tetapkan amaran penggunaan data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Tetapkan had penggunaan data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Mengehadkan penggunaan data"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Sambungan data <xliff:g id="NETWORKS">%1$s</xliff:g> anda akan dilumpuhkan apabila mencapai had yang ditetapkan."\n\n"Memandangkan data penggunaan diukur oleh tablet anda, dan pembekal perkhidmatan anda mungkin mengira penggunaan dengan berbeza, pertimbangkan untuk menggunakan had konservatif."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Sambungan data <xliff:g id="NETWORKS">%1$s</xliff:g> anda akan dilumpuhkan apabila mencapai had yang ditetapkan."\n\n"Memandangkan data penggunaan diukur oleh telefon anda, dan pembekal perkhidmatan anda mungkin mengira penggunaan dengan berbeza, pertimbangkan untuk menggunakan had konservatif."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sambungan data mudah alih anda akan dilumpuhkan apabila mencapai had tertentu."\n\n"Memandangkan tablet anda yang mengukur penggunaan data anda dan pembawa anda mungkin mengira penggunaan secara berbeza, pertimbangkan menggunakan had konservatif."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sambungan data mudah alih anda akan dilumpuhkan apabila mencapai had tertentu."\n\n"Memandangkan telefon anda yang mengukur penggunaan data anda dan pembawa anda mungkin mengira penggunaan secara berbeza, pertimbangkan menggunakan had konservatif."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Hadkan data latar belakang?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jika anda menghadkan data mudah alih latar belakang, beberapa aplikasi dan perkhidmatan tidak akan berfungsi kecuali anda mendapat sambungan kepada rangkaian Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: kira-kira <xliff:g id="TOTAL">%1$s</xliff:g> digunakan"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: kira-kira <xliff:g id="TOTAL">%1$s</xliff:g> digunakan."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: kira-kira <xliff:g id="TOTAL">%1$s</xliff:g> digunakan, kiraan tablet. Kiraan pembawa anda mungkin berbeza."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: kira-kira <xliff:g id="TOTAL">%1$s</xliff:g> digunakan - kiraan telefon. Kiraan pembawa anda mungkin berbeza."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Tempat liputan mudah alih"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Pilih rangkaian Wi-Fi yang merupakan tempat liputan mudah alih. Apl boleh disekat daripada menggunakan rangkaian ini semasa berada di latar belakang. Apl juga boleh memberi amaran sebelum menggunakan rangkaian ini untuk muat turun yang besar."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Rangkaian mudah alih"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Rangkaian Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Untuk memilih tempat liputan mudah alih, hidupkan Wi-Fi."</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>
@@ -1540,12 +1655,14 @@
     <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_edit" msgid="8647191407179996943">"Edit profil VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Sambung ke <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Tambah profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Edit profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Padam profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Tiada sambungan rangkaian. Sila cuba sebentar lagi."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Ada sijil yang hilang. Sila edit profil."</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>
@@ -1554,25 +1671,7 @@
     <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="477937585801538951">"Selepas anda menghidupkan Teroka melalui Sentuhan, anda boleh menyentuh skrin untuk mengetahui apa di hujung 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="3973201880357468747">"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 sekali pada ikon itu 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="8764686624055084454">"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="3055831259260848004">"Anda telah melengkapkan tutorial. Untuk keluar, cari dan sentuh butang <xliff:g id="FINISH">%s</xliff:g>."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Pembetulan ejaan"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Penyemak ejaan"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Taip kata laluan sandaran penuh semasa anda di sini"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Taip kata laluan baharu untuk sandaran penuh di sini"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Taip semula kata laluan sandaran penuh baharu anda di sini"</string>
@@ -1580,4 +1679,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Batal"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Kemas kini sistem tmbahan"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Sekatan &amp; pengguna"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Pengguna"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Tambah pengguna"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Edit butiran"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Maklumat pengguna"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nama"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Sekatan kandungan"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Memerlukan PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Rating kandungan"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Apl sistem"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Apl dipasang"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Buang"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Alih keluar pengguna"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Budak pengacau"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Alih keluar pengguna?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Adakah anda pasti anda mahu mengalih keluar semua pengguna dan data berkaitan dari peranti?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Tunjukkan pemberitahuan"</string>
+    <string name="help_label" msgid="1107174367904110532">"Bantuan"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index f9bf923..85cba56 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Kobler fra ..."</item>
     <item msgid="1634960474403853625">"Frakoblet"</item>
     <item msgid="746097431216080650">"Mislyktes"</item>
+    <item msgid="6367044185730295334">"Blokkert"</item>
+    <item msgid="503942654197908005">"Unngår dårlig tilkobling midlertidig"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Kobler fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
     <item msgid="197508606402264311">"Frakoblet"</item>
     <item msgid="8578370891960825148">"Mislyktes"</item>
+    <item msgid="5660739516542454527">"Blokkert"</item>
+    <item msgid="1805837518286731242">"Unngår dårlig tilkobling midlertidig"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"Passord"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Trykk på knappen"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"Passord"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ingen"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Pers. kode fra tilg.punkt"</item>
-    <item msgid="7364462169350112617">"Pers. kode fra enheten"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statisk"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Flyttbart minnekort"</item>
     <item msgid="4498124044785815005">"La systemet bestemme"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Av"</item>
-    <item msgid="4804571292609523335">"Vibrer"</item>
-    <item msgid="595707141547423573">"Kutt lyd"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Middels"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animasjonsskala 5 x"</item>
     <item msgid="6660750935954853365">"Animasjonsskala 10 x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animasjon deaktivert"</item>
+    <item msgid="1138649021950863198">"Animasjonsskala 0,5 x"</item>
+    <item msgid="4394388961370833040">"Animasjonsskala 1 x"</item>
+    <item msgid="8125427921655194973">"Animasjonsskala 1,5 x"</item>
+    <item msgid="3334024790739189573">"Animasjonsskala 2 x"</item>
+    <item msgid="3170120558236848008">"Animasjonsskala 5 x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0681fd6..40f30b0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nei"</string>
+    <string name="create" msgid="3578857613172647409">"Opprett"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Forhindrer bruk av Bluetooth-telefon når skjermen er låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheter"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Enhetsnavn"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Enhetsinnstillinger"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profilinnstillinger"</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_rename_device" product="tablet" msgid="787970073150631155">"Gi nytt navn til nettbrett"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Parer…"</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="5655704645616731277">"Trykk for å koble"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Finner ingen Bluetooth-enheter."</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="1931617700075106801">"Berør for å koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Trykk for å sammenkoble 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="device_picker" msgid="8398232791303186677">"Bluetooth-enhetsvelger"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-tillatelse"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"En app ønsker å slå på Bluetooth. Vil du tillate dette?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på nettbrettet ditt ønsker å gjøre nettbrettet synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillate dette?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ønsker adgang til kontaktene og ringeloggen din. 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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Angitt vertsnavn er ikke gyldig."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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_port" msgid="5539106187558215246">"Du må fylle ut portfeltet."</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="2671425042711054494">"Angitt port er ikke gyldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre apper."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Velg"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Mislykket"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Vellykket"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Endringene vil tre i kraft når USB-kabelen kobles til på nytt"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Endringene trer i kraft når USB-kabelen kobles til på nytt."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Aktiver USB-masselagring"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Totalt antall byte:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-lagring ikke tilkoblet"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Minnekort mangler"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB-lagring er ikke tilkoblet."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"SD-kort mangler."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Tilgjengelig antall byte:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-lagr. brukt til masselagr."</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Minnekortet blir brukt som en masselagringsenhet"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"USB-lagring kan nå fjernes"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"SD-kortet kan nå fjernes"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB brukes som masselagring."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD-kortet brukes som masselagringsenhet."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Du kan nå fjerne USB-lagringen."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Du kan nå fjerne SD-kortet."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-enh. fjernet under bruk!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Minnekortet ble fjernet mens det fortsatt var i bruk!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Brukt antall byte:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Skanner USB-enh. for medieinnh."</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB har bare lesetilgang."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD-kortet har bare lesetilgang."</string>
     <string name="skip_label" msgid="47510779345218297">"Hopp over"</string>
     <string name="next_label" msgid="4693520878012668114">"Neste"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Språk"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Koble til datatjenester ved roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Du har mistet datatilkobling fordi du forlot hjemmenettet med dataroaming av."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Slå på"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Tillat dataroaming? Dette kan koste mye penger!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Obs"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Hvis du du tillater datastreifing, kan det påløpe høye kostnader."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Vil du tillate datastreifing?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatør"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Velg en nettverksoperatør"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dato og tid"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Still klokken"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Tidssone"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Angi dato"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Datoformat"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Velg 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="date_picker_title" msgid="1338210036394128512">"Dato"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Forbedre ansiktssamsvar"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Bevegelseskontroll"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Krev at du blunker med øyet"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Du kan kryptere kontoer, innstillinger, nedlastede apper med tilhørende data, mediefiler og andre filer. Når du har kryptert nettbrettet, må du angi en personlig tallkode eller et passord for å dekryptere det hver gang du slår det på. Du kan bare fjerne krypteringen på nettbrettet ved å utføre en tilbakestilling til fabrikkstandard, noe som medfører sletting av alle data."\n\n"Kryptering tar minst én time, og du må starte med ladet batteri og sørge for at nettbrettet forblir tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene dine hvis du avbryter krypteringprosessen."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Du kan kryptere kontoer, innstillinger, nedlastede apper 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 bare 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 holde telefonen tilkoblet helt til krypteringen er fullført. Du kan miste alle eller deler av dataene dine hvis du avbryter krypteringprosessen."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer nettbrettet ditt, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere nettbrettet hver gang du slår det på. Du kan ikke fjerne krypteringen av nettbrettet uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet."\n\n"Det tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at nettbrettet er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer telefonen din, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere telefonen hver gang du slår den på. Du kan ikke fjerne krypteringen av telefonen uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet."\n\n"Det tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at telefonen er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</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="2029407131227814893">"Lad batteriet og prøv på nytt."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"Du må angi en PIN-kode eller et passord for skjermlås før du kan starte krypteringen."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vil du kryptere?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krypteringshandlingen kan ikke angres, og hvis du avbryter den, risikerer du å miste data. Krypteringsprosessen tar minst én time, og nettbrettet kommer til å starte på nytt flere ganger underveis."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Krypteringshandlingen kan ikke angres, og hvis du avbryter den, risikerer du å miste data. Krypteringsprosessen 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="6689952371032099350">"Vent mens telefonen krypteres. <xliff:g id="PERCENT">^1</xliff:g> fullført."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"Skriv inn passordet"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykket"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på nettbrettet ditt ikke lenger er tilgjengelige. "\n\n" For å fortsette å bruke nettbrettet, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer nettbrettet etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på telefonen din ikke lenger er tilgjengelige. "\n\n"For å fortsette å bruke telefonen, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer telefonen etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Velg skjermlås"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på nettbrettet ditt ikke lenger er tilgjengelige."\n\n"For å fortsette å bruke nettbrettet, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer nettbrettet etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på telefonen din ikke lenger er tilgjengelige."\n\n"For å fortsette å bruke telefonen, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer telefonen etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Bytt inndatametode"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Velg skjermlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Velg reservelå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 skjermlås"</string>
@@ -348,9 +353,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Dra sidelengs"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Ansiktslås"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Mønster"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kode"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden må bestå av minst %d tegn"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Passordet må inneholde færre enn <xliff:g id="NUMBER">%d</xliff:g> tegn."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-koden må inneholde færre enn <xliff:g id="NUMBER">%d</xliff:g> sifre."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN-koden kan inneholde bare tall fra 0 til 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Enhetsadmin. forbyr nylig brukt PIN."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Passordet inneholder et ugyldig tegn."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Passordet må inneholde minst én bokstav."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Passordet må inneholde minst ett siffer."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Passordet må inneholde minst én bokstav."</item>
+    <item quantity="other" msgid="8186027808415585970">"Passordet må inneholde minst %d 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>
+    <item quantity="one" msgid="5583986519662091001">"Passordet må inneholde minst én liten bokstav."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Passordet må inneholde minst én stor bokstav."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Passordet må inneholde minst ett siffer."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Passordet må inneholde minst ett spesialtegn."</item>
+    <item quantity="other" msgid="1221290525051187757">"Passordet må inneholde minst %d spesialtegn."</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>
+    <item quantity="one" msgid="4594051152085925921">"Passordet må inneholde minst ett tegn som ikke er en bokstav."</item>
+    <item quantity="other" msgid="3952508584649046404">"Passordet må inneholde minst %d tegn som ikke er 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_password_recently_used" msgid="6098087796784262081">"Enhetsadmin. forbyr nylig brukte 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="lock_setup" msgid="1759001157415978959">"Konfigureringen er fullført"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Konfigurasjonen er fullført."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhetsadministrasjon"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Enhetsadministratorer"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Se eller deaktiver enhetsadministratorer"</string>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Sånn kobler du til: <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Skriv inn 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_enter_pin_other_device" msgid="4637977124526813470">"Det er mulig at du må skrive inn denne PIN-koden også på den andre enheten."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Det er mulig at du må oppgi dette passordet også 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="2796550001376088433">"Sånn kobler du til: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Skriv inn følgende: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, og trykk deretter på Retur eller Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Kan ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g> på grunn av feil personlig kode eller passord."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kan ikke kommunisere med <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> 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_connecting_error_message" msgid="229861986106185022">"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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Tillat utveksling av data når telefonen berører en annen enhet"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillat datautveksling når nettbrettet berører en annen enhet"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillat utveksling av data når telefonen berører en annen enhet"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Klar til å overføre appinnhold via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Av"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Utilgjengelig fordi nærfeltskommunikasjon (NFC) er slått av"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Når denne funksjonen er slått på, kan du overføre appinnhold til en annen enhet som støtter nærfeltskommunikasjon (NFC). Du gjør dette ved å holde enhetene tett sammen. Du kan for eksempel trådløst overføre nettsider, YouTube-videoer, kontakter fra Personer og mye mer."\n\n"Du bare holder enhetene mot hverandre (helst rygg mot rygg), og trykker på skjermen. Appen avgjør hva som blir overført."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Oppdaging av nettverkstjenester"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Tillat at andre enheter oppdager apper på denne enheten"</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="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_setup_wizard_title" msgid="70277346338812325">"Velg Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan ikke søke etter nettverk"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Varsling om nettverk"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Varsle når et åpent nettverk er tilgjengelig"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Unngå dårlige tilkoblinger"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Ikke bruk et Wi-Fi-nettverk med mindre det har en brukbar Internett-tilkobling"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unngå dårlige tilkoblinger"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Ikke bruk Wi-Fi-nettverk som ikke har stabil Internett-tilkobling"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Hold Wi-Fi aktivert i dvalemodus"</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_wps_pbc" msgid="2668564692207863017">"Knapp for auto. WPS-lev."</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Skriv inn WPS-kode"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Søker etter Wi-Fi-nettverk ..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Annet nettverk"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Se mer"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</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="8242979682530043184">"Skriv inn personlig kode fra tilgangspunktet"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS-konfigurasjon"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Skriv inn personlig kode <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_wps_setup_title" msgid="6034518116333042484">"Beskyttet Wi-Fi-konfigurasjon (WPS)"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS …"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Trykk på Beskyttet Wi-Fi-konfigurasjon-knappen på ruteren din. Den kan være merket WPS eller med dette symbolet:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Skriv inn koden <xliff:g id="NUMBER">%1$s</xliff:g> på Wi-Fi-ruteren din. Det kan ta inntil to minutter å fullføre konfigurasjonen."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS var vellykket. Kobler til nettverket …"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS har allerede startet, og det kan ta opptil to minutter før den fullføres"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS mislyktes. Prøv igjen om noen minutter."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sikkerhetsinnstillingen (WEP) for trådløse rutere støttes ikke"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sikkerhetsinnstillingen (TKIP) for trådløse rutere støttes ikke"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentiseringsfeil. Prøv på nytt."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En annen WPS-økt ble oppdaget. Prøv på nytt om noen minutter."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Lagret"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktivert"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Ungikk dårlig internettforbindelse"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Nettverket ble unngått på grunn av dårlig forbindelse. Slå av denne funksjonen under Innstillinger &gt; Wi-Fi, under menyvalget Avansert."</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_wps_available_first_item" msgid="3538912605343585226">"Beskyttet nettverk tilgjengelig"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (beskyttet nettverk tilgjengelig)"</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_failed_connect_message" msgid="8491902558970292871">"Kan ikke koble til nettverket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Slett"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Kunne ikke slette nettverket"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Lagre"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Kunne ikke lagre nettverket"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"En annen beskyttet Wi-Fi økt ble 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Standardruter"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengde på nettv.prefiks"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Konfigurer node-til-node-tilkobling"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Enhetsinformasjon"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi, beskyttet konfigurasjon"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Fjern gruppe"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avansert"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Tilgjengelige enheter"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Søk etter enheter"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Søker …"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Gi enheten nytt navn"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Motpartsenheter"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Kunne ikke koble til."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Kunne ikke gi enheten nytt navn."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Vil du koble fra?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Hvis du kobler fra, avsluttes tilkoblingen med <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Hvis du kobler fra, kommer tilkoblingen med <xliff:g id="PEER_NAME">%1$s</xliff:g> og <xliff:g id="PEER_COUNT">%2$s</xliff:g> andre enheter til å avsluttes."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vil du avbryte invitasjonen?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vil du avbryte invitasjonen til å koble til <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Konfigurer trådløs sone"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Konfigurer Wi-Fi-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="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Stillemodus"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringetone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumer"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikkeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringevolum"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved stille modus"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrer og ring"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standard varsling"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"La varsellampen pulsere"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Ignorer ringetone og varsler"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Ignorer musikk og andre media"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Ignorer varsler"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Ignorer alarmer"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrering når det ringer"</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>
@@ -623,14 +651,15 @@
     <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" product="tablet" msgid="9015625921245904495">"Du må forankre nettbrettet før du konfigurerer forankringslyd."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Du må forankre telefonen før du konfigurerer forankringslyden."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Du må dokke nettbrettet før du konfigurerer dokklyden."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Du må dokke telefonen før du konfigurerer dokklyden."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Lyd ved innsetting i forankringsstasjon"</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>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <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="7965901687241669598">"Skjerm"</string>
@@ -702,7 +731,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vil du slette alle dine personlige opplysninger og nedlastede apper? Du kan ikke reversere denne handlingen!"</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="2234954758550554549">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestilling til fabrikkstandard."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestillingen til fabrikkstandard."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Tilbakestilling ble ikke utført fordi tilbakestillingstjenesten ikke er tilgjengelig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vil du tilbakestille?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Slett USB-lagring"</string>
@@ -838,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vil du slette SD-kortet og alle filene som er lagret der? Du kan ikke reversere denne handlingen!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Slett alt"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Tegn opplåsingsmønsteret"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen av USB-lagring."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen av USB-lagring."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du må tegne opplåsingsmønsteret for å bekrefte formateringen 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="6688416425801386511">"USB-tilknytning"</string>
@@ -870,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile nettverk"</string>
     <string name="location_title" msgid="1029961368397484576">"Min posisjon"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Googles posisjonstjeneste"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"La apper bruke data fra kilder som Wi-Fi- og mobilnettverk til å fastslå den omtrentlige posisjonen din"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Tillat at posisjonsdata sendes til Google. La også tillatte apper bruke data fra kilder som Wi-Fi og mobilnettverk til å fastslå den omtrentlige posisjonen din."</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>
@@ -915,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Trykk menyknappen for hjelp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Slipp fingeren når du er ferdig."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Tegn et mønster over minst <xliff:g id="NUMBER">%d</xliff:g> prikker. Prøv igjen:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Mønster lagret!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Mønsteret er registrert."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Tegn mønsteret igjen for å bekrefte:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Ditt nye opplåsingsmønster:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bekreft"</string>
@@ -937,7 +966,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Neste"</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="1075370160667458122">"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å forbinde minst fire prikker."\n\n"Klar til å begynne? Berør Neste."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskytt nettbrettet mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste side kan du dra fingeren fra prikk til prikk i en hvilken som helst rekkefølge. Du må binde sammen minst fire prikker."\n\n"Er du klar til å begynne? Trykk på Neste."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskytt telefonen mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste skjermbilde drar du fingeren rundt for å 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="7041951105633616745">"Administrer apper"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerte apper"</string>
@@ -945,7 +974,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrer apper, angi snarveier for hurtigstart"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Innstillinger for app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukjente kilder"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Tillat installasjon av apper som ikke er fra Android Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Tillat installasjon av apper fra ukjente kilder"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Nettbrettet og personopplysningene dine er mer sårbare for angrep fra apper fra ukjente kilder. Du godtar at du alene er ansvarlig for enhver skade på nettbrettet eller tap av data som kan oppstå fra bruk av disse appene."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonen og personopplysninger er mer sårbare for angrep av apper fra ukjente kilder. Du godtar at du selv er ansvarlig for enhver skade på telefonen eller tap av data som kan skje ved å bruke disse appene."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avanserte innstillinger"</string>
@@ -953,6 +982,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Info om app"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Start som standard"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Standardinnstillinger"</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>
@@ -972,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Fjern data"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Avinstaller oppdateringer"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Du har valgt å starte denne appen som standard for enkelte handlinger."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Du har valgt å tillate at denne appen oppretter moduler og leser moduldataene."</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="1616155457673106022">"Denne appen er kanskje ikke utformet for skjermen din. Du kan kontrollere hvordan den justerer seg til skjermen her."</string>
@@ -982,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter etter størrelse"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Vis kjørende tjenester"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Vis bufrede prosesser"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Tilbakestill app-innstillingene"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vil du tilbakestille app-innstillingene?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dette tilbakestiller alle innstillingene for:"\n\n" "<li>"Deaktiverte apper"</li>\n" "<li>"Varsler for deaktiverte apper"</li>\n" "<li>"Standard apper for handlinger"</li>\n" "<li>"Bakgrunnsdatabegrensninger for apper"</li>\n\n" Du mister ingen appdata."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Tilbakestill apper"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Styr plass"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Velg filteralternativer"</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Denne appen har tilgang til følgende på nettbrettet ditt:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Denne appen har tilgang til følgende på telefonen din:"</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="invalid_size_value" msgid="7563537715280712285">"Kunne ikke beregne pakkestørrelsen."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Du har ikke installert noen tredjepartsapper."</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>
@@ -1032,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Endre foretrukket plassering for installasjon av nye apper"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktivere innebygd app?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Hvis du deaktiverer en innebygd app, kan andre apper oppføre seg på en uventet måte."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vil du deaktivere varsler?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Hvis du deaktiverer varsler for denne appen, kan du gå glipp av viktige beskjeder og oppdateringer."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Bruk av lagringsplass"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vis lagring som brukes av apper"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
@@ -1084,19 +1121,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Denne inndatametoden har tilgang til all tekst du skriver, blant annet personlige opplysninger som for eksempel passord og kredittkortnumre. Den kommer fra appen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruke denne inndatametoden?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Denne stavekontrollen kan være i stand til å samle all tekst du skriver, herunder personlige opplysninger som passord og kredittkortnumre. Den kommer fra appen <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruke denne stavekontrollen?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Innstillinger"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Språk"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Kunne ikke åpne innstillingene for <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mus/styreflate"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Pekerhastighet"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Spillkontroller"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Bruk vibrering"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Viderefør vibrering til spillkontrolleren hvis den er koblet til."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Velg et tastaturoppsett"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Konfigurer tastaturoppsett"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Bytt ved å trykke på Ctrl+Mellomromstasten"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturoppsett"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Ordliste"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personlig ordbok"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personlige ordbøker"</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_add_screen_title" msgid="742580720124344291">"Uttrykk"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Flere alt."</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Færre alt."</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Ord:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Snarvei:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Språk:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"For alle språk"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Flere språk"</string>
     <string name="testing" msgid="6584352735303604146">"Testing"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informasjon om nettbrettet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformasjon"</string>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Angi alternativer for apputvikling"</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="verifier_device_identifier" msgid="5079997701152411060">"Utviklings-ID for enhet"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Enhetsinformasjonen er ikke tilgjengelig"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Forbli våken"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skjermen blir aldri svart under lading"</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="7316799925425402244">"USB-feilsøking er bare ment for utviklingsformål. Bruk det til å kopiere data mellom datamaskinen og enheten, installere apper på enheten uten varsel og lese loggdata."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Vil du aktivere utviklingsinnstillingene?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Disse innstillingene er bare beregnet for bruk under programutvikling. De kan forårsake problemer med enheten din og tilhørende apper."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Beskytt USB-lagring"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apper må be om tillatelse til å lese USB-lagring"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vil du beskytte USB-lagringen?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Når USB-lagring er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring."\n\n"Enkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Beskytt SD-kort"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apper må be om tillatelse til å lese SD-kort"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vil du beskytte SD-kortet?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring."\n\n"Enkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Velg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Velg skrivebordselement"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du opprette modulen og gi tilgang?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Når du har opprettet modulen, kan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> lese alle dataene den viser."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Gi alltid <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> tillatelse til å opprette moduler og lese moduldata"</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>t <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>t <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>
@@ -1160,12 +1227,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Les inn passord"</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="3264723681038625967">"Installer nettskripter"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Forbedre tilgj. på nettet"</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>
@@ -1180,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ingen tjenester er installert"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Trenger du en skjermleser?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback gir muntlig tilbakemelding for å hjelpe blinde og svaksynte brukere. Vil du installere denne appen gratis fra Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Vil du installere nettskripter?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vil du at appene skal installere skripter fra Google som kan bidra til å gjøre nettinnholdet deres mer tilgjengelig?"</string>
-    <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="1072730037861494125">"Beskrivelse ble ikke oppgitt."</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_not_available" msgid="3214000535532434353">"Batteribruksdata ikke tilgj."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1347,7 @@
     <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_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" msgid="3305141107104670703">"Du har valgt en motor som ikke kan kjøre."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurer"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Velg en annen motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Denne talesyntesemotoren kan samle inn all uttalt tekst, herunder personlige opplysninger som for eksempel passord og kredittkortnumre. Den er basert på motoren <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Vil du aktivere bruk av denne talesyntesemotoren?"</string>
@@ -1301,7 +1363,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Kvinne"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"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>
@@ -1318,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Tegn opplåsingsmønsteret"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du må tegne opplåsingsmønsteret for å bekrefte installasjonen av legitimasjon."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Skriv inn passordet for legitimasjonslageret."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nåværende passord:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Legitimasjonslageret ble tømt."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Leg.lageret kan ikke slettes."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Akkreditivlageret er aktivert."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Du må angi en personlig kode for låseskjermen eller passord før du kan bruke legitimasjonslagring."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du må angi en PIN-kode eller et passord for skjermlås før du kan bruke legitimasjonslagring."</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="5446972770562918934">"Sikkerhetskopier/tilbakestilling"</string>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Auto-gjenoppretting"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Når du installerer en app, bør du gjenopprette sikkerhetskopierte innstillinger og data"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Passord for sikkerhetskopiering på datamaskin"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Fullstendig sikkerhetskopiering på 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å datamaskin"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Fullstendig sikkerhetskopiering på datamaskin beskyttes ikke for øyeblikket."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Trykk for å endre eller fjerne passordet for fullstendige sikkerhetskopier på datamaskinen"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vil du stoppe sikkerhetskopiering av Wi-Fi-passord, bokmerker, andre innstillinger og appdata, samt slette alle kopier på Googles tjenere?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Innstillinger for enhetsadministrasjon"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Administratoren er aktiv og tillater at appen <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_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="6047518536574673606">"System"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Anropsringetone og vibrering"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Kobler til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g> …"</string>
@@ -1393,7 +1457,10 @@
     <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_failed" msgid="1696499856374109647">"Synkroniseringen mislyktes"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Synkroniserer"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <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="background_data" msgid="5779592891375473817">"Bakgrunnsdata"</string>
@@ -1404,6 +1471,10 @@
     <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>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <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>
@@ -1413,7 +1484,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Velkommen til Google-synkronisering!"</font>\n"Synkroniser på Google-måten, slik at du har tilgang til kontaktene dine, avtalene dine og mye mer – uansett hvor du befinner deg."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Synkroniseringsinnstillinger for app"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data og synkronisering"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Endre passord"</string>
@@ -1427,7 +1498,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Denne kontoen er nødvendig for noen apper. Du kan bare fjerne den ved å tilbakestille nettbrettet til fabrikkinnstillingene (noe som sletter alle dine personlige data) i Sikkerhetskopiering og tilbakestilling under Innstillinger."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Denne kontoen er nødvendig for enkelte apper. Du kan bare fjerne den ved å tilbakestille telefonen til fabrikkinnstillingene (noe som sletter alle dine personlige data) i Sikkerhetskopiering og tilbakestilling under Innstillinger."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Kan ikke synkronisere manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering for dette elementet er deaktivert. Hvis du vil endre innstillinger, kan du midlertidig slå på bakgrunnsdata og automatisk synkronisering."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G-innstillinger"</string>
@@ -1435,7 +1507,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="4131758584074246224">"Skriv inn passordet for å dekryptere lagring"</string>
     <string name="try_again" msgid="4272075051293936921">"Prøv på nytt."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Tjenesten er opptatt. Prøv på nytt."</string>
     <string name="delete" msgid="4219243412325163003">"Slett"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1514,46 @@
     <string name="select_all" msgid="1562774643280376715">"Velg 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="debug_debugging_category" msgid="6781250159513471316">"Feilsøking"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Velg å feilsøke denne appen"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Du har ikke valgt feilsøkingsapp"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Feilsøker: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Velg app"</string>
+    <string name="no_application" msgid="2813387563129153880">"Ingen"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Vent på feilsøkingsappen"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Feilsøkt app venter til feilsøkingsapp er lagt til før den kjører"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Inndata"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Tegning"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Overvåking"</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_screen_updates" msgid="5470814345876056420">"Vis overflateoppdateringer"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Fremhev hele vinduer når de oppdateres"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Vis GPU-visningsoppdateringer"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Fremhev visninger i vinduer når tegnet med GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlegg"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Bruk alltid GPU for skjermsammensetting"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Aktiver spor"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Velg aktiverte spor"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Ingen aktiverte spor for øyeblikket"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> spor er aktivert for øyeblikket"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"For øyeblikket er alle sporene er aktiverte"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Vis kantene i utformingen"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <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="force_hw_ui" msgid="6426383462520888732">"Tving GPU-gjengivelse"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Bruk 2D-maskinvareakselerasjon i apper"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Tving bruk av GPU for 2D-tegning"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"GPU-gjengivelse av profil"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mål gjengivelsestid i adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Varighetsskala, animatør"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apper"</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>
@@ -1471,13 +1567,15 @@
     <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_menu_metered" msgid="5056695223222541863">"Wi-Fi-soner for mobiler"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <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="8621855507876539282">"Ingen apper 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_disclaimer" product="tablet" msgid="2591250607795265503">"Målt av nettbrettet ditt. Kan variere fra operatørens registrering av databruk."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Målt av telefonen din. Kan variere fra operatørens registrering av databruk."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"begrenset"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Vil du deaktivere mobildata?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Angi datagrense for mobil"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Angi datagrense for 4G"</string>
@@ -1488,33 +1586,50 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobil"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Vis innstillinger for app"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Begrensning av bakgrunnsdata"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Slå av bakgrunnsdata bare på mob.nettv. Wi-Fi brukes hvis tilgj."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Slå av bakgrunnsdata på mobilnettverk. Wi-Fi brukes hvis tilgj."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Hvis du ønsker å begrense bakgrunnsdata for denne appen, må du først angi en grense for bruk av mobildata."</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="5651588785118290771">"Denne funksjonen kan føre til at en app som baserer seg på bakgrunnsdata slutter å fungere når Wi-Fi ikke er tilgjengelig."\n\n"Du finner mer passende brukskontroller for data i innstillingene for appen."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Denne funksjonen kan gjøre at apper som er avhengig av bakgrunnsdata slutter å fungere når bare  mobilnettverk er tilgjengelige."\n\n"Du finner bedre egnede alternativer for databruk i appens innstillinger."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Du kan begrense bakgrunnsdata, men bare hvis du har angitt en grense for bruk av mobildata."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <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_warning_editor_title" msgid="3704136912240060339">"Angi advarsel for databruk"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Angi grense for databruk"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begrensning av databruk"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"<xliff:g id="NETWORKS">%1$s</xliff:g>-datatilkoblingen din blir deaktivert når angitt grense nås."\n\n"Ettersom databruken måles av nettbrettet ditt, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"<xliff:g id="NETWORKS">%1$s</xliff:g>-datatilkoblingen din blir deaktivert når angitt grense nås."\n\n"Ettersom databruken måles av telefonen din, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobildatatilkoblingen din blir deaktivert når angitt grense nås."\n\n"Ettersom databruken måles av nettbrettet ditt, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobildatatilkoblingen din blir deaktivert når angitt grense nås."\n\n"Ettersom databruken måles av telefonen din, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vil du begrense bruken av bakgrunnsdata?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Hvis du begrenser bakgrunnsmobildata, kan det hende at enkelte apper og tjenester ikke fungerer med mindre du er koblet til et Wi-Fi-nettverk."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: forbruk på omtrent <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: omtrentlig forbruk på <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: omtrentlig forbruk på <xliff:g id="TOTAL">%1$s</xliff:g>, målt av nettbrettet. Operatørens måling kan avvike."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: omtrentlig forbruk på <xliff:g id="TOTAL">%1$s</xliff:g>, målt av telefonen. Operatørens måling kan avvike."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Wi-Fi-soner for mobiler"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Velg et Wi-Fi-nettverk som er en Wi-Fi-sone for mobiler. Apper kan forhindres i å bruke disse nettverkene når de kjører i bakgrunnen. Du kan også motta en advarsel før apper bruker disse nettverkene for store nedlastninger."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilnettverk"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-nettverk"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Slå på Wi-Fi for å velge Wi-Fi-soner for mobiler."</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>
@@ -1540,12 +1655,14 @@
     <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_edit" msgid="8647191407179996943">"Rediger VPN-profil"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Koble til <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Legg til VPN-profil"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Rediger profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Slett profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Finner ingen nettverkstilkobling. Prøv på nytt senere."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Et sertifikat mangler. Rediger profilen."</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>
@@ -1554,25 +1671,7 @@
     <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="477937585801538951">"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 appikoner. Finn ett av dem ved å berøre skjermen og skyve fingeren rundt."</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="3973201880357468747">"Du kan aktivere noe du berører ved å trykke 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="8764686624055084454">"Hvis du vil bla gjennom en liste, kan du dra to fingre langs skjermen. Den gjeldende skjermen inneholder for eksempel en liste med appnavn 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="3055831259260848004">"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="spellcheckers_settings_title" msgid="399981228588011501">"Stavekontroll"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Skriv inn ditt nåværende passord for fullstendig sikkerhetskopiering her"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Skriv inn et nytt passord for fullstendig sikkerhetskopiering her"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Skriv inn det nye fullstendige passordet for sikkerhetskopiering her"</string>
@@ -1580,4 +1679,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Avbryt"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g> %%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ytterligere systemoppdateringer"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Brukerrestriksjoner"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Brukere"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Legg til bruker"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Rediger detaljer"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Brukerinformasjon"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Navn"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Innholdsbegrensninger"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN-kode kreves"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Innholdsvurdering"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"System-apper"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installerte apper"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Forkast"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Slett brukeren"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Rakkerunge"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vil du slette brukeren?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Er du sikker på at du vil slette brukeren og alle tilhørende data fra enheten?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis varsler"</string>
+    <string name="help_label" msgid="1107174367904110532">"Hjelp"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 755196b..efda2d6 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Verbinding verbreken..."</item>
     <item msgid="1634960474403853625">"Verbinding verbroken"</item>
     <item msgid="746097431216080650">"Mislukt"</item>
+    <item msgid="6367044185730295334">"Geblokkeerd"</item>
+    <item msgid="503942654197908005">"Slechte verbinding tijdelijk vermijden"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Verbinding verbreken met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Verbinding verbroken"</item>
     <item msgid="8578370891960825148">"Mislukt"</item>
+    <item msgid="5660739516542454527">"Geblokkeerd"</item>
+    <item msgid="1805837518286731242">"Slechte verbinding tijdelijk vermijden"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Knop indrukken"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Geen"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Pincode van toegangspunt"</item>
-    <item msgid="7364462169350112617">"Pincode van dit apparaat"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"passief"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Verwisselbare SD-kaart"</item>
     <item msgid="4498124044785815005">"Het systeem laten bepalen"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Uit"</item>
-    <item msgid="4804571292609523335">"Trillen"</item>
-    <item msgid="595707141547423573">"Dempen"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Normaal"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animatieschaal 5x"</item>
     <item msgid="6660750935954853365">"Animatieschaal 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animatie uit"</item>
+    <item msgid="1138649021950863198">"Animatieschaal 0,5x"</item>
+    <item msgid="4394388961370833040">"Animatieschaal 1x"</item>
+    <item msgid="8125427921655194973">"Animatieschaal 1,5x"</item>
+    <item msgid="3334024790739189573">"Animatieschaal 2x"</item>
+    <item msgid="3170120558236848008">"Animatieschaal 5x"</item>
+    <item msgid="1069584980746680398">"Animatieschaal 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen achtergrondprocessen"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9d2fa1e..b0b5d0b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nee"</string>
+    <string name="create" msgid="3578857613172647409">"Aanmaken"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gebruik van de Bluetooth-dialer voorkomen wanneer het scherm is vergrendeld"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-apparaten"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Apparaatnaam"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Apparaatinstellingen"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profielinstellingen"</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_rename_device" product="tablet" msgid="787970073150631155">"Naam van tablet wijzigen"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Koppelen..."</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="5655704645616731277">"Raak aan om te koppelen"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"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="1931617700075106801">"Raak aan om te koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Raak dit aan 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="device_picker" msgid="8398232791303186677">"Bluetooth-apparaatkiezer"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Machtigingsverzoek voor Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Een app wil Bluetooth inschakelen. Wilt u dit toestaan?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Een app op uw tablet wil uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden vindbaar maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"De hostnaam die u heeft ingevoerd, is ongeldig."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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_port" msgid="5539106187558215246">"U moet het veld voor de poort 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="2671425042711054494">"De poort die u heeft ingevoerd, is ongeldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"De HTTP-proxy wordt gebruikt door de browser, maar mag niet worden gebruikt door de andere apps."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Instellen"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Mislukt"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Geslaagd"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Wijzigingen worden van kracht als de USB-kabel opnieuw wordt aangesloten"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Wijzigingen worden van kracht als de USB-kabel opnieuw wordt aangesloten."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB-massaopslag inschakelen"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Totaal aantal bytes:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-opslag niet gekoppeld"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Geen SD-kaart"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB-opslag niet gekoppeld."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Geen SD-kaart."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Beschikbare bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-opslag wordt gebruikt als apparaat voor massaopslag"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-kaart wordt gebruikt als apparaat voor massaopslag"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"U kunt de USB-opslag nu veilig verwijderen"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"U kunt de SD-kaart nu veilig verwijderen"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB-opslag wordt gebruikt als apparaat voor massaopslag."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD-kaart wordt gebruikt als apparaat voor massaopslag."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"USB-opslag kan veilig worden verwijderd."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"U kunt de SD-kaart nu veilig verwijderen."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-opslag verwijderd tijdens gebruik!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"De SD-kaart is verwijderd terwijl deze nog werd gebruikt!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Gebruikte bytes:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB-opslag scannen op media..."</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Gekop. USB-opsl. alleen-lezen."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"De gekoppelde SD-kaart is 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="5349877711342869319">"Taal"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Verbinding maken met gegevensservices tijdens roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"De gegevensverbinding is verbroken, omdat u uw thuisnetwerk heeft verlaten terwijl gegevensroaming was uitgeschakeld."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Inschakelen"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Gegevensroaming toestaan? Er kunnen hoge roamingkosten in rekening worden gebracht."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Let op"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Wanneer u gegevensroaming toestaat, kunnen er hoge roamingkosten in rekening worden gebracht."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Gegevensroaming toestaan?"</string>
     <string name="networks" msgid="6333316876545927039">"Operator selecteren"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Een mobiele provider kiezen"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum en tijd"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Tijd instellen"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Tijdzone selecteren"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Datum instellen"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Datumnotatie selecteren"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tijd"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Gezichtsvergelijking verbeteren"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Liveness-controle"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Vereisen dat met de ogen wordt geknipperd"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"U kunt uw accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw tablet heeft gecodeerd, moet u een numerieke pincode of wachtwoord opgeven om de tablet te decoderen wanneer u deze inschakelt. U kunt de codering van uw tablet alleen ongedaan maken door de fabrieksinstellingen te herstellen. Als u dit doet, worden al uw gegevens gewist."\n\n"Het coderen 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 coderingsproces onderbreekt, gaan sommige of alle gegevens verloren."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"U kunt uw accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw telefoon heeft gecodeerd, moet u een numerieke pincode of wachtwoord opgeven om de telefoon te decoderen telkens wanneer u deze inschakelt. U kunt de codering van uw telefoon alleen ongedaan maken door de fabrieksinstellingen te herstellen. Als u dit doet, worden al uw gegevens gewist."\n\n"Het coderen duurt een uur of langer. U moet beginnen met een opgeladen accu en moet de telefoon aangesloten laten op het stopcontact tot het coderen is voltooid. Als u het coderingsproces onderbreekt, gaan sommige of alle gegevens verloren."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw tablet heeft gecodeerd, moet u telkens een pincode of wachtwoord opgeven om de tablet te decoderen wanneer u deze opstart. U kunt uw tablet uitsluitend decoderen door de fabrieksinstellingen te herstellen, waarbij al uw gegevens worden gewist."\n\n"Het coderen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en de tablet moet gedurende het coderen op de oplader zijn aangesloten. Als u het coderen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw telefoon heeft gecodeerd, moet u telkens een pincode of wachtwoord opgeven om de telefoon te decoderen wanneer u deze opstart. U kunt uw telefoon uitsluitend decoderen door de fabrieksinstellingen te herstellen, waarbij al uw gegevens worden gewist."\n\n"Het coderen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en u moet de telefoon aansluiten op de oplader totdat het coderen is voltooid. Als u het coderen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</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="2029407131227814893">"Laad de accu op en probeer het opnieuw."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"U moet een pincode of wachtwoord voor schermvergrendeling instellen voordat u de encryptie kunt starten."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Coderen?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"De coderingsbewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het coderen duurt een uur of langer en de tablet wordt meerdere keren opnieuw opgestart."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"De coderingsbewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het coderen 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="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"Typ uw wachtwoord"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryptie mislukt"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Het coderen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op uw tablet niet meer toegankelijk. "\n\n"Als u uw tablet weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de tablet instelt na het herstel, krijgt u de mogelijkheid gegevens waarvan u een back-up heeft gemaakt in uw Google-account, terug te zetten."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Het coderen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op uw telefoon niet meer toegankelijk. "\n\n"Als u uw telefoon weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de telefoon instelt na het herstel, krijgt u de mogelijkheid gegevens waarvan u een back-up heeft gemaakt in uw Google-account, terug te zetten."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Schermvergr. select."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Het coderen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op uw tablet niet meer toegankelijk. "\n\n"Als u uw tablet weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de tablet instelt na het herstel, krijgt u de mogelijkheid gegevens waarvan u een back-up heeft gemaakt in uw Google-account, terug te zetten."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Het coderen is onderbroken en kan niet worden voltooid. Daardoor zijn de gegevens op uw telefoon niet meer toegankelijk. "\n\n"Als u uw telefoon weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de telefoon instelt na het herstel, krijgt u de mogelijkheid gegevens terug te zetten waarvan u een back-up heeft gemaakt in uw Google-account."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Invoermethode schakelen"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Schermvergr. kiezen"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Back-upvergr. kiezen"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Patroon"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Pincode"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-code moet ten minste %d tekens lang zijn"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Wachtwoord moet korter zijn dan <xliff:g id="NUMBER">%d</xliff:g> tekens."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Pincode moet korter zijn dan <xliff:g id="NUMBER">%d</xliff:g> cijfers."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Pincode mag alleen de cijfers 0-9 bevatten."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Apparaatbeheerder staat het gebruik van een recente pincode niet toe."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Wachtwoord bevat een ongeldig teken."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Wachtwoord moet ten minste één letter bevatten."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Wachtwoord moet ten minste één cijfer bevatten."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Wachtwoord moet ten minste één letter bevatten."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Wachtwoord moet ten minste één kleine letter bevatten."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Wachtwoord moet ten minste één hoofdletter bevatten."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Wachtwoord moet ten minste één cijfer bevatten."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Wachtwoord moet ten minste één speciaal symbool bevatten."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Wachtwoord moet ten minste één ander teken dan letters bevatten."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Apparaatbeheerder staat het 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="lock_setup" msgid="1759001157415978959">"Instellen voltooid"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Het instellen is voltooid."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Apparaatbeheer"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Apparaatbeheerders"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Apparaatbeheerders weergeven of uitschakelen"</string>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Koppelen met:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Typ de vereiste toegangscode van 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_enter_pin_other_device" msgid="4637977124526813470">"U moet deze pincode wellicht ook opgeven op het andere apparaat."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Koppelen met:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Typ het volgende:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> en druk op Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Kan niet koppelen aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vanwege een onjuiste pincode of toegangscode."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kan niet communiceren met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Kan geen verbinding maken 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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Gegevensuitwisseling toestaan wanneer de telefoon een ander apparaat fysiek raakt"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Gegevensuitwisseling toestaan wanneer de tablet een ander apparaat fysiek raakt"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Gegevensuitwisseling toestaan wanneer de telefoon een ander apparaat fysiek raakt"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Gereed om app-inhoud te verzenden via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Uit"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Niet beschikbaar omdat NFC is uitgeschakeld"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Wanneer deze functie is ingeschakeld, kunt u app-inhoud overbrengen naar een ander NFC-apparaat door de apparaten bij elkaar te houden. U kunt bijvoorbeeld browserpagina\'s, YouTube-video\'s, contacten uit Personen, en nog veel meer overbrengen."\n\n"Houd de apparaten bij elkaar (meestal met de achterkanten tegen elkaar aan) en raak uw scherm aan. De app bepaalt wat er wordt overgebracht."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Netwerkservicedetectie"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Apps op andere apparaten toestaan apps op dit apparaat te detecteren"</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="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_setup_wizard_title" msgid="70277346338812325">"Wifi selecteren"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan niet scannen naar netwerken"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netwerkmelding"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Melden wanneer een open netwerk beschikbaar is"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Slechte verbindingen vermijden"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Wifi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Slechte verbindingen vermijden"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Wifi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wifi behouden in slaapstand"</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_wps_pbc" msgid="2668564692207863017">"WPS-knop"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-pin"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wifi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Wifi-netwerken zoeken..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Meer"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. config. (WPS)"</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="8242979682530043184">"Pincode opgeven via toegangspunt"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS instellen"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Typ de pincode <xliff:g id="WPS_PIN">%1$s</xliff:g> 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_wps_setup_title" msgid="6034518116333042484">"Beveiligde configuratie voor wifi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS starten…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Druk op de knop \'Beveiligde configuratie voor wifi\' op uw router. Misschien heet deze knop \'WPS\' of bevat deze het volgende symbool:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Geef de pincode <xliff:g id="NUMBER">%1$s</xliff:g> op uw wifi-router op. De configuratie kan twee minuten in beslag nemen."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS geslaagd. Bezig met verbinding maken met netwerk…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Verbonden met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS wordt al uitgevoerd; het kan twee minuten duren voordat dit proces is voltooid"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS is mislukt. Probeer het over enkele minuten opnieuw."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"De beveiligingsinstelling voor de draadloze router (WEP) wordt niet ondersteund"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"De beveiligingsinstelling voor de draadloze router (TKIP) wordt niet ondersteund"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authenticatie is mislukt. Probeer het opnieuw."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Er is een andere WPS-sessie gedetecteerd. Probeer het over een paar minuten 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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Opgeslagen"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Uitgeschakeld"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Slechte internetverbinding vermeden"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Netwerk vermeden wegens slechte verbinding. U kunt het vermijden van netwerken met een slechte verbinding uitschakelen via \'Instellingen\' &gt; het scherm \'Wifi\' en het menu-item \'Geavanceerd\'."</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_wps_available_first_item" msgid="3538912605343585226">"Beveiligd netwerk beschikbaar"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (beveiligd netwerk beschikbaar)"</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_failed_connect_message" msgid="8491902558970292871">"Kan geen verbinding maken met het netwerk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeten"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Vergeten van netwerk is mislukt"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Opslaan"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Opslaan van netwerk is mislukt"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuleren"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Er is nog een Wifi Protected-sessie gedetecteerd. Probeer het later 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengte van netwerkprefix"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wifi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Peer-to-peer-verbindingen instellen"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Apparaatgegevens"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wifi Protected Setup"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Groep verwijderen"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Geavanceerd"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Beschikbare apparaten"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Apparaten zoeken"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Zoeken…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Naam van apparaat wijzigen"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer-apparaten"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Kan geen verbinding maken."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Kan naam van apparaat niet wijzigen."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Ontkoppelen?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Als u de verbinding verbreekt, wordt uw verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> beëindigd."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Als u de verbinding verbreekt, wordt uw verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> en <xliff:g id="PEER_COUNT">%2$s</xliff:g> andere apparaten beëindigd."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Uitnodiging annuleren?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Wilt u de uitnodiging voor verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> annuleren?"</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_configure_ap_text" msgid="3474995108398156258">"Wi-Fi-hotspot configureren"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wifi-hotspot instellen"</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="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Geluid"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Stille modus"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Beltoon telefoon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muziekeffecten"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Belvolume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Trillen indien stil"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Trillen en bellen"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standaardmelding"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Knipperen trackball"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Beltoon"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Beltoon en meldingen dempen"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Muziek en andere media dempen"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Meldingen dempen"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Alarmen dempen"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Trillen bij bellen"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"U moet de tablet in het dock plaatsen voordat u audio-instellingen voor het dock kunt instellen."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"U moet de telefoon in het dock plaatsen voordat u audio-instellingen voor het dock kunt instellen."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"U moet de tablet in het dock plaatsen voordat u audio-instellingen voor het dock kunt instellen."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"U moet de telefoon in het dock plaatsen voordat u audio-instellingen voor het dock kunt instellen."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Geluid voor plaatsing in dockstation"</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="account_settings" msgid="6403589284618783461">"Accounts"</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="7965901687241669598">"Weergave"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Wilt u al uw persoonlijke gegevens en gedownloade apps verwijderen? U kunt deze actie niet ongedaan maken."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles wissen"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Teken uw ontgrendelingspatroon"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"U moet uw ontgrendelingspatroon tekenen om het terugzetten van de fabriekswaarden te bevestigen."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"U moet uw ontgrendelingspatroon tekenen om het terugzetten op de fabrieksinstellingen te bevestigen."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Niet opnieuw ingesteld, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Opnieuw instellen?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-opslag wissen"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD-kaart wissen en alle opgeslagen bestanden verwijderen? U kunt deze actie niet ongedaan maken."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Alles wissen"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Teken uw ontgrendelingspatroon"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de USB-opslag wilt formatteren."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"U moet het ontgrendelingspatroon tekenen om te bevestigen dat u de USB-opslag wilt wissen."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"USB-tethering"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerken"</string>
     <string name="location_title" msgid="1029961368397484576">"Mijn locatie"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Locatieservice van Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Apps gegevens laten gebruiken uit bronnen zoals mobiele en wifi-netwerken om uw locatie te schatten"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Toestaan dat anonieme locatiegegevens worden verzonden naar Google. Ook toestaan dat toegestane apps gegevens uit bronnen zoals mobiele en wifi-netwerken 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Druk op \'Menu\' voor hulp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Haal uw vinger van het scherm als u klaar bent."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Verbind minimaal <xliff:g id="NUMBER">%d</xliff:g> punten. Probeer het opnieuw:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Patroon opgenomen!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Patroon opgenomen."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Teken patroon nogmaals ter bevestiging:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Uw nieuwe ontgrendelingspatroon:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bevestigen"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Volgende"</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="1075370160667458122">"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="tablet" msgid="8616353869251700776">"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="8393155371327584659">"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="7041951105633616745">"Apps beheren"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Geïnstalleerde apps beheren en verwijderen"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Apps beheren, sneltoetsen voor snelstarten instellen"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"App-instellingen"</string>
     <string name="install_applications" msgid="4872012136210802181">"Onbekende bronnen"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Installatie van andere apps dan Market-apps toestaan"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Toestaan dat apps uit onbekende bronnen worden geïnstalleerd"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Uw tablet en persoonlijke gegevens zijn gevoeliger voor aanvallen door apps van onbekende bronnen. U gaat ermee akkoord dat alleen u 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="8113734576826384682">"Uw telefoon en persoonlijke gegevens zijn gevoeliger voor aanvallen door apps van onbekende bronnen. U gaat ermee akkoord dat alleen u 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>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"App-info"</string>
     <string name="storage_label" msgid="8700867073480107253">"Opslagruimte"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Standaard starten"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Standaardinstellingen"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Gegevens wissen"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Updates verwijderen"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"U heeft ervoor gekozen deze app standaard te starten voor bepaalde acties."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"U heeft ervoor gekozen deze app toe te staan widgets te maken en toegang tot de widgetgegevens te geven."</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="1616155457673106022">"Deze app is mogelijk niet ontworpen voor uw scherm. U kunt hier bepalen hoe de app wordt aangepast aan uw scherm."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sorteren op grootte"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Actieve services weergeven"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Gecachte processen weerg."</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Appvoorkeuren herstellen"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Appvoorkeuren herstellen?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hierdoor worden alle voorkeuren voor de volgende items opnieuw ingesteld:"\n\n" "<li>"Uitgeschakelde apps"</li>\n" "<li>"Meldingen van uitgeschakelde apps"</li>\n" "<li>"Standaardapps voor acties"</li>\n" "<li>"Beperkingen voor achtergrondgegevens van apps"</li>\n\n" Er gaan geen appgegevens verloren."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Apps herstellen"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Ruimte beheren"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filteropties kiezen"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Deze app heeft toegang tot de volgende opties van uw tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"Kan pakketgrootte niet berekenen."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"De voorkeursinstallatielocatie voor nieuwe apps wijzigen"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Ingebouwde app uitschakelen?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Als u een ingebouwde app uitschakelt, kunnen andere apps onverwacht gedrag vertonen."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Meldingen uitschakelen?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Als u meldingen voor deze app uitschakelt, mist u misschien belangrijke waarschuwingen en updates."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Opslaggebruik"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Gebruikte opslagruimte voor apps weergeven"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Actieve services"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"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>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Deze spellingcontrole verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens zoals wachtwoorden en creditcardnummers. De service is afkomstig uit de app <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Wilt u deze spellingcontrole gebruiken?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Instellingen"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Taal"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Instellingen openen voor <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> mislukt"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Muis/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Snelheid van aanwijzer"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Gamecontroller"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Trilstand gebruiken"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Trilstand overschakelen naar gamecontroller wanneer deze is aangesloten."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Toetsenbordindeling kiezen"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Toetsenbordindelingen instellen"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Druk op Ctrl-spatiebalk om te schakelen"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standaard"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Toetsenbordindelingen"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerswoordenboek"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Persoonlijk woordenboek"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persoonlijke woordenboeken"</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_add_screen_title" msgid="742580720124344291">"Woordgroep"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Meer opties"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Minder opties"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Woord:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Sneltoets:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Taal:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Voor alle talen"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Meer talen..."</string>
     <string name="testing" msgid="6584352735303604146">"Testen"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tabletinformatie"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefooninformatie"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Opties instellen voor appontwikkeling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-foutopsporing"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Foutopsporingsmodus bij USB-verbinding"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Apparaat-id voor ontwikkeling"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Apparaatgegevens niet beschikbaar"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Stand-by"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Scherm gaat nooit uit tijdens het opladen"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-foutopsporing toestaan?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-foutopsporing is alleen bedoeld voor ontwikkeldoeleinden. Het kan worden gebruikt om gegevens te kopiëren tussen uw computer en uw apparaat, apps zonder melding op uw apparaat te installeren en loggegevens te lezen."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Ontwikkelingsinstellingen toestaan?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Deze instellingen zijn uitsluitend bedoeld voor ontwikkelingsgebruik. Uw apparaat en apps kunnen hierdoor vastlopen of anders reageren."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB-opslag beveiligen"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps moeten toestemming vragen om de USB-opslag te lezen"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB-opslag beveiligen?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wanneer de USB-opslag is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen."\n\n"Sommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD-kaart beveiligen"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps moeten toestemming vragen om de SD-kaart te lezen"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD-kaart beveiligen?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer de SD-kaart is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen."\n\n"Sommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget kiezen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget kiezen"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget maken en toegang toestaan?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Nadat u de widget heeft gemaakt, heeft <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> toegang tot alle gegevens die de widget weergeeft."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> altijd toestaan widgets te maken en toegang tot de widgetgegevens geven"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>u <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>u <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>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Wachtwoorden voorlezen"</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="3264723681038625967">"Webscripts installeren"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Webtoegankelijkheid verbeteren"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Geen services geïnstalleerd"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Heeft u een schermlezer nodig?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack levert gesproken feedback om blinde en slechtziende gebruikers te helpen navigeren. Wilt u deze app gratis installeren via Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Webscripts installeren?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Wilt u dat apps scripts installeren van Google waardoor de webinhoud van de apps toegankelijker wordt?"</string>
-    <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="1072730037861494125">"Geen beschrijving opgegeven."</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_not_available" msgid="3214000535532434353">"Accugebruikgegevens niet beschikbaar."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"De door u geselecteerde engine kan niet worden uitgevoerd."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configureren"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Een andere engine kiezen"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Deze engine voor spraaksynthese kan mogelijk alle tekst verzamelen die wordt gesproken, waaronder persoonlijke gegevens zoals wachtwoorden en creditcardnummers. Deze engine is afkomstig van de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-engine. Het gebruik van deze engine voor spraaksynthese inschakelen?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Vrouw"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Nwe engine insch. vóór gebr."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Teken uw ontgrendelingspatroon"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"U moet uw ontgrendelingspatroon tekenen om de identificatie-installatie te bevestigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Typ het wachtwoord voor referentieopslag."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidig wachtwoord:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Opslag van referenties is gewist."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Kan referentieopslag niet wissen."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"De opslag van referenties is ingeschakeld."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"U moet een pincode of wachtwoord voor het vergrendelen van het scherm instellen voordat u de referentieopslag kunt gebruiken."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"U moet een pincode of wachtwoord voor het vergrendelen van het scherm instellen voordat u de referentieopslag kunt gebruiken."</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="5446972770562918934">"Back-up maken en opnieuw instellen"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisch terugzetten"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In een back-up opgeslagen instellingen of andere gegevens herstellen bij het opnieuw installeren van een app"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Wachtwoord desktopback-up"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Volledige back-ups naar desktops zijn momenteel niet beveiligd"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Raak dit aan om het wachtwoord voor volledige back-ups naar desktops te wijzigen of te verwijderen"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Weet u zeker dat u het maken van back-ups van uw wifi-wachtwoorden, bladwijzers, andere instellingen en gegevens voor apps wilt stoppen en alle kopieën op Google-servers wilt wissen?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Instellingen voor apparaatbeheer"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Systeem"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Beltoon en trillen"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Verbinding maken met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Synchroniseren mislukt"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Synchronisatie actief"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Synchroniseren"</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="background_data" msgid="5779592891375473817">"Achtergrondgegevens"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Laatst gesynchroniseerd: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Nu synchroniseren…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><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="6205903695598000286">"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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"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 \'Instellingen\' &gt; \'Back-up en herstel\'."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"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 \'Instellingen\' &gt; \'Back-up en herstel\'."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Kan niet handmatig synchroniseren"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchroniseren is op dit moment uitgeschakeld voor dit item. Als u deze instelling wilt wijzigen, schakelt u achtergrondgegevens en automatisch synchroniseren tijdelijk in."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G-instellingen"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adres"</string>
     <string name="enter_password" msgid="4131758584074246224">"Typ een wachtwoord om de opslag te decoderen"</string>
     <string name="try_again" msgid="4272075051293936921">"Probeer het opnieuw."</string>
-    <string name="service_busy" msgid="2325014135156127705">"De service is bezet. Probeer het opnieuw."</string>
     <string name="delete" msgid="4219243412325163003">"Verwijderen"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Foutopsporing"</string>
+    <string name="debug_app" msgid="8349591734751384446">"App voor foutopsporing selecteren"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Geen app voor foutopsporing ingesteld"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"App voor foutopsporing: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"App selecteren"</string>
+    <string name="no_application" msgid="2813387563129153880">"Niets"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Wachten op debugger"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Gedebugde app wacht op koppelen van debugger vóór uitvoering"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Invoer"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Tekening"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Controle"</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_screen_updates" msgid="5470814345876056420">"Oppervlakupdates weergeven"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Volledige vensteroppervlakken flashen bij updates"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU-weergave-updates weergeven"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash-weergaven in vensters indien getekend met de GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"HW-overlays uitschakelen"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU altijd gebruiken voor schermcompositing"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Sporen inschakelen"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Ingeschakelde sporen selecteren"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Er zijn momenteel geen sporen ingeschakeld"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> sporen zijn momenteel ingeschakeld"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alle sporen zijn momenteel ingeschakeld"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Indelingsgrenzen weerg."</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Clipgrenzen, marges en meer weergeven."</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="force_hw_ui" msgid="6426383462520888732">"GPU-rendering afdwingen"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"2D-hardwareversnelling gebruiken in applicaties"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Gebruik van GPU voor 2D-tekening forceren"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"GPU-rendering van profiel"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Renderingtijd in adb shell dumpsys gfxinfo meten"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Vensteranimatieschaal"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimatieschaal"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Duur van animatieschaal"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobiele hotspots"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Gegevens automatisch synchroniseren"</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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Wordt gemeten door uw tablet. Uw provider kan gegevensverbruik anders meten."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Wordt gemeten door uw telefoon. Uw provider kan gegevensverbruik anders meten."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"beperkt"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Mobiele gegevens uitschakelen?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Mobiele gegevenslimiet instellen"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G-gegevenslimiet instellen"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobiel"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Instellingen voor app weergeven"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Achtergrondgegevens beperken"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Alleen achtergrondgegevens in mobiel gegevensnetwerk uitschakelen. Wi-Fi wordt gebruikt, indien beschikbaar."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Achtergrondgegevens in mobiele netwerken uitschakelen. Zo mogelijk worden niet-mobiele netwerken gebruikt."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Als u achtergrondgegevens wilt beperken voor deze app, moet u eerst een mobiele gegevenslimiet instellen."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Achtergrondgegevens beperken?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Deze functie kan ervoor zorgen dat een app die afhankelijk is van achtergrondgegevens, niet meer werkt als Wifi niet beschikbaar is."\n\n"Geschiktere opties voor gegevensgebruik zijn beschikbaar in de instellingen in de app."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Deze functie kan ervoor zorgen dat een app die afhankelijk is van achtergrondgegevens, stopt als er alleen mobiele netwerken beschikbaar zijn."\n\n"U kunt meer geschikte besturingselementen voor gegevensgebruik vinden in de instellingen van de app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"U kunt achtergrondgegevens alleen beperken als u een mobiele gegevenslimiet heeft ingesteld."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Auto-sync gegevens inschakelen?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Wijzigingen die u aanbrengt in uw accounts op internet worden automatisch naar uw tablet gekopieerd."\n\n"Sommige accounts kunnen de wijzigingen die u op uw telefoon aanbrengt ook automatisch naar het account op internet kopiëren. Een Google-account werkt op deze manier."\n\n"Ga naar \'Instellingen\' &gt; \'Accounts\' om te selecteren welke typen gegevens u met elk account wilt synchroniseren."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Wijzigingen die u aanbrengt in uw accounts op internet worden automatisch naar uw telefoon gekopieerd."\n\n"Sommige accounts kunnen de wijzigingen die u op uw telefoon aanbrengt ook automatisch naar het account op internet kopiëren. Een Google-account werkt op deze manier."\n\n"Ga naar \'Instellingen\' &gt; \'Accounts\' om te selecteren welke typen gegevens u met elk account wilt synchroniseren."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Auto-sync gegevens uitschakelen?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Hiermee beperkt u gegevens- en accugebruik. U moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. U ontvangt geen meldingen wanneer er updates zijn."</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_warning_editor_title" msgid="3704136912240060339">"Waarschuwing voor gegevensverbruik instellen"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limiet voor gegevensverbruik instellen"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Gegevensgebruik beperken"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Uw <xliff:g id="NETWORKS">%1$s</xliff:g> gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt."\n\n"Aangezien dit gegevensverbruik wordt gemeten door uw tablet en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Uw <xliff:g id="NETWORKS">%1$s</xliff:g> gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt."\n\n"Aangezien dit gegevensverbruik wordt gemeten door uw telefoon en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt."\n\n"Aangezien dit gegevensverbruik wordt gemeten door uw tablet en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt."\n\n"Aangezien dit gegevensverbruik wordt gemeten door uw telefoon en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Achtergrondgegevens beperken?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Als u het gebruik van mobiele achtergrondgegevens beperkt, werken sommige apps en services niet, tenzij u bent verbonden met een wifi-netwerk."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruikt"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruikt."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruikt volgens uw tablet. Uw provider kan dit anders berekenen."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruikt volgens uw telefoon. Uw provider kan dit anders berekenen."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobiele hotspots"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecteer de wifi-netwerken die mobiele hotspots zijn. Het gebruik van deze netwerken op de achtergrond kan in apps worden beperkt. Apps kunnen ook waarschuwen voordat deze netwerken worden gebruikt voor grote downloads."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiele netwerken"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wifi-netwerken"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Schakel wifi in om mobiele hotspots te selecteren."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"VPN-profiel bewerken"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Verbinding maken met <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"VPN-profiel toevoegen"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Profiel bewerken"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Profiel verwijderen"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Er is geen netwerkverbinding. Probeer het later opnieuw."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Er ontbreekt een certificaat. Bewerk het profiel."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"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 app-pictogrammen. 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="3973201880357468747">"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="8764686624055084454">"Als u in een lijst wilt bladeren, veegt u met twee vingers over het scherm. Bijvoorbeeld wanneer het huidige scherm een lijst met app-namen bevat 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="3055831259260848004">"U heeft de handleiding voltooid. Als u wilt sluiten, zoekt u de knop <xliff:g id="FINISH">%s</xliff:g> en raakt u deze aan."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Spellingcontrole"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Spellingcontrole"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Typ hier uw huidige wachtwoord voor volledige back-up"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Geef hier een nieuw wachtwoord voor volledige back-ups op"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Typ hier nogmaals uw nieuwe wachtwoord voor volledige back-up"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuleren"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Aanvullende systeemupdates"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Gebruikers en beperkingen"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Gebruikers"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Gebruiker toevoegen"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Details bewerken"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Gebruikersgegevens"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Naam"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Inhoudsbeperkingen"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Pincode vereisen"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Inhoudsbeoordeling"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Systeemapps"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Geïnstalleerde apps"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Verwijderen"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Gebruiker verwijderen"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Vervelend kind"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Gebruiker verwijderen?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Weet u zeker dat u de gebruiker en alle bijbehorende gegevens wilt verwijderen van het apparaat?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Meldingen weergeven"</string>
+    <string name="help_label" msgid="1107174367904110532">"Help"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 8761c9a..6de5d4a 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Trwa rozłączanie..."</item>
     <item msgid="1634960474403853625">"Rozłączona"</item>
     <item msgid="746097431216080650">"Niepowodzenie"</item>
+    <item msgid="6367044185730295334">"Zablokowana"</item>
+    <item msgid="503942654197908005">"Tymczasowo, by uniknąć połączenia o niskiej jakości"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Trwa rozłączanie z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"Rozłączona"</item>
     <item msgid="8578370891960825148">"Niepowodzenie"</item>
+    <item msgid="5660739516542454527">"Zablokowana"</item>
+    <item msgid="1805837518286731242">"Tymczasowo, by uniknąć połączenia o niskiej jakości"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Naciśnij przycisk"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Brak"</item>
@@ -171,19 +177,13 @@
     <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="7468724146672456026">"Kod PIN z punktu dostępu"</item>
-    <item msgid="7364462169350112617">"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>
+    <item msgid="8673874894887358090">"Własne"</item>
   </string-array>
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Wyłączony"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Wymienna karta SD"</item>
     <item msgid="4498124044785815005">"Zastosuj ustawienie systemowe"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Wyłącz"</item>
-    <item msgid="4804571292609523335">"Wibracje"</item>
-    <item msgid="595707141547423573">"Wycisz"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krótkie"</item>
     <item msgid="2560532955514699713">"Średnie"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Skala animacji 5x"</item>
     <item msgid="6660750935954853365">"Skala animacji 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animacja wyłączona"</item>
+    <item msgid="1138649021950863198">"Skala animacji 0,5x"</item>
+    <item msgid="4394388961370833040">"Skala animacji 1x"</item>
+    <item msgid="8125427921655194973">"Skala animacji 1,5x"</item>
+    <item msgid="3334024790739189573">"Skala animacji 2x"</item>
+    <item msgid="3170120558236848008">"Skala animacji 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1b50018..626c85e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Tak"</string>
     <string name="no" msgid="6731231425810196216">"Nie"</string>
+    <string name="create" msgid="3578857613172647409">"Utwórz"</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>
@@ -25,8 +26,8 @@
     <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="sms_over_ims_on" msgid="5085290395865632925">"Włącz SMS za pośrednictwem IMS"</string>
-    <string name="sms_over_ims_off" msgid="8354792045992793959">"Wyłącz SMS za pośrednictwem IMS"</string>
+    <string name="sms_over_ims_on" msgid="5085290395865632925">"Włącz SMS przez IMS"</string>
+    <string name="sms_over_ims_off" msgid="8354792045992793959">"Wyłącz SMS przez IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Włącz wymóg rejestracji IMS"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Wyłącz wymóg rejestracji IMS"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Włącz zrzut pamięci RAM LTE"</string>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zapobiegaj używaniu wybierania Bluetooth, gdy ekran jest zablokowany"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Lista urządzeń"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nazwa urządzenia"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Ustawienia urządzenia"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Ustawienia profilu"</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_rename_device" product="tablet" msgid="787970073150631155">"Zmień nazwę tabletu"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Parowanie..."</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="5655704645616731277">"Dotknij, by sparować"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Brak 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="1931617700075106801">"Dotknij, by sparować z <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Dotknij, by sparować z <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="device_picker" msgid="8398232791303186677">"Wybór 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="5279027758886569301">"Aplikacja chce włączyć moduł Bluetooth. Zezwolić?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikacja na tablecie chce go ustawić jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Zezwolić?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Dotknij, aby połączyć się 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_acceptance_dialog_text" msgid="6555508756987053866">"%1$s chce uzyskać dostęp do Twoich kontaktów i historii połączeń. 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>
@@ -171,10 +173,10 @@
     <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_settings_title" msgid="5912878565897294401">"Ustawienia proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wyczyść"</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_label" msgid="7700491504623418701">"Pomiń proxy dla"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mojkomputer.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Przywróć domyślne"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"Gotowe"</string>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Wpisana nazwa hosta jest nieprawidłowa."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Wpisana lista wykluczeń jest niepoprawnie sformatowana. Wykluczone domeny muszą być rozdzielone przecinkami."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Należy uzupełnić pole port."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Musisz wypełnić pole portu."</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="2671425042711054494">"Wpisany port jest nieprawidłowy."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Serwer proxy HTTP jest używany przez przeglądarkę, ale inne aplikacje mogą go nie używać."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Ustaw"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Niepowodzenie"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Powodzenie"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Zmiany zostaną wprowadzone po ponownym podłączeniu przewodu USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Zmiany zostaną wprowadzone po ponownym podłączeniu kabla USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Włącz pamięć masową USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Łącznie bajtów:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Nośnik USB nie jest podłączony"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Brak karty SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Nośnik USB niepodłączony"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Brak karty SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Dostępnych bajtów:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Nośnik USB jako pamięć masowa"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Karta SD wykorzystywana jest jako pamięć masowa"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Można teraz wyjąć nośnik USB."</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Można teraz wyjąć kartę SD."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Nośnik USB jako pamięć masowa"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Karta SD jest używana jako pamięć masowa."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Możesz teraz wyjąć nośnik USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Możesz teraz wyjąć kartę SD."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Wyjęto USB podczas używania."</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Karta SD została usunięta, gdy była używana!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Wykorzystanych bajtów:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Trwa skanowanie nośnika USB…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Nośnik USB tylko do odczytu"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Język"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Połącz z usługami transmisji danych w roamingu"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Połączenie transmisji danych zostało utracone, ponieważ opuszczono sieć macierzystą przy wyłączonej opcji danych w roamingu."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Włącz"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Czy zezwolić na dane w roamingu? Mogą się z tym wiązać wysokie opłaty roamingowe!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Uwaga"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Z zezwoleniem na roaming danych mogą się wiązać wysokie opłaty roamingowe."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Zezwalać na roaming danych?"</string>
     <string name="networks" msgid="6333316876545927039">"Wybór operatora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Wybierz operatora sieci."</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data i czas"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Ustaw godzinę"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Wybierz strefę czasową"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Ustaw datę"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Wybierz format daty"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"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="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Godzina"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Popraw rozpoznawanie twarzy"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Sprawdzanie, czy użytkownik jest żywym człowiekiem"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Wymagaj mrugnięcia oczami"</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ż tę informację na ekranie blokady"</string>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Po zaszyfrowaniu konieczne będzie wpisywanie kodu PIN lub hasła przy każdym uruchomieniu tabletu, aby odszyfrować dane. Trwałe odszyfrowanie tabletu jest możliwe jedynie przez przywrócenie danych fabrycznych, a tym samym usunięcie wszystkich danych."\n\n"Szyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie 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="3504519024884099702">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Po zaszyfrowaniu konieczne będzie wpisywanie kodu PIN lub hasła przy każdym uruchomieniu telefonu, aby odszyfrować dane. Odszyfrowanie telefonu jest możliwe jedynie przez przywrócenie danych fabrycznych, a tym samym usunięcie wszystkich danych."\n\n"Szyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj telefonu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu tabletu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Tablet można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych."\n\n"Szyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj tabletu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu telefonu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Telefon można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych."\n\n"Szyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj telefonu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</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="2029407131227814893">"Naładuj baterię i spróbuj ponownie."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"Przed rozpoczęciem szyfrowania musisz ustawić kod PIN lub hasło blokady ekranu."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Zaszyfrować?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operacja szyfrowania jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie trwa co najmniej godzinę, a tablet zostanie w tym czasie kilkakrotnie uruchomiony ponownie."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Operacja szyfrowania jest nieodwracalna, a jej przerwanie grozi utratą danych. Szyfrowanie trwa co najmniej godzinę, a telefon zostanie w tym czasie kilkakrotnie uruchomiony ponownie."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Szyfrowanie"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Czekaj, trwa szyfrowanie tabletu. Ukończono: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"Wpisz swoje 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="6891198717505120682">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w tablecie nie są już dostępne. "\n\n"Aby dalej używać tabletu, należy przywrócić dane fabryczne. Podczas konfiguracji po resecie będziesz mieć możliwość przywrócenia danych zapisanych na koncie Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w telefonie nie są już dostępne. "\n\n"Aby dalej używać telefonu, należy przywrócić dane fabryczne. Podczas konfiguracji po resecie będziesz mieć możliwość przywrócenia danych zapisanych na koncie Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Wybierz blokadę ekranu"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w tablecie nie są już dostępne. "\n\n"Aby dalej używać tabletu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w telefonie nie są już dostępne. "\n\n"Aby dalej używać telefonu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Przełącz metodę wprowadzania"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Wybierz blokadę ekranu"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Wybierz blokadę zapasową"</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>
@@ -348,9 +353,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Brak"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Przesunięcie palcem"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Wzór"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Kod PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Hasło"</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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN musi mieć co najmniej %d znaki"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Gdy skończysz, wybierz Kontynuuj"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Kontynuuj"</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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Hasło musi mieć mniej znaków niż <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Kod PIN musi mieć mniej cyfr niż <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Kod PIN musi zawierać wyłącznie cyfry 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Administrator urządzenia nie zezwala na ustawianie niedawno używanego kodu PIN."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Hasło zawiera niedozwolony znak."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Hasło musi zawierać co najmniej jedną literę."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Hasło musi zawierać co najmniej jedną cyfrę."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Hasło musi zawierać co najmniej jedną literę."</item>
+    <item quantity="other" msgid="8186027808415585970">"Hasło musi zawierać litery (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>
+    <item quantity="one" msgid="5583986519662091001">"Hasło musi zawierać co najmniej jedną małą literę."</item>
+    <item quantity="other" msgid="2693910942679679225">"Hasło musi zawierać małe litery (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>
+    <item quantity="one" msgid="2611909966725502768">"Hasło musi zawierać co najmniej jedną wielką literę."</item>
+    <item quantity="other" msgid="3030801209112209245">"Hasło musi zawierać wielkie litery (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>
+    <item quantity="one" msgid="3820355568839621231">"Hasło musi zawierać co najmniej jedną cyfrę."</item>
+    <item quantity="other" msgid="4703982391407595924">"Hasło musi zawierać cyfry (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>
+    <item quantity="one" msgid="8456579939292408631">"Hasło musi zawierać co najmniej jeden symbol specjalny."</item>
+    <item quantity="other" msgid="1221290525051187757">"Hasło musi zawierać symbole specjalne (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>
+    <item quantity="one" msgid="4594051152085925921">"Hasło musi zawierać co najmniej jeden znak niebędący literą."</item>
+    <item quantity="other" msgid="3952508584649046404">"Hasło musi zawierać znaki inne niż litery (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_password_recently_used" msgid="6098087796784262081">"Administrator urządzenia nie zezwala na ustawianie niedawno używanego 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="lock_setup" msgid="1759001157415978959">"Konfiguracja ukończona"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Konfiguracja została ukończona."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administracja urządzeniem"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Aby sparować z urządzeniem <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, wpisz wymagany klucz urządzenia:"</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_enter_pin_other_device" msgid="4637977124526813470">"Może być również konieczne wpisanie tego kodu PIN na drugim urządzeniu."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Aby sparować z urządzeniem <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, wpisz na nim klucz <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, a następnie naciśnij klawisz zatwierdzania."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nie można sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ze względu na błędny kod PIN lub klucz."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nie można skomunikować się z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Nie udało się nawiązać połączenia z <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>
@@ -451,7 +456,7 @@
     <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_user_profile" msgid="8037627994382458698">"Połączenie internetowe przez urządzenie <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Zezwalaj na wymianę danych, gdy telefon dotyka innego urządzenia."</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Zezwalaj na wymianę danych, gdy tablet dotyka innego urządzenia"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Zezwalaj na wymianę danych, gdy telefon dotyka innego urządzenia."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Gotowy do przesyłania treści aplikacji przez NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Wyłączona"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Niedostępne przy wyłączonym NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Po włączeniu tej funkcji możesz przesyłać dane między urządzeniami z funkcją NFC, zbliżając oba aparaty do siebie. Możliwe jest na przykład przesłanie stron z przeglądarki, filmów z YouTube, kontaktów z telefonu itp."\n\n"Wystarczy zetknąć urządzenia ze sobą i dotknąć ekranu. Aplikacja automatycznie określi, jakie dane chcesz przesłać."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Wykrywanie usług sieciowych"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Zezwól aplikacjom z innych urządzeń wykrywać aplikacje na tym urządzeniu"</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="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_setup_wizard_title" msgid="70277346338812325">"Wybierz Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nie można wyszukać sieci."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Powiadomienie o sieci"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Powiadom mnie, gdy będę w zasięgu otwartej sieci"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Unikaj słabych połączeń"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Nie łącz z Wi-Fi, jeśli połączenie jest słabe"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wi-Fi włączone w trybie uśpienia"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unikaj słabych połączeń"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nie łącz z Wi-Fi, jeśli połączenie jest słabe"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wi-Fi w trybie uśpienia"</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_wps_pbc" msgid="2668564692207863017">"Przycisk WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Kod PIN dla WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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="8242979682530043184">"Wpisz kod PIN z punktu dostępu"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Konfiguracja WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Wpisz 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_empty_list_wifi_on" msgid="3354911729026237372">"Wyszukuję sieci Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Inna sieć…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Więcej"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Autokonfiguracja (WPS)"</string>
+    <string name="wifi_show_advanced" msgid="1793703023711426246">"Opcje zaawansowane"</string>
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Konfiguracja zabezpieczonej sieci Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Uruchamianie WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Naciśnij przycisk konfiguracji zabezpieczonej sieci Wi-Fi na routerze. Może on mieć nazwę „WPS” lub ten symbol:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Wpisz <xliff:g id="NUMBER">%1$s</xliff:g> na routerze Wi-Fi. Konfiguracja może potrwać do dwóch minut."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Konfiguracja WPS powiodła się. Łączenie z siecią..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Połączono z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Konfigurowanie WPS już trwa i może potrwać nawet dwie minuty"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Konfiguracja WPS nie powiodła się. Spróbuj ponownie za kilka minut."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Ustawienie zabezpieczeń routera bezprzewodowego (WEP) nie jest obsługiwane"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Ustawienie zabezpieczeń routera bezprzewodowego (TKIP) nie jest obsługiwane"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Błąd uwierzytelniania. Spróbuj ponownie."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Wykryto inną sesję WPS. Spróbuj ponownie za kilka minut."</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>
@@ -537,21 +559,21 @@
     <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="3111321240793227690">"Uniknięto połączenia internetowego o niskiej jakości."</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Sieć została pominięta ze względu na słabe połączenie. Wyłącz to zachowanie, przechodząc do ekranu Ustawienia &gt; Wi-Fi i wybierając w menu pozycję Zaawansowane."</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_wps_available_first_item" msgid="3538912605343585226">"Sieć chroniona jest dostępna."</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (sieć chroniona jest dostępna)"</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_failed_connect_message" msgid="8491902558970292871">"Nie można nawiązać połączenia z siecią"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zapomnij"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nie udało się zapomnieć sieci"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Zapisz"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nie udało się zapisać sieci"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anuluj"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Wykryto inną chronioną sesję Wi-Fi. Spróbuj ponownie za kilka minut."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Zaawansowane ustawienia Wi-Fi"</string>
+    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Zaawansowane opcje 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brama"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Długość przedrostka sieci"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Konfiguruj łączność peer-to-peer."</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informacje o urządzeniu"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Konfiguracja zabezpieczonej sieci Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Usuń grupę"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Zaawansowane"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Dostępne urządzenia"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Szukaj urządzeń"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Wyszukiwanie…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Zmień nazwę urządzenia"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Urządzenia Peer"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Nie udało się połączyć."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Zmiana nazwy urządzenia nie powiodła się."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Rozłączyć?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Po rozłączeniu Twoje połączenie z <xliff:g id="PEER_NAME">%1$s</xliff:g> zostanie zakończone."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Po rozłączeniu Twoje połączenie z <xliff:g id="PEER_NAME">%1$s</xliff:g> i <xliff:g id="PEER_COUNT">%2$s</xliff:g> innymi urządzeniami zostanie zakończone."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulować zaproszenie?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Czy chcesz anulować zaproszenie do połączenia z <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Skonfiguruj punkt Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Skonfiguruj hotspot 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="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Tryb cichy"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Głośność"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efekty muzyczne"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Głośność dzwonka"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Wibracje po wyciszeniu"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Wibracje i dzwonek"</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="incoming_call_volume_title" msgid="8073714801365904099">"Dzwonek"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Wycisz dzwonek i powiadomienia"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Wycisz muzykę i inne multimedia"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Wycisz powiadomienia"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Wycisz alarmy"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Wibracje i dzwonek"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Przed skonfigurowaniem dźwięku stacji dokującej musisz zadokować tablet."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Przed skonfigurowaniem dźwięku stacji dokującej musisz zadokować telefon."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Przed skonfigurowaniem dźwięku stacji dokującej musisz zadokować tablet."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Przed skonfigurowaniem dźwięku stacji dokującej musisz zadokować telefon."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dźwięk włożenia do stacji dokującej"</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="account_settings" msgid="6403589284618783461">"Konta"</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="7965901687241669598">"Wyświetlacz"</string>
@@ -644,7 +672,7 @@
     <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="519078346877860129">"Wybierz tapetę z"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Wybierz tapetę z..."</string>
     <string name="screensaver_settings_title" msgid="3848608373818910549">"Upiększanie ekranu"</string>
     <string name="screensaver_settings_summary_on" msgid="433728808047613634">"W trybie uśpienia, jeśli jest podłączone zasilanie."</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Wyłączone"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mój numer telefonu"</string>
     <string name="status_min_number" msgid="3519504522179420597">"Numer MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Wersja listy PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"Wersja 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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Wymazać wszystkie Twoje informacje osobiste i pobrane aplikacje? Tej czynności 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="2234954758550554549">"Aby potwierdzić przywrócenie danych fabrycznych, musisz narysować wzór odblokowania."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Aby potwierdzić przywrócenie danych fabrycznych, musisz narysować wzór odblokowania."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nie wykonano resetowania, ponieważ usługa czyszczenia systemu jest niedostępna."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zresetować?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Wyczyść nośnik USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Wymazać kartę SD, usuwając wszystkie zapisane na niej pliki? Tej czynności nie można cofnąć."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Wymaż wszystko"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Narysuj wzór odblokowania"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Aby potwierdzić zamiar wyczyszczenia nośnika USB, musisz narysować wzór odblokowania."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Aby potwierdzić zamiar wyczyszczenia karty SD, musisz narysować wzór odblokowania."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Aby potwierdzić zamiar wyczyszczenia nośnika USB, musisz narysować wzór odblokowania."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"Tethering przez USB"</string>
@@ -861,8 +889,8 @@
     <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_off_subtext" product="tablet" msgid="2093881379028235555">"Połączenie internetowe nie jest udostępniane"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Połączenie internetowe nie jest udostępniane"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Brak powiązania"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"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>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Sieci komórkowe"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokalizacja"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Usługa lokalizacyjna"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Zezwól aplikacjom na używanie danych (np. z sieci Wi-Fi lub komórkowych) do określania przybliżonej lokalizacji"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Zezwalaj na przesyłanie do Google anonimowych danych o lokalizacji. Zezwalaj uprawnionym aplikacjom na określanie przybliżonej lokalizacji z użyciem sieci komórkowych i Wi-Fi."</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>
@@ -902,7 +930,7 @@
     <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_choose_lock_generic_header" msgid="3811438094903786145">"Wybór blokady"</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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Naciśnij Menu, aby uzyskać pomoc."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Puść palec, gdy gotowe."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Połącz co najmniej <xliff:g id="NUMBER">%d</xliff:g> kropki. Spróbuj jeszcze raz:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Wzór został nagrany!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Wzór został nagrany."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Narysuj wzór ponownie, aby potwierdzić:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Nowy wzór odblokowania:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potwierdź"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Dalej"</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="1075370160667458122">"Chroń swój tablet 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? Wybierz Dalej."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Chroń swój tablet 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? Wybierz Dalej."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Chroń swój telefon 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? Wybierz Dalej."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Zarządzaj zainstalowanymi aplikacjami i usuwaj je."</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Zarządzaj aplikacjami, konfiguruj skróty szybkiego uruchamiania."</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ustawienia aplikacji"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nieznane źródła"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Zezwalaj na instalowanie aplikacji spoza Marketu."</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Zezwalaj na instalowanie aplikacji z nieznanych źródeł"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Twój tablet i dane osobiste są bardziej narażone na ataki aplikacji z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie możliwe szkody w tablecie i utratę danych w wyniku korzystania z tych aplikacji."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Twój telefon i dane osobiste są bardziej narażone na ataki aplikacji z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie możliwe szkody w telefonie i utratę danych w wyniku korzystania z tych aplikacji."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ustawienia zaawansowane"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"Domyślne"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Wyczyść dane"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Odinstaluj aktualizacje"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Aplikacja jest domyślnie uruchamiana w przypadku niektórych działań."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Zdecydowałeś, że ta aplikacja może tworzyć widgety i mieć dostęp do ich danych."</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="1616155457673106022">"Aplikacja może nie być przystosowana do ekranu Twojego urządzenia. Tutaj możesz ją skonfigurować do obsługi ekranu."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sortuj według rozmiaru"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Pokaż działające usługi"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaż procesy z pamięci podręcznej"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj opcje aplikacji"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Zresetować opcje aplikacji?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Wszystkie te ustawienia zostaną zresetowane:"\n\n" "<li>"wyłączone aplikacje,"</li>\n" "<li>"wyłączone powiadomienia aplikacji,"</li>\n" "<li>"aplikacje używane domyślnie do wykonania czynności,"</li>\n" "<li>"ograniczenia użycia danych w tle w aplikacjach."</li>\n\n" Nie utracisz żadnych danych aplikacji."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetuj aplikacje"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj rozmiarem"</string>
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Wybierz opcje filtru"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Aplikacja ma dostęp do następujących elementów na tablecie:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Aplikacja ma dostęp do następujących elementów na telefonie:"</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="invalid_size_value" msgid="7563537715280712285">"Nie udało się obliczyć rozmiaru pakietu."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nie masz zainstalowanych żadnych aplikacji firm zewnętrznych."</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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Zmień preferowaną lokalizację instalacji nowych aplikacji."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Wyłączyć wbudowaną aplikację?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jeśli wyłączysz wbudowaną aplikację, inne aplikacje mogą działać nieprawidłowo."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Wyłączyć powiadomienia?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jeśli wyłączysz powiadomienia tej aplikacji, możesz przeoczyć ważne alerty i aktualizacje."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Użycie pamięci"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Wyświetl pamięć używaną przez aplikacje"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Uruchomione usługi"</string>
@@ -1042,15 +1078,15 @@
     <string name="service_started_by_app" msgid="818675099014723551">"Uruchomiona przez aplikację"</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="6844156253576174488">"Wolne: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="service_foreground_processes" msgid="7583975676795574276">"Używane: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> wolne"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> w użyciu"</string>
     <string name="memory" msgid="6609961111091483458">"Pamięć RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Procesów: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, usług: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Procesów: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, usług: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Procesów: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, usług: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"Procesów: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, usług: <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> proces, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługa"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługi"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesy, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługa"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesy, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługi"</string>
     <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Uruchomiona aplikacja"</string>
     <string name="no_services" msgid="7133900764462288263">"Nieaktywne"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Usługi"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Pochodzi ona z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Użyć jej?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ten moduł sprawdzania pisowni może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Pochodzi on z aplikacji <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Użyć go?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Ustawienia"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Język"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Nie udało się otworzyć ustawień aplikacji <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mysz/touchpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Szybkość wskaźnika"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Kontroler gier"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Użyj wibracji"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Po podłączeniu kontrolera gier przekieruj do niego wibracje."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Wybierz układ klawiatury"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Skonfiguruj układy klawiatury"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Control-spacja, by przełączyć"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Domyślna"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Układy klawiatury"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Słownik użytkownika"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Słownik osobisty"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobiste słowniki"</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_add_screen_title" msgid="742580720124344291">"Wyrażenie"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Więcej opcji"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Mniej opcji"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Słowo:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Skrót:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Język:"</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="8165273379942105271">"Nie masz żadnych słów w słowniku użytkownika. Aby dodać słowo, wybierz Dodaj (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Wszystkie języki"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Dla wszystkich języków"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Więcej języków..."</string>
     <string name="testing" msgid="6584352735303604146">"Testowanie"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informacje o tablecie"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informacje o telefonie"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID urządzenia programisty"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Informacje o urządzeniu są niedostępne."</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Zostaw włączony"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran nie będzie gaszony podczas ładowania telefonu"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowanie lokalizacji"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Czy zezwalać na debugowanie USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Debugowanie USB jest przeznaczone wyłącznie do celów programistycznych. Może służyć do kopiowania danych między komputerem a urządzeniem, instalowania aplikacji na urządzeniu bez powiadamiania, a także odczytu danych dziennika."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Zezwolić na ustawienia programistyczne?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Te ustawienia są przeznaczone wyłącznie dla programistów. Ich użycie może spowodować uszkodzenie lub nieprawidłowe działanie urządzenia i zainstalowanych na nim aplikacji."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Chroń nośnik USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikacje muszą prosić o pozwolenie na odczyt nośnika USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Włączyć ochronę nośnika USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Gdy nośnik USB jest chroniony, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego."\n\n"Niektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Chroń kartę SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacje muszą prosić o pozwolenie na odczyt karty SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Włączyć ochronę karty SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Gdy karta SD jest chroniona, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego."\n\n"Niektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</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="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Utworzyć widżet i zezwolić na dostęp?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Po utworzeniu widżetu <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> może uzyskać dostęp do wszystkich wyświetlanych danych."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Zawsze zezwalaj na tworzenie widgetów przez <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> i dostęp do ich danych"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Duży tekst"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Przycisk kończy rozmowę"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Wypowiadaj hasła na głos"</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="3264723681038625967">"Zainstaluj skrypty internetowe"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Zwiększenie dostępności stron"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Brak zainstalowanych usług"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrzebujesz czytnika ekranu?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack odczytuje zawartość ekranu, pomagając użytkownikom niewidomym i niedowidzącym. Czy chcesz zainstalować tę usługę za darmo z Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Zainstalować skrypty internetowe?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Czy chcesz, aby aplikacje instalowały skrypty od Google, które zwiększą dostępność treści internetowych?"</string>
-    <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="1072730037861494125">"Brak opisu"</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_not_available" msgid="3214000535532434353">"Brak danych o zużyciu baterii"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1256,7 +1317,7 @@
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ostatnio odłączony na <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Łączne użycie"</string>
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Odśwież"</string>
-    <string name="process_kernel_label" msgid="3916858646836739323">"System operacyjny Android"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"System Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Serwer mediów"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Ustawienia głosowe"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ustawienia funkcji głosowych"</string>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"Nie można uruchomić wybranego mechanizmu."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguruj"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Wybierz inny mechanizm"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ten mechanizm syntezy mowy może gromadzić cały odczytywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Nazwa mechanizmu to <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Włączyć ten mechanizm syntezy mowy?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Kobieta"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Narysuj wzór odblokowania"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Aby potwierdzić instalację danych logowania, musisz narysować wzór odblokowania."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Podaj hasło do magazynu danych logowania."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Bieżące hasło:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Wyczyszczono magazyn danych logowania."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Nie można wymazać magazynu."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Magazyn danych logowania jest włączony."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Aby korzystać z magazynu danych logowania, musisz ustawić kod PIN lub hasło blokady ekranu."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Aby korzystać z magazynu danych logowania, musisz ustawić kod PIN lub hasło blokady ekranu."</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="5446972770562918934">"Kopia i kasowanie danych"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Autoprzywracanie"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Przy ponownej instalacji aplikacji przywróć ustawienia i dane z kopii zapasowej."</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Hasło kopii zapasowych"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Pełne kopie zapasowe na komputerze 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="local_backup_password_summary_none" msgid="393503434408227110">"Pełne kopie zapasowe na komputerze nie są obecnie chronione."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Wybierz, aby zmienić lub usunąć hasło pełnych kopii zapasowych na komputerze stacjonarnym."</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Zatrzymać tworzenie kopii zapasowych haseł sieci Wi-Fi, zakładek, innych ustawień oraz danych aplikacji, a także usunąć wszystkie kopie z serwerów Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ustawienia administracji"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"System"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Dzwonek i wibracje przy połączeniu"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Łączenie z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Błąd synchronizacji"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Synchronizacja aktywna"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Synchronizacja"</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="background_data" msgid="5779592891375473817">"Dane w tle"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Ostatnia synchronizacja: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Synchronizuję…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google Sync – witamy!"</font>" "\n"Synchronizacja danych daje Ci dostęp do kontaktów, wydarzeń i innych ważnych informacji z dowolnego miejsca."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Ustawienia synchronizacji aplikacji"</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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"To konto jest wymagane przez niektóre aplikacje. Możesz je usunąć wyłącznie przez przywrócenie ustawień fabrycznych tabletu (co spowoduje usunięcie wszystkich Twoich danych osobistych) w sekcji Ustawienia &gt; Kopia i kasowanie danych."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"To konto jest wymagane przez niektóre aplikacje. Możesz je usunąć wyłącznie przez przywrócenie ustawień fabrycznych telefonu (co spowoduje usunięcie wszystkich Twoich danych osobistych) w sekcji Ustawienia &gt; Kopia i kasowanie danych."</string>
     <string name="provider_label" msgid="7724593781904508866">"Subskrypcje w trybie push"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nie można zsynchronizować ręcznie"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizacja tego elementu jest obecnie wyłączona. Aby zmienić ustawienie, tymczasowo włącz obsługę danych w tle i automatyczną synchronizację."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Ustawienia 4G"</string>
@@ -1435,29 +1503,52 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adres MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Wpisz hasło, aby odszyfrować pamięć masową."</string>
     <string name="try_again" msgid="4272075051293936921">"Spróbuj ponownie."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Usługa jest zajęta. Spróbuj ponownie."</string>
     <string name="delete" msgid="4219243412325163003">"Usuń"</string>
     <string name="misc_files" msgid="6720680815969643497">"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="1562774643280376715">"Wybierz wszystkie"</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="hdcp_checking_dialog_title" msgid="5141305530923283">"Ustaw sprawdzanie HDCP"</string>
+    <string name="debug_debugging_category" msgid="6781250159513471316">"Debugowanie"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Aplikacja do debugowania"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nie ustawiono aplikacji do debugowania"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplikacja do debugowania: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Wybierz aplikację"</string>
+    <string name="no_application" msgid="2813387563129153880">"Brak"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Poczekaj na debugera"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikacja do debugowania czeka na przyłączenie debugera."</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Wprowadzanie"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Rysowanie"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorowanie"</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_screen_updates" msgid="5470814345876056420">"Pokaż zmiany powierzchni"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Podświetlaj całe aktualizowane powierzchnie okien"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Pokaż zmiany widoku z GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Podświetlaj widoki w oknach rysowane przez GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Wyłącz nakładki HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Zawsze używaj GPU do komponowania ekranu"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Włącz ślady"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Wybierz włączone ślady"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Brak włączonych śladów"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Włączone ślady: <xliff:g id="NUM">%1$d</xliff:g>"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Wszystkie ślady są włączone"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Pokaż granice układu"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Pokaż granice przycięcia, marginesy itd."</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="force_hw_ui" msgid="6426383462520888732">"Wymuś renderowanie na GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Użyj w aplikacjach sprzętowej akceleracji 2D"</string>
+    <string name="force_hw_ui" msgid="6426383462520888732">"Renderowanie na GPU"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Wymuszaj użycie GPU do rysowania 2D"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profil renderowania GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mierz czas renderowania w adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Skala długości animacji"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1467,17 +1558,18 @@
     <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_restrict_background" msgid="1989394568592253331">"Ogranicz przesył 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ż użycie Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Pokaż użycie sieci Ethernet"</string>
+    <string name="data_usage_menu_metered" msgid="5056695223222541863">"Hotspoty komórkowe"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Autosynchronizacja danych"</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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Mierzone przez tablet. Operator może w inny sposób obliczać transfer danych."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Mierzone przez telefon. Operator może w inny sposób obliczać transfer danych."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"z ograniczeniami"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Wyłączyć transmisję komórkową?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Limit danych mobilnych"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Ustaw limit trans. danych 4G"</string>
@@ -1488,33 +1580,45 @@
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilne"</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_list_mobile" msgid="5588685410495019866">"Komórkowe"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Brak"</string>
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Dane mobilne"</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="8430240158135453271">"Wyświetl ustawienia aplikacji"</string>
-    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ogranicz transmisję danych w tle"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Wyłącz dane w tle dla sieci komórkowej (nadal używaj dla Wi-Fi)."</string>
+    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ogranicz przesył danych w tle"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Wyłącz dane w tle w sieciach komórkowych (nadal używaj w innych sieci)."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Transmisję danych w tle możesz ograniczyć po ustawieniu limitu."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograniczyć dane w tle?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Ta funkcja może zakłócić działanie aplikacji korzystających z przesyłania danych w tle, jeśli sieć Wi-Fi będzie niedostępna."\n\n"Szczegółowe ustawienia przesyłania danych są zazwyczaj dostępne bezpośrednio w aplikacji."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle."\n\n"Szczegółowe ustawienia transmisji danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ograniczenie transmisji danych w tle jest możliwe tylko po ustawieniu limitu komórkowej transmisji danych."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Włączyć autosynchronizację?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Wszystkie zmiany, które wprowadzisz na swoich kontach w sieci, będą automatycznie kopiowane na Twój tablet."\n\n"Niektóre konta mogą też kopiować do sieci wszystkie zmiany, które wprowadzisz na tablecie. W ten sposób działa konto Google."\n\n"Aby wybrać informacje synchronizowane przez poszczególne konta, wyświetl Ustawienia &gt; Konta."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Wszystkie zmiany, które wprowadzisz na swoich kontach w sieci, będą automatycznie kopiowane na Twój telefon."\n\n"Niektóre konta mogą też kopiować do sieci wszystkie zmiany, które wprowadzisz na telefonie. W ten sposób działa konto Google."\n\n"Aby wybrać informacje synchronizowane przez poszczególne konta, wyświetl Ustawienia &gt; Konta."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Wyłączyć autosynchronizację?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Powoduje przesyłanie mniejszej ilości danych oraz zmniejsza użycie baterii, ale pobranie najnowszych informacji będzie wymagało ręcznej synchronizacji każdego konta. Poza tym nie będziesz otrzymywać powiadomień o aktualizacjach."</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_warning_editor_title" msgid="3704136912240060339">"Ustaw ostrzeżenie o transmisji danych"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ustaw limit danych"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograniczanie transmisji danych"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Połączenie transmisji danych (<xliff:g id="NETWORKS">%1$s</xliff:g>) zostanie wyłączone po osiągnięciu określonego limitu."\n\n"Ponieważ transfer danych jest mierzony przez tablet, a Twój operator może rejestrować transmisję danych w inny sposób, warto ustawić nieco niższy limit."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Połączenie transmisji danych (<xliff:g id="NETWORKS">%1$s</xliff:g>) zostanie wyłączone po osiągnięciu określonego limitu."\n\n"Ponieważ transfer danych jest mierzony przez telefon, a Twój operator może rejestrować transmisję danych w inny sposób, warto ustawić nieco niższy limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Komórkowe połączenie transmisji danych zostanie wyłączone po wyczerpaniu limitu."\n\n"Ilość przesyłanych danych może być różnie rozliczana przez tablet i operatora, więc warto ustawić nieco niższy limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Komórkowe połączenie transmisji danych zostanie wyłączone po wyczerpaniu limitu."\n\n"Ilość przesyłanych danych może być różnie rozliczana przez telefon i operatora, więc warto ustawić nieco niższy limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograniczyć dane w tle?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jeśli ograniczysz transmisję danych w tle, niektóre aplikacje i usługi będą działać tylko po nawiązaniu połączenia z siecią Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: przesłano ok. <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: wykorzystane <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: wykorzystane <xliff:g id="TOTAL">%1$s</xliff:g> wg licznika w tablecie. Rozliczenie operatora może się różnić."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: wykorzystane <xliff:g id="TOTAL">%1$s</xliff:g> wg licznika w telefonie. Rozliczenie operatora może się różnić."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Hotspoty komórkowe"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Wybierz sieci Wi-Fi, które są hotspotami komórkowymi. Możesz ograniczyć aplikacjom działającym w tle dostęp do tych sieci. Aplikacje mogą też ostrzegać, zanim użyją tych sieci do pobrania dużych ilości danych."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Sieci komórkowe"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Sieci Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Aby wybrać hotspoty komórkowe, włącz Wi-Fi."</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>
@@ -1527,7 +1631,7 @@
     <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_ipsec_server_cert" msgid="6599276718456935010">"Certyfikat serwera IPSec"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"Pokaż opcje zaawansowane"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Edytuj profil VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Połącz z: <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Dodaj profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Edytuj profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Usuń profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Brak połączenia sieciowego. Spróbuj ponownie później."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Brak certyfikatu. Edytuj profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Własne"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Wyłącz"</string>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"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="3973201880357468747">"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="8764686624055084454">"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="3055831259260848004">"Samouczek został ukończony. Aby go zamknąć, znajdź przycisk <xliff:g id="FINISH">%s</xliff:g>, a następnie go użyj."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Korekta pisowni"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Sprawdzanie pisowni"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Wpisz tutaj bieżące hasło pełnych kopii zapasowych."</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Wpisz tutaj nowe hasło pełnych kopii zapasowych."</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Ponownie wpisz tutaj nowe hasło pełnych kopii zapasowych."</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anuluj"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatkowe aktualizacje systemu"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Użytkownicy i ograniczenia"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Użytkownicy"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj użytkownika"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Edytuj szczegóły"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Informacje o użytkowniku"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nazwa"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Ograniczenia treści"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Wymagaj PIN-u"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Ocena treści"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplikacje systemowe"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Zainstalowane aplikacje"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Odrzuć"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Usuń użytkownika"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Nieznośny dzieciak"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Usunąć użytkownika?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Czy na pewno chcesz usunąć użytkownika i wszystkie związane z nim dane z urządzenia?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaż powiadomienia"</string>
+    <string name="help_label" msgid="1107174367904110532">"Pomoc"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 39388dd..5a41861 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"A desligar..."</item>
     <item msgid="1634960474403853625">"Desligado"</item>
     <item msgid="746097431216080650">"Sem sucesso"</item>
+    <item msgid="6367044185730295334">"Bloqueado"</item>
+    <item msgid="503942654197908005">"A evitar temporariamente uma ligação fraca"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"A desligar de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Desligado"</item>
     <item msgid="8578370891960825148">"Sem sucesso"</item>
+    <item msgid="5660739516542454527">"Bloqueado"</item>
+    <item msgid="1805837518286731242">"A evitar temporariamente uma ligação fraca"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Premir botão"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nenhum"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN do ponto de acesso"</item>
-    <item msgid="7364462169350112617">"PIN deste aparelho"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Estático"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Cartão SD amovível"</item>
     <item msgid="4498124044785815005">"Permitir que seja o sistema a decidir"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Desativado"</item>
-    <item msgid="4804571292609523335">"Vibrar"</item>
-    <item msgid="595707141547423573">"Desativar som"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curta"</item>
     <item msgid="2560532955514699713">"Média"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Escala de animação 5x"</item>
     <item msgid="6660750935954853365">"Escala de animação 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animação desativada"</item>
+    <item msgid="1138649021950863198">"Escala de animação 0,5x"</item>
+    <item msgid="4394388961370833040">"Escala de animação 1x"</item>
+    <item msgid="8125427921655194973">"Escala de animação 1,5x"</item>
+    <item msgid="3334024790739189573">"Escala de animação 2x"</item>
+    <item msgid="3170120558236848008">"Escala de animação 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 02b8dc4..45947d9 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Sim"</string>
     <string name="no" msgid="6731231425810196216">"Não"</string>
+    <string name="create" msgid="3578857613172647409">"Criar"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar a utilização do telefone Bluetooth quando o ecrã está bloqueado"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nome do dispositivo"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Definições do dispositivo"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Definições do perfil"</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_rename_device" product="tablet" msgid="787970073150631155">"Mudar o nome do tablet"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"A emparelhar..."</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="5655704645616731277">"Tocar p/ sincronizar"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"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="1931617700075106801">"Toque para sincronizar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toque para sincronizar 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="device_picker" msgid="8398232791303186677">"Selecionador de aparelho Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Pedido de emparelhamento de Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Uma aplicação pretende ativar o Bluetooth. Permitir?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Uma aplicação do tablet pretende que outros aparelhos Bluetooth possam detetar o seu tablet durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toque para 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_acceptance_dialog_text" msgid="6555508756987053866">"%1$s pretende 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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"O nome de anfitrião que introduziu não é válido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"A lista de exclusão introduzida não está formatada corretamente. 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_port" msgid="5539106187558215246">"É 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="2671425042711054494">"A porta introduzida não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é utilizado pelo navegador, mas não pode ser utilizado por outras aplicações."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Definir"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Sem sucesso"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Bem sucedido"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"As alterações terão efeito ao ligar novamente o cabo USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"As alterações terão efeito ao ligar novamente o cabo USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activar armazenamento em massa USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total de bytes:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Armazenamento USB não montado"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nenhum cartão SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Memória de armazenamento USB não montada."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Nenhum cartão SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponíveis:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Armaz. USB utilizado como disp. de armaz. em massa"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"O cartão SD está a ser utilizado como um dispositivo de armazenamento em massa"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Pode remover em seg. mem. armaz.USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Pode remover em segurança o cartão SD"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"A memória USB está a ser utilizada como aparelho de armazenamento em massa."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"O cartão SD está a ser utilizado como um aparelho de armazenamento em massa."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Pode remover em seg. mem. USB"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Pode remover com segurança o cartão SD."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Armaz. USB removido ao ser utilizado!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"O cartão SD foi removido quando ainda estava em uso!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes utilizados:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"A proc. multim. no armaz. USB…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Mem. USB montada só de leitura."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Idioma"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Ligar a serviços de dados em roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"A ligação de dados foi perdida porque saiu do alcance da sua rede e o roaming de dados estava desactivado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ligar"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Permitir roaming de dados? Os encargos de roaming podem ser significativos!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Atenção"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Ao permitir o roaming de dados, poderão ser cobrados custos de roaming significativos!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Permitir roaming de dados?"</string>
     <string name="networks" msgid="6333316876545927039">"Selecção da operadora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Escolher um operador de rede"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e hora"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Definir hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar fuso horário"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Seleccionar formato de data"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Selecionar 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="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Melhorar correspondência de rosto"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Confirmação de presença de vida"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Solicitar piscar de olhos"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"É possível encriptar as suas contas, definições, aplicações transferidas e respetivos dados, multimédia e outros ficheiros. Após encriptar o tablet, deverá introduzir um PIN numérico ou palavra-passe para o desencriptar sempre que o ligar: não é possível desencriptar o tablet, exceto se executar uma reposição de dados de fábrica, o que apagará 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="3504519024884099702">"É possível encriptar as suas contas, definições, aplicações transferidas e respetivos dados, multimédia e outros ficheiros. Após encriptar o telemóvel, deverá introduzir um PIN numérico ou palavra-passe para o desencriptar sempre que o ligar: não é possível desencriptar o telemóvel, exceto se executar uma reposição de dados de fábrica, o que apagará todos os seus dados."\n\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o telemóvel 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="tablet" msgid="3839235202103924154">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o tablet, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o tablet, exceto através da realização de uma reposição de dados de fábrica, apagando 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é a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o telemóvel, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o telemóvel, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados."\n" "\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o telemóvel ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá 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="2029407131227814893">"Carregue a bateria e tente novamente."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Ligue o carregador e tente novamente."</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_dialog_need_password_message" msgid="4071395977297369642">"É necessário configurar um PIN ou palavra-passe de bloqueio de ecrã antes de iniciar a encriptação."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Encriptar?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A operação de encriptaçã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="5682944380460921880">"A operação de encriptação é irreversível e, se a interromper, perderá dados. A encriptação demora uma hora ou mais, durante a qual o telemóvel 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="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"Introduza a 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="6891198717505120682">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu tablet já não estão acessíveis. "\n\n"Para voltar a utilizar o tablet, tem de efetuar uma reposição para os valores de fábrica. Quando configurar o tablet após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu telemóvel já não estão acessíveis. "\n\n"Para voltar a utilizar o telemóvel, tem de efetuar uma reposição para os valores de fábrica. Quando configurar o telemóvel após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Selec. bloqueio do ecrã"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no tablet já não estão acessíveis. "\n\n"Para voltar a utilizar o tablet, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o tablet após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na Conta Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu telemóvel já não estão acessíveis. "\n\n"Para voltar a utilizar o telemóvel, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o telemóvel após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Alternar o método de introdução"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Selec. bloq. do ecrã"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Escolher bloq. cópia seg."</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Desbloqueio Através do Rosto"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Sequência"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <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="122706614386757182">"Toque em Continuar quando terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A palavra-passe tem de ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"O PIN deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"O PIN tem de incluir apenas dígitos de 0 a 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"O administrador do aparelho não permite utilizar um PIN recente."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"A palavra-passe contém um carácter ilegal."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"A palavra-passe tem de incluir, pelo menos, uma letra."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"A palavra-passe tem de incluir, pelo menos, um dígito."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"A palavra-passe tem de incluir, 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>
+    <item quantity="one" msgid="3063853802158131458">"A palavra-passe tem de incluir, pelo menos, 1 letra."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"A palavra-passe tem de incluir, pelo menos, 1 letra minúscula."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"A palavra-passe tem de incluir, pelo menos, 1 letra maiúscula."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"A palavra-passe tem de incluir, pelo menos, 1 dígito numérico."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"A palavra-passe tem de incluir, pelo menos, 1 símbolo especial."</item>
+    <item quantity="other" msgid="1221290525051187757">"A palavra-passe tem de incluir, pelo menos, %d símbolos 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>
+    <item quantity="one" msgid="4594051152085925921">"A palavra-passe tem de incluir, pelo menos, 1 carácter que não seja uma letra."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"O administrador do aparelho não permite 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="lock_setup" msgid="1759001157415978959">"Configuração concluída"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"A configuração está concluída."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administração 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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Para sincronizar com:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Introduza a chave de acesso do dispositivo solicitada:"</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_enter_pin_other_device" msgid="4637977124526813470">"Poderá também ter de introduzir este PIN no outro aparelho."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Poderá também ter de introduzir a 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="2796550001376088433">"Para sincronizar com:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Introduza no mesmo:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> e, em seguida, prima Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Não foi possível sincronizar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> devido a PIN ou chave de acesso incorreto."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Não é possível comunicar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Não foi possível 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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Permitir a troca de dados quando o telefone toca outro aparelho"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir a troca de dados quando o tablet toca noutro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir a troca de dados quando o telefone toca outro aparelho"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Pronto para transmitir conteúdo da aplicação via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desativado"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Não disponível, porque o NFC está desativado"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Quando esta funcionalidade está ativada, pode transmitir o conteúdo da aplicação para outro aparelho com capacidade de NFC mantendo os aparelhos próximos um do outro. Por exemplo, pode transmitir páginas do Navegador, vídeos do YouTube, contactos de Pessoas e muito mais. "\n\n"Basta juntar os aparelhos (normalmente de costas) e, em seguida, tocar no ecrã. A aplicação determina o que é transmitido."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Deteção do serviço de rede"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir que aplicações noutros dispositivos detetem aplicações neste dispositivo"</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="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_setup_wizard_title" msgid="70277346338812325">"Selecionar Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Não é possível verificar redes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificação de rede"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notificar-me quando estiver disponível uma rede aberta"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Evitar más ligações"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Não utilizar uma rede Wi-Fi a menos que tenha uma boa ligação à internet"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar más ligações"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Não utilizar uma rede Wi-Fi a menos que tenha uma boa ligação à Internet"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Manter Wi-Fi ligada durante suspensão"</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_wps_pbc" msgid="2668564692207863017">"Botão WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introdução PIN WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"A pesquisar redes Wi-Fi..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automática (WPS)"</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="8242979682530043184">"Introduzir PIN do ponto de acesso"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Configuração WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"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_wps_setup_title" msgid="6034518116333042484">"Configuração Wi-Fi Protegida"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"A iniciar WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Prima o botão de Configuração Protegida de Wi-Fi no router. Pode denominar-se \"WPS\" ou conter o seguinte símbolo:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Introduza o PIN <xliff:g id="NUMBER">%1$s</xliff:g> do router Wi-Fi. A configuração pode demorar até dois minutos a ser concluída."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS iniciado com êxito. A estabelecer a ligação à rede..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Ligado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"O WPS já está em curso e pode demorar até dois minutos a ser concluído"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"O WPS falhou. Tente novamente dentro de alguns minutos."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A definição de segurança do router sem fios (WEP) não é suportada"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A definição de segurança do router sem fios (TKIP) não é suportada"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Foi detetada outra sessão do WPS. Tente novamente dentro de alguns minutos."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Evitada ligação à internet fraca"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"A rede foi evitada devido a uma ligação fraca. Desative essa opção no ecrã Definições &gt; Wi-Fi, no item de menu Avançadas."</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_wps_available_first_item" msgid="3538912605343585226">"Rede protegida disponível"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (rede protegida disponível)"</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_failed_connect_message" msgid="8491902558970292871">"Não foi possível estabelecer ligação à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Não foi possível esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Não foi possível guardar a rede"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Detetada outra sessão Wi-Fi protegida. Tente 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Compr. do prefixo de rede"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Configurar conetividade ponto a ponto"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informações do aparelho"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Configuração Wi-Fi protegida"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Remover grupo"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avançado"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Aparelhos disponíveis"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Pesquisar aparelhos"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"A pesquisar..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Mudar o nome do aparelho"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Aparelhos P2P"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Não foi possível ligar."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Falha ao renomear o dispositivo."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Desligar?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Se desligar, a ligação com <xliff:g id="PEER_NAME">%1$s</xliff:g> será terminada."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Se desligar, a ligação com <xliff:g id="PEER_NAME">%1$s</xliff:g> e <xliff:g id="PEER_COUNT">%2$s</xliff:g> outros aparelhos será terminada."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Pretende cancelar o convite para se ligar a <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Configurar hotspot Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurar zona 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="display_settings_title" msgid="1708697328627382561">"Visor"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencioso"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos musicais"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar quando estiver em silêncio"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrar e tocar"</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="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Desativar som de toque e outras notificações"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Desativar som de música e outros elementos multimédia"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Desativar som de notificações"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Desativar som de alarmes"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar ao tocar"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Deve ancorar o tablet antes de configurar o áudio da estação de ancoragem."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Deve ancorar o telemóvel antes de configurar o áudio da estação de ancoragem."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"É necessário ancorar o tablet antes de configurar o áudio da estação de ancoragem."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"É necessário ancorar o telemóvel antes de configurar o áudio da estação de ancoragem."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Som de inserção 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="account_settings" msgid="6403589284618783461">"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="7965901687241669598">"Visualização"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"O meu número de telefone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MINUTOS"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Versão do PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"Versão 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 rede móvel"</string>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Apagar todas as informações pessoais e aplicações transferidas? Não é possível reverter esta 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="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_gesture_explanation" msgid="826193821455182780">"É necessário desenhar a sequência de desbloqueio para confirmar uma reposição de dados de fábrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Não foi efetuada nenhuma reposição porque o serviço System Clear não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Repor?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Apagar armazenamento USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Apagar o cartão SD, eliminando todos os ficheiros armazenados? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenhe o seu padrão de desbloqueio"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Tem de desenhar a sequência de desbloqueio para confirmar que pretende formatar o armazenamento USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"É necessário desenhar a sequência de desbloqueio para confirmar que pretende apagar a memória de armazenamento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"É necessário 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="6688416425801386511">"Ligação USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="location_title" msgid="1029961368397484576">"A minha localização"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Serviço de localiz. do Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Permita que as aplicações utilizem dados de fontes como redes Wi-Fi e de telemóvel para determinar a sua localização aproximada"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Permitir que os dados de localização anónimos sejam enviados para a Google. Permitir também que aplicações autorizadas utilizem dados de fontes como Wi-Fi e redes de telemóvel 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Prima Menu para obter ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Retirar dedo quando concluído."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Ligue pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Padrão gravado!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Sequência gravada."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Desenhe novamente o padrão para confirmar:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"O seu novo padrão de desbloqueio:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmar"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Seguinte"</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="1075370160667458122">"Proteja o tablet contra a utilização não autorizada, criando uma sequência de desbloqueio do ecrã pessoal. Deslize lentamente o dedo para ligar os pontos por qualquer ordem no ecrã seguinte. Tem de ligar, pelo menos, quatro pontos. "\n\n"Pronto para começar? Toque em Seguinte."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteja o tablet contra a utilização não autorizada, criando uma sequência pessoal de desbloqueio do ecrã. Deslize lentamente o dedo para ligar os pontos por qualquer ordem no ecrã seguinte. É necessário ligar, pelo menos, quatro pontos. "\n\n"Pronto para começar? Toque em Seguinte."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteja o telemóvel contra a utilização não autorizada, criando uma sequência de desbloqueio do ecrã pessoal. Deslize lentamente o dedo para ligar, pelo menos, quatro pontos por qualquer ordem no ecrã seguinte. "\n\n"Pronto para começar? Toque em Seguinte."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerir aplicações"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerir e remover aplicações instaladas"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gerir aplicações, configurar atalhos de início rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Definições da aplicação"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Permitir instalação de aplicações que não são do Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Permitir a instalação de aplicações a partir de fontes desconhecidas"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"O tablet e os dados pessoais estão mais vulneráveis ​​a ataques de aplicações de fontes desconhecidas. O utilizador concorda que é o único responsável por qualquer dano causado ao tablet ou perda de dados que possam resultar da utilização destas aplicações."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"O telemóvel e os dados pessoais estão mais vulneráveis ​​a ataques de aplicações de fontes desconhecidas. O utilizador concorda que é o único responsável por qualquer dano causado ao telemóvel ou perda de dados que possam resultar da utilização dessas aplicações."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Definições avançadas"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"Predefinições"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Limpar dados"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Desinstalar actualizações"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Optou por iniciar esta aplicação por predefinição para algumas ações."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Optou por permitir que esta aplicação crie widgets e aceda aos seus dados."</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="1616155457673106022">"Esta aplicação poderá não ser concebida para o seu ecrã. Poderá controlar aqui o modo como se adapta ao ecrã."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamanho"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar serv. em execução"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar proc. em cache"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Repor pref. de aplic."</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Repor pref. de aplic.?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Esta ação irá repor todas as preferências para:"\n\n" "<li>"Aplicações desativadas"</li>\n" "<li>"Notificações de aplicações desativadas"</li>\n" "<li>"Aplicações predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para aplicações"</li>\n\n" Não perderá quaisquer dados de aplicações."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Repor aplicações"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerir espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Escolher opções de filtro"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicação pode aceder aos seguintes itens no seu tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Esta aplicação pode aceder aos seguintes itens no telemóvel:"</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="invalid_size_value" msgid="7563537715280712285">"Não foi possível calcular o tamanho do pacote."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Alterar a localização de instalação preferida para novas aplicações"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desativar aplicação incorporada?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Se desativar uma aplicação incorporada, o funcionamento de outras aplicações poderá ser afetado."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Desativar notificações?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se desativar as notificações para esta aplicação, pode perder alertas e atualizações importantes."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilização do armazenam."</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ver armazenamento utilizado pelas aplicações"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Este método de introdução pode permitir a recolha de todo o texto que digitar, incluindo dados pessoais como, por exemplo, palavras-passe e números de cartões de crédito. Decorre da aplicação <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizar este método de introdução?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Este corretor ortográfico pode permitir a recolha de todo o texto que introduzir, incluindo dados pessoais, como palavras-passe e números de cartões de crédito. Decorre da aplicação <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizar este corretor ortográfico?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Definições"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Falha ao abrir as definições para <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Rato/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de Jogos"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Utilizar vibração"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirecionar vibração para o controlador do jogo, quando ligado."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Escolher esquema de teclado"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configurar os esquemas de teclado"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para alternar, prima Ctrl-Bar. esp."</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predefinição"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Esquemas de teclado"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do utilizador"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicionário pessoal"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicionários pessoais"</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_add_screen_title" msgid="742580720124344291">"Expressão"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Mais opções"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Menos opções"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Palavra:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Atalho:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Idioma:"</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="8165273379942105271">"Não tem palavras no dicionário do utilizador. Para adicionar uma palavra, toque no botão Adicionar (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Todos os idiomas"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Em todos os idiomas"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Mais idiomas..."</string>
     <string name="testing" msgid="6584352735303604146">"Testes"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informações do tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informações do telefone"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID do aparelho de desenvolvimento"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Informações sobre o aparelho não disponíveis"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Manter activo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"O ecrã nunca entrará em suspensão durante o carregamento"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permitir depuração USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"A depuração USB é utilizada apenas para fins de programação. Utilize-a para copiar dados entre o computador e o aparelho, instalar aplicações no aparelho sem notificação e ler dados de registo."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Permitir definições de programação?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Estas definições destinam-se apenas a programação. Podem fazer com que o seu aparelho e as aplicações nele existentes falhem ou funcionem mal."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger memória USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"As aplicações têm de pedir permissão para ler a memória USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Proteger memória USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando o armazenamento USB estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo."\n\n"Algumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger cartão SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"As aplicações têm de pedir permissão para ler o cartão SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteger cartão SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo."\n\n"Algumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Escolher miniaplicação"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Escolher widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir o acesso?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Depois de criar o widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> pode aceder a todos os dados apresentados."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permitir sempre que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> crie widgets e aceda aos seus dados"</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>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Dizer palavras-passe"</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="3264723681038625967">"Instalar scripts Web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Melhorar a acessibilidade à Web"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço instalado"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Necessita de um leitor de ecrã?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"O TalkBack fornece respostas faladas para ajudar os utilizadores invisuais e com deficiência visual. Pretende instalá-lo gratuitamente a partir do Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Instalar scripts Web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Pretende que as aplicações instalem scripts do Google que tornam o respetivo conteúdo Web mais acessível?"</string>
-    <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="1072730037861494125">"Nenhuma descrição fornecida."</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_not_available" msgid="3214000535532434353">"Dados utiliz. bater. não disp."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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 selecionado"</string>
+    <string name="tts_engine_error" msgid="3305141107104670703">"Não é possível executar o motor selecionado"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Escolher outro motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Este motor de síntese de discurso pode permitir a recolha de todo o texto que será falado, incluindo dados pessoais, como palavras-passe e números de cartão de crédito. O serviço é fornecido com o motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permitir a utilização deste motor de síntese de discurso?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminino"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Ative o novo motor antes de 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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Desenhe a sua sequência de desbloqueio"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário desenhar a sequência de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Introduzir palavra-passe do armazenamento de credenciais."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Palavra-passe actual:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Armaz. credenciais apagado."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Não foi possível apagar o armazenamento de credenciais."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está activado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Para poder utilizar o armazenamento de credenciais, tem de definir primeiro um PIN ou palavra-passe do ecrã de bloqueio."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para poder utilizar o armazenamento de credenciais, é necessário definir primeiro um PIN ou palavra-passe do ecrã de bloqueio."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efetuada uma chamada de emergência"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Cópia de segurança e reposição"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauro automático"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar uma aplicação, restaurar definições e dados da cópia de segurança"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Pal.-passe cópia do comp"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"As cópias de segurança completas no ambiente de trabalho não estão atualmente protegidas"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toque 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="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Deixar de fazer cópia de segurança de palavras-passe de Wi-Fi, marcadores, outras definições e dados da aplicação, bem como 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>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Este administrador está ativo e permite que a aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> efetue 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_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="6047518536574673606">"Sistema"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Toque e vibração das chamadas"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"A ligar à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"A sincronização falhou"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sincronização ativa"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Sincronizar"</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="background_data" msgid="5779592891375473817">"Dados em segundo plano"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Última sincronização <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"A sincronizar agora..."</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" "\n"Uma abordagem da 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="6205903695598000286">"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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Esta conta é necessária para algumas aplicações. Apenas é possível removê-la através da reposição do tablet para as predefinições de fábrica (o que eliminará todos os seus dados pessoais) em Definições &gt; Cópia de segurança e reposição."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Esta conta é necessária para algumas aplicações. Apenas é possível removê-la através da reposição do telemóvel para as predefinições de fábrica (o que elimina todos os seus dados pessoais) em Definições &gt; Cópia de segurança e reposição."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronização deste item está atualmente desativada. Para alterar esta definição, ative temporariamente os dados de segundo plano e a sincronização automática."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Definições de 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC de 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduzir palavra-passe para desencriptar armazenamento"</string>
     <string name="try_again" msgid="4272075051293936921">"Tente novamente."</string>
-    <string name="service_busy" msgid="2325014135156127705">"O serviço está ocupado. Tente novamente."</string>
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Depuração"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Selecionar a aplicação a depurar"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nenhuma aplicação a depurar definida"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"A depurar aplicação: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Selecionar aplicação"</string>
+    <string name="no_application" msgid="2813387563129153880">"Nenhuma"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Aguarde pelo depurador"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"A aplicação depurada aguarda a anexação do depurador antes da execução"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Introdução"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Desenho"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorização"</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_screen_updates" msgid="5470814345876056420">"Most. atualiz. superfície"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Destacar todas as superf. janelas quando atualizam"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Most.atualiz. visual. GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Dest. visualiz. em janelas quando desenh. c/ GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Desativ. sobreposições HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizar sempre GPU para a composição do ecrã"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Ativar rastreios"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Selec. rastreios ativados"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Sem rastreios ativados atualmente"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> rastreios ativados atualmente"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Todos os rastreios ativados atualmente"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Mostrar limit. do esquema"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Apresentar limites de clipes, margens, etc."</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="force_hw_ui" msgid="6426383462520888732">"Forçar composição GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Utilizar aceleração de hardware 2D em aplicações"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forçar a utilização de GPU para desenho 2D"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Conversão GPU do perfil"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tempo de conv. em adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Esc. de duração do anim."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Zonas Wi-Fi móveis"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronização automática de dados"</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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Calculado pelo tablet. A utiliz. de dados calculada pela operadora pode diferir."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977"></string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"restrito"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Desativar dados móveis?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Definir limite de dados móveis"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Definir limite de dados 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Telemóvel"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Ver definições da aplicação"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841"></string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Desativar dados de segundo plano apenas na rede de dados móvel. Será usado o Wi-Fi se estiver disponível."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desativar dados em segundo plano em redes móveis. Serão utilizadas redes não móveis, se estiverem disponíveis."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir os dados de segundo plano para esta aplicação, comece por definir um limite de dados móveis."</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="5651588785118290771">"Esta funcionalidade pode levar à paragem de uma aplicação que depende de dados de segundo plano, quando a rede Wi-Fi não estiver disponível."\n\n"É possível encontrar controlos de utilização de dados mais adequados nas definições disponíveis na aplicação."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta funcionalidade pode fazer com que uma aplicação que dependa de dados em segundo plano deixe de funcionar quando estiverem disponíveis apenas redes móveis."\n\n"Poderá encontrar controlos de utilização de dados mais adequados nas definições disponíveis dentro da aplicação."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"A restrição de dados de segundo plano só é possível se tiver definido um limite de dados móveis."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Ativar sinc. auto. de dados?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Qualquer alteração que efetue nas contas a partir da Web será copiada automaticamente para o tablet."\n\n"Algumas contas também podem copiar automaticamente para a Web qualquer alteração que efetue no tablet. Uma Conta Google funciona desta forma."\n\n"Para selecionar os tipos de informações a sincronizar em cada conta, aceda a Definições &gt; Contas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Qualquer alteração que efetue nas contas a partir da Web será copiada automaticamente para o telemóvel."\n\n"Algumas contas também podem copiar automaticamente para a Web qualquer alteração que efetue no telemóvel. Uma Conta Google funciona desta forma."\n\n"Para selecionar os tipos de informações a sincronizar em cada conta, aceda a Definições &gt; Contas."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desativar sinc. auto. de dados?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Esta ação irá conservar a utilização de dados e bateria, mas é necessário sincronizar manualmente cada conta para recolher informações recentes. Não irá receber notificações quando ocorrerem atualizações."</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_warning_editor_title" msgid="3704136912240060339">"Definir aviso de utilização de dados"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir limite de utilização de dados"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar utilização de dados"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"A ligação <xliff:g id="NETWORKS">%1$s</xliff:g> de dados será desativada quando for atingido o limite especificado."\n\n"Uma vez que a utilização dos dados é medida pelo tablet e a sua operadora pode calcular a utilização de forma diferente, considere utilizar um limite de precaução"</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"A ligação <xliff:g id="NETWORKS">%1$s</xliff:g> de dados será desativada quando for atingido o limite especificado."\n\n"Uma vez que a utilização dos dados é medida pelo telemóvel e a sua operadora pode calcular a utilização de forma diferente, considere utilizar um limite de precaução."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"A ligação móvel de dados será desativada quando for atingido o limite especificado."\n\n"Uma vez que a utilização dos dados é medida pelo tablet e o seu operador pode calcular a utilização de forma diferente, considere utilizar um limite de precaução"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"A ligação móvel de dados será desativada quando for atingido o limite especificado."\n\n"Uma vez que a utilização dos dados é medida pelo telemóvel e o seu operador pode calcular a utilização de forma diferente, considere utilizar um limite de precaução."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restringir dados em segundo plano?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Se restringir os dados móveis de segundo plano, algumas aplicações e serviços não funcionarão a não ser que esteja ligado a uma rede Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: cerca de <xliff:g id="TOTAL">%1$s</xliff:g> utilizado(s)"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: cerca de <xliff:g id="TOTAL">%1$s</xliff:g> utilizado(s)."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: cerca de <xliff:g id="TOTAL">%1$s</xliff:g> utilizado(s), conforme medido pelo tablet. O registo da utilização de dados do seu operador poderá ser diferente."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: cerca de <xliff:g id="TOTAL">%1$s</xliff:g> utilizado(s), conforme medido pelo telemóvel. O registo da utilização de dados do seu operador poderá ser diferente."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Zonas Wi-Fi móveis"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecione as redes Wi-Fi que são zonas Wi-Fi móveis. As aplicações podem ser impedidas de utilizar estas redes quando estiverem em segundo plano e podem notificar o utilizador antes de utilizá-las para grandes transferências."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Para selecionar zonas Wi-Fi móveis, ative o Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Editar perfil VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Ligar a <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Adicionar perfil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Editar perfil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Eliminar perfil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Não existe ligação à rede. Tente novamente mais tarde."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Falta um certificado. Editar o perfil."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"Após ativar a opção Explorar por Toque, poderá tocar no ecrã para saber o que está sob o dedo. Por exemplo, o ecrã atual contém ícones de aplicações. Toque no ecrã e deslize lentamente o dedo para localizar 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="3973201880357468747">"Para ativar algo em que está a tocar, toque nisso. Deslize lentamente o dedo até localizar o ícone de <xliff:g id="APP_NAME">%s</xliff:g>. Em seguida, toque 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="8764686624055084454">"Para percorrer uma lista, pode deslizar lentamente 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 lentamente um dedo."</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="3055831259260848004">"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="spellcheckers_settings_title" msgid="399981228588011501">"Verificador ortográfico"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Introduza a palavra-passe de cópia de segurança completa atual aqui"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introduzir nova palavra-passe para cópias de segurança completas aqui"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Reintroduza a nova palavra-passe da cópia de segurança completa aqui"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Atualizações adicionais do sistema"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Utilizadores e restrições"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Utilizadores"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar utilizador"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Editar detalhes"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Informações do utilizador"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nome"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restrições de conteúdo"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Solicitar PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Classificação de conteúdo"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicações do sistema"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicações instaladas"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Rejeitar"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Remover utilizador"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Criança traquina"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Remover utilizador?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Tem a certeza de que pretende remover o utilizador e todos os dados associados do dispositivo?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
+    <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 5633e42..0a137c4 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Desconectando…"</item>
     <item msgid="1634960474403853625">"Desconectado"</item>
     <item msgid="746097431216080650">"Falha"</item>
+    <item msgid="6367044185730295334">"Bloqueado"</item>
+    <item msgid="503942654197908005">"Temporariamente evitando uma conexão ruim"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Desconectando da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Desconectado"</item>
     <item msgid="8578370891960825148">"Falha"</item>
+    <item msgid="5660739516542454527">"Bloqueado"</item>
+    <item msgid="1805837518286731242">"Temporariamente evitando uma conexão ruim"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pressione o botão"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nenhum"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN do ponto de acesso"</item>
-    <item msgid="7364462169350112617">"PIN deste dispositivo"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Estático"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Cartão SD removível"</item>
     <item msgid="4498124044785815005">"Deixar o sistema decidir"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Desativado"</item>
-    <item msgid="4804571292609523335">"Vibrar"</item>
-    <item msgid="595707141547423573">"Desativar som"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
     <item msgid="2560532955514699713">"Médio"</item>
@@ -249,6 +244,15 @@
     <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="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animação desativada"</item>
+    <item msgid="1138649021950863198">"Escala de animação 5x"</item>
+    <item msgid="4394388961370833040">"Escala de animação 1x"</item>
+    <item msgid="8125427921655194973">"Escala de animação 1.5 x"</item>
+    <item msgid="3334024790739189573">"Escala de animação 2x"</item>
+    <item msgid="3170120558236848008">"Escala de animação 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a898aee..71f7faa 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Sim"</string>
     <string name="no" msgid="6731231425810196216">"Não"</string>
+    <string name="create" msgid="3578857613172647409">"Criar"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir o uso do discador Bluetooth quando a tela estiver bloqueada."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nome do dispositivo"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Configurações do dispositivo"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Configurações do perfil"</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_rename_device" product="tablet" msgid="787970073150631155">"Renomear tablet"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Pareando…"</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="5655704645616731277">"Toque para parear"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nenhum dispositivo Bluetooth encontrado."</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="1931617700075106801">"Toque para parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toque para parear com <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="device_picker" msgid="8398232791303186677">"Seletor 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="5279027758886569301">"Um aplicativo quer ativar o Bluetooth. Permitir?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Um aplicativo em seu tablet quer torná-lo detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
@@ -148,14 +150,14 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Um aplicativo em seu telefone quer ativar o Bluetooth e tornar seu telefone detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Um aplicativo no seu tablet quer ativar o Bluetooth e tornar seu tablet detectável por outros dispositivos. Permitir?"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Um aplicativo em seu telefone quer ativar o Bluetooth e tornar o telefone detectável por outros dispositivos. Permitir?"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ativar Bluetooth?"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ativando Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desligar o Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"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="3687933246423942977">"Toque para conectar-se a \"<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_acceptance_dialog_text" msgid="6555508756987053866">"%1$s deseja acessar seus contatos e o 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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"O nome de host digitado não é válido."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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_port" msgid="5539106187558215246">"É necessário preencher o campo da 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="2671425042711054494">"A porta digitada não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outros aplicativos."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Definir"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Falha"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Êxito"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"As alterações são aplicadas quando o cabo USB é reconectado."</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"As alterações são aplicadas quando o cabo USB é reconectado."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Ativar o armazenamento USB em massa"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total de bytes:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Armazenam. USB não conectado"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nenhum cartão SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Armazenam. USB não conectado."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Sem cartão SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponíveis:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Arm. USB usado p/ arm. massa"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"O cartão SD está sendo usado como um dispositivo de armazenamento em massa."</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Armazen. USB pode ser removido"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"O cartão SD já pode ser removido com segurança."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Armaz. USB usado como armaz. em massa."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"O cartão SD está sendo usado como dispositivo de armazenamento em massa."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Armazen. USB pode ser removido"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"O cartão SD já pode ser removido com segurança."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Armaz. USB removido em uso!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"O cartão SD foi removido enquanto ainda estava em uso!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes usados:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Procurando mídia armaz. USB..."</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Armaz. USB somente leitura."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Cartão SD conectado 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="5349877711342869319">"Idioma"</string>
@@ -255,7 +257,7 @@
     <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_label_launcher" msgid="8344735489639482340">"Config."</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="radio_controls_title" msgid="6889937359495515769">"Mais..."</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Conectar aos serviços de dados quando estiver em roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Você perdeu a conectividade de dados porque deixou o roaming de dados da sua rede doméstica desativado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ativar"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Permitir roaming de dados? Isso pode causar cobranças significativas de roaming!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Atenção"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Quando você permite o roaming de dados, poderão ser cobradas taxas significativas de roaming!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Permitir roaming de dados?"</string>
     <string name="networks" msgid="6333316876545927039">"Seleção de operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Selecione um operador de rede"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data e hora"</string>
@@ -280,15 +282,17 @@
     <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_time" msgid="5716856602742530696">"Definir hora"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecionar fuso horário"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Formato de data"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Escolher 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="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Melhorar a correspondência de rosto"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Verificação de presença viva"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Exigir piscada de olhos"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"É possível criptografar contas, configurações, aplicativos baixados e seus dados, arquivos de mídia e outros arquivos. Depois que criptografar seu tablet, insira uma senha ou PIN numérico para descriptografar o dispositivo sempre que ligá-lo. Não é possível desfazer a criptografia do tablet, a menos que a configuração original de fábrica seja redefinida, o que apaga todos os seus dados."\n\n"A criptografia leva no mínimo uma hora. Você deve iniciar usando uma bateria carregada e manter o tablet conectado à tomada até que o processo seja concluído. Se houver interrupção, seus dados poderão ser perdidos parcial ou completamente."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"É possível criptografar contas, configurações, aplicativos transferidos e seus dados, arquivos de mídia e outros arquivos. Depois que criptografar seu telefone, insira uma senha ou PIN numérico para descriptografar o telefone sempre que ligá-lo. Não é possível desfazer a criptografia do telefone, a menos que a configuração original de fábrica seja redefinida, o que apaga todos os seus dados."\n\n"A criptografia leva no mínimo uma hora. Você deve iniciar usando uma bateria carregada e manter o telefone conectado à tomada até que o processo seja concluído. Se houver interrupção, seus dados poderão ser perdidos parcialmente ou completamente."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu tablet, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu tablet, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados."\n\n"A criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu telefone, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu telefone, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados."\n\n"A criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu telefone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</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="2029407131227814893">"Carregue sua bateria e tente novamente."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conecte 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_dialog_need_password_message" msgid="4071395977297369642">"É necessário definir um PIN ou uma senha para a tela de bloqueio antes de iniciar a criptografia."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Criptografar?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"A operação de criptografia é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva cerca de uma hora ou mais, e nesse período o tablet será reiniciado várias vezes."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"A operação de criptografia é irreversível e, se for interrompida, você perderá seus dados. A criptografia leva uma hora ou mais, e 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="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"Digite sua senha"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Falha na criptografia"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu tablet não podem ser acessados. "\n\n" Para continuar usando seu tablet, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar quaisquer dados que foram salvos em backup em sua Conta do Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu telefone não podem mais ser acessados. "\n\n"Para continuar usando seu telefone, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar quaisquer dados que foram salvos em backup em sua Conta do Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Selecionar bloqueio de tela"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu tablet não podem ser acessados. "\n\n" Para continuar usando seu tablet, é necessário restaurar as configurações originais. Quando você configurar seu tablet após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu telefone não podem mais ser acessados. "\n\n"Para continuar usando seu telefone, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Alterar o método de entrada"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Selec. o bloq. de backup"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Desbloqueio facial"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Padrão"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN deve ter no mínimo %d caracteres."</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A senha deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"O PIN deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> dígitos."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"O PIN deve conter apenas dígitos de 0 a 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"O administrador do dispositivo não permite usar um PIN recente."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"A senha contém um caractere incorreto."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"A senha deve conter no mínimo uma letra."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"A senha deve conter no mínimo um dígito."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"A senha deve conter 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>
+    <item quantity="one" msgid="3063853802158131458">"A senha deve conter pelo menos uma letra."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"A senha deve conter pelo menos uma letra minúscula."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"A senha deve conter pelo menos uma letra maiúscula."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"A senha deve conter pelo menos um dígito numérico."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"A senha deve conter pelo menos um símbolo especial."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"A senha deve conter pelo menos um caractere que não seja letra."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"O administrador do dispositivo não permite usar 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="lock_setup" msgid="1759001157415978959">"Configuração concluída"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"A configuração foi concluída."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administração 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>
@@ -413,19 +418,19 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Para parear com:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>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_enter_pin_other_device" msgid="4637977124526813470">"Talvez seja necessário digitar este PIN no outro dispositivo."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Para parear com:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Digite no dispositivo:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>. Em seguida, pressione Voltar ou Entrar."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Emparelhar"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parear"</string>
     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Não foi possível parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Não foi possível parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> por causa de um PIN ou senha incorretos."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Não é possível se comunicar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Não foi possível conectar ao <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Permitir troca de dados quando o telefone tocar em  outro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir troca de dados quando o tablet tocar em outro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir troca de dados quando o telefone tocar em  outro dispositivo"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Pronto para transmitir conteúdo de aplicativos via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desativado"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque o NFC está desativado"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Quando este recurso está ativado, você pode arrastar o conteúdo do aplicativo para outro dispositivo compatível com NFC, mantendo os dispositivos próximos. Por exemplo, você pode arrastar páginas do navegador, vídeos do YouTube, contatos de pessoas e muito mais."\n\n"Basta posicionar os dispositivos próximos (normalmente de costas um para o outro) e tocar em sua tela. O aplicativo determina o que é arrastado."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detecção de serviço de rede"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir que aplicativos em outros dispositivos descubram aplicativos neste dispositivo"</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="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_setup_wizard_title" msgid="70277346338812325">"Selecionar Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Não é possível verificar a existência de redes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificação de rede"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Receber notificação quando uma rede aberta estiver disponível"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Evitar conexões de baixa qualidade"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Não usar uma rede Wi-Fi, a menos que tenha uma boa conexão com a Internet"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexões de baixa qualidade"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"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="9107237003911220057">"Manter Wi-Fi durante inatividade"</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_wps_pbc" msgid="2668564692207863017">"Botão de pressão WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entrada de PIN WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Procurando redes Wi-Fi..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuração automática (WPS)"</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="8242979682530043184">"Digitar o PIN do ponto de acesso"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Configuração do WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"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_wps_setup_title" msgid="6034518116333042484">"Config. protegida do Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pressione o botão \"Wi-Fi Protected Setup\" do roteador. Ele também pode ser chamado de \"WPS\" ou conter este símbolo:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Insira o pin <xliff:g id="NUMBER">%1$s</xliff:g> em seu roteador Wi-Fi. A configuração pode levar até dois minutos para ser concluída."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS realizada. Conectando-se à rede…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Conectado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"A WPS já está em andamento e pode levar até dois minutos para ser concluída"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Falha na WPS. Tente novamente em alguns minutos."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A configuração de segurança do roteador sem fio (WEP) não é suportada"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A configuração de segurança do roteador sem fio (TKIP) não é suportada"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Outra sessão WPS foi detectada. Tente novamente em alguns minutos."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Salva"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Conexão com a Internet de baixa qualidade evitada"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"A rede foi evitada devido à má conexão. Desative esse comportamento a partir da tela Configurações &gt; Wi-Fi, Item de menu avançado."</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_wps_available_first_item" msgid="3538912605343585226">"Rede protegida disponível"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (rede protegida disponível)"</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_failed_connect_message" msgid="8491902558970292871">"Falha ao conectar à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Falha ao esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvar"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Falha ao salvar a rede"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Outra sessão Wi-Fi protegida foi detectada. Tente novamente em breve."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tamanho do pref. de rede"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Configurar conectividade ponto a ponto"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informações do dispositivo"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Configuração protegida do Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Remover grupo"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avançado"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Dispositivos disponíveis"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Pesquisar dispositivos"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Pesquisando…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Renomear dispositivo"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Dispositivos pareados"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Não foi possível conectar."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Falha ao renomear dispositivo."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Desconectar?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Se você desconectar, sua conexão com <xliff:g id="PEER_NAME">%1$s</xliff:g> será encerrada."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Se você se desconectar, sua conexão com <xliff:g id="PEER_NAME">%1$s</xliff:g> e <xliff:g id="PEER_COUNT">%2$s</xliff:g> outros dispositivos serão encerrados."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Deseja cancelar o convite para se conectar com <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"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_configure_ap_text" msgid="3474995108398156258">"Config. ponto de acesso Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Config. 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="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencioso"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos sonoros"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar no modo silencioso"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrar e tocar"</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="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Desativar toque e notificações"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Desativar música e outras mídias"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Desativar notificações"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Desativar alarmes"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar ao tocar"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Você deve encaixar o tablet antes de configurar o áudio do dock."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Você deve encaixar o telefone antes de configurar o áudio do dock."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"É necessário que você encaixe seu tablet antes de configurar o áudio do dock."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"É necessário que você encaixe o telefone antes de configurar o áudio do dock."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Som de inserção no 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="account_settings" msgid="6403589284618783461">"Contas"</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="7965901687241669598">"Tela"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Meu número de telefone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Versão PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Apagar todas as suas informações pessoais e os aplicativos transferidos? Não é possível reverter esta 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="2234954758550554549">"Você precisa desenhar seu padrão de desbloqueio para confirmar uma redefinição da configuração original."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"É necessário que você desenhe seu padrão de desbloqueio para confirmar uma redefinição para configuração original."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"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="7572642091599403668">"Redefinir?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Apagar armazenamento USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Apagar o cartão SD, excluindo todos os arquivos armazenados nele? Não é possível reverter esta ação!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Apagar tudo"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenhe o seu padrão de desbloqueio"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Você deve desenhar sua sequência de desbloqueio para confirmar que deseja apagar o armazenamento USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"É necessário que você desenhe seu padrão de desbloqueio para confirmar que deseja apagar o armazenamento USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"É necessário que você desenhe seu padrão 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="6688416425801386511">"Tethering USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="location_title" msgid="1029961368397484576">"Meu Local"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Serv. de loc. do Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Permite que os aplicativos usem dados de fontes como redes Wi-Fi e móveis para determinar sua localização aproximada"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Permitir o envio de dados de localização anônimos ao Google e que aplicativos autorizados usem dados de fontes (como 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pressione Menu para obter ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Solte o dedo quando terminar."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conectar no mínimo <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Padrão registrado."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Padrão registrado."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Desenhe o padrão novamente para confirmar:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Seu novo padrão de desbloqueio:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmar"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Avançar"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Como proteger seu tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Proteção do seu telefone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Proteja seu tablet contra uso não autorizado criando uma sequência de desbloqueio de tela pessoal. Deslize o dedo 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="tablet" msgid="8616353869251700776">"Proteja seu tablet contra uso não autorizado criando um padrão de desbloqueio de tela pessoal. Deslize o dedo para ligar os pontos em qualquer ordem na próxima tela. Será necessário que você conecte pelo menos quatro pontos. "\n\n"Pronto para começar? Toque em Próximo."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteja seu telefone contra uso não autorizado criando uma sequência de desbloqueio de tela pessoal. Deslize o dedo para ligar 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="7041951105633616745">"Gerenciar aplicativos"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerenciar e remover aplicativos instalados"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gerenciar aplicativos, configurar atalhos de inicialização rápida"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Configurações do aplicativo"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fontes desconhecidas"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Permite a instalação de aplicativos que não são do Android Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Permitir a instalação de aplicativos de fontes desconhecidas"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Seu tablet e seus dados pessoais são mais vulneráveis ​​a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano a seu tablet ou perda de dados decorrentes do uso desses aplicativos."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Seu telefone e seus dados pessoais são mais vulneráveis ​​a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano ao seu telefone ou perda de dados decorrentes do uso desses aplicativos."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"Padrões"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Limpar dados"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Desinstalar atualizações"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Você decidiu lançar este aplicativo por padrão para algumas ações."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Você optou por permitir que este aplicativo crie widgets e acesse os dados."</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="1616155457673106022">"Talvez este aplicativo não seja desenvolvido para sua tela. É possível controlar o ajuste da tela aqui."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Classificar por tamanho"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar serviços em exec."</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar processo em cache"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir preferências"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir preferências?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Isso redefinirá todas as preferências para:"\n\n" "<li>"aplicativos desativados"</li>\n" "<li>"notificações de aplicativos desativados"</li>\n" "<li>"aplicativos padrão para ações"</li>\n" "<li>"restrições de dados em segundo plano para aplicativos"</li>\n\n" Os dados dos aplicativos não serão perdidos."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir aplicativos"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Selecione as opções de filtro"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Este aplicativo pode acessar os seguintes itens em seu tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Este aplicativo pode acessar os seguintes itens em 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="invalid_size_value" msgid="7563537715280712285">"Não foi possível calcular o tamanho do pacote."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Alterar o local de instalação preferido para novos aplicativos"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desativar aplicat. integrado?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Se você desativar um aplicativo integrado, outros aplicativos podem apresentar mau funcionamento."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Desativar notificações?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se você desativar as notificações para este aplicativo, poderá perder alertas e atualizações importantes."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso do armazenamento"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Visualizar armazenamento usado pelos aplicativos"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Este método de entrada pode coletar todo o texto que você digita, incluindo dados pessoais, como senhas e números de cartão de crédito. É um método do aplicativo <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Usar este método de entrada?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Este corretor ortográfico pode coletar todo o texto que você digita, incluindo dados pessoais, como senhas e números de cartão de crédito. É um corretor do aplicativo <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizar este corretor ortográfico?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configurações"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Falha ao abrir as configurações de <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de jogos"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibração"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirecionar vibração para o controlador de jogos quando estiver conectado."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Escolha o layout do teclado"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configurar os layouts do teclado"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para alterar, pressione Ctrl+espaço"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Padrão"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Layouts de teclado"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do usuário"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicionário pessoal"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicionários pessoais"</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_add_screen_title" msgid="742580720124344291">"Frase"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Mais opções"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Menos opções"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Palavra:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Atalho:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Idioma:"</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="8165273379942105271">"Você não possui palavras no dicionário do usuário. Adicione uma palavra tocando no botão Adicionar (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Todos os idiomas"</string>
+    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"Você não possui palavras no dicionário do usuário. Adicione uma palavra tocando no botão \"Adicionar\" ou no símbolo \"+\"."</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Para todos os idiomas"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Mais idiomas..."</string>
     <string name="testing" msgid="6584352735303604146">"Testando"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informações do tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informações do telefone"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID do dispositivo de desenvolvimento"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Informações não disponíveis sobre o dispositivo"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer ativo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permitir a depuração USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"A depuração USB serve apenas para fins de desenvolvimento. Use-a para copiar dados entre o computador e o dispositivo, instalar aplicativos no seu aparelho sem notificação e ler dados de registro."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Ativar as configurações de desenvolvimento?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Essas configurações são destinadas apenas para o uso de desenvolvedores. Elas podem causar a desativação ou mau funcionamento do dispositivo e dos aplicativos contidos nele."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger o armazenamento USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplicativos precisam de permissão para ler o armazenamento USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Proteger o armazenamento USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando o armazenamento USB está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo."\n\n"Alguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger o cartão SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplicativos precisam de permissão para ler o cartão SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteger o cartão SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo."\n\n"Alguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Escolher o gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Escolher widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir acesso?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Após a criação do widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> poderá acessar todos os dados exibidos."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Sempre permitir que <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> crie widgets e acesse os dados"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Botão de ligar encerra a chamada"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Falar senhas"</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="3264723681038625967">"Instalar scripts da web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Melhorar a acessibilidade na web"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço foi instalado"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Precisa de um leitor de tela?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"O TalkBack fornece feedback por voz para ajudar usuários cegos ou com visão reduzida. Deseja instalá-lo gratuitamente do Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Instalar scripts da web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Deseja que seus aplicativos instalem scripts do Google para que seu conteúdo da web seja mais acessível?"</string>
-    <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="1072730037861494125">"Nenhuma descrição foi fornecida."</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_not_available" msgid="3214000535532434353">"Dados de uso da bat. indisp."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"O mecanismo escolhido não pode ser executado."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Selecione outro mecanismo"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Este mecanismo de síntese de fala pode coletar todo texto que será falado, inclusive dados pessoais como senhas e números de cartão de crédito. Ele é proveniente do mecanismo <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Deseja ativar o uso desse mecanismo de síntese de fala?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminino"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Ativar novo mecanismo antes de usar."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Desenhe seu padrão de desbloqueio"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário que você desenhe seu padrão de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digite a senha para o armazenamento de credenciais."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Senha atual:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"O armazenamento de credenciais foi apagado."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Armaz. de creden. não apagado."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais foi ativado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Você deve configurar um PIN ou senha da tela de bloqueio antes de usar o armazenamento de credenciais."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"É necessário configurar PIN ou senha para a tela de bloqueio antes de usar o armazenamento de credenciais."</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="5446972770562918934">"Fazer backup e redefinir"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauração automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar um aplicativo, restaura as configurações de backup e dados"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Senha do backup local"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Os backups completos do computador não estão protegidos no momento."</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="local_backup_password_summary_none" msgid="393503434408227110">"Os backups completos do computador não estão protegidos no momento"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toque para alterar ou remover a senha de backups completos do desktop"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Interromper o backup de suas senhas Wi-Fi, favoritos, outras configurações e dados de aplicativos e apagar todas as cópias nos servidores do Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configurações de administração do dispositivo"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Sistema"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Toque e vibração de chamadas"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Conectando-se à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Falha na sincronização"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sincronização ativa"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"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="background_data" msgid="5779592891375473817">"Dados de segundo plano"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Última sincronização em <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Sincronizando agora..."</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" "\n"Um método do Google para sincronizar dados a fim de permitir acesso aos seus contatos, compromissos e muito mais, onde quer que você esteja."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Esta conta é necessária para alguns aplicativos. Só é possível removê-la redefinindo o tablet para os padrões de fábrica (ação que exclui todos os seus dados pessoais) em Configurações &gt; Fazer backup e redefinir."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Esta conta é necessária para alguns aplicativos. Só é possível removê-la redefinindo o telefone para os padrões de fábrica (ação que exclui todos os seus dados pessoais) em Configurações &gt; Fazer backup e redefinir."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronização para o item está desativada no momento. Para alterar essa configuração, ative os dados de segundo plano e a sincronização automática temporariamente."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Configurações de 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Digite a senha para descriptografar o armazenamento"</string>
     <string name="try_again" msgid="4272075051293936921">"Tente novamente."</string>
-    <string name="service_busy" msgid="2325014135156127705">"O serviço está ocupado. Tente novamente."</string>
     <string name="delete" msgid="4219243412325163003">"Excluir"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</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="debug_debugging_category" msgid="6781250159513471316">"Depuração"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Selecionar aplicativo de depuração"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nenhum conjunto de aplicativos de depuração"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplicativo de depuração: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Selecionar aplicativo"</string>
+    <string name="no_application" msgid="2813387563129153880">"Nada"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Aguardar depurador"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplic. que sofreu dep. aguarda que depur. seja anex. antes da exec."</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Entrada"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Desenho"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitoramento"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Modo rigoroso ativado"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Piscar tela se aplic. demorarem na sequência princ."</string>
     <string name="pointer_location" msgid="6084434787496938001">"Localização do ponteiro"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Exibir dados de toque"</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_screen_updates" msgid="5470814345876056420">"Mostrar atualiz. de sup."</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Piscar superfícies de toda a janela ao atualizar"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Mostrar atualiz. da GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Piscar visualizações em janelas ao desenhar c/GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Desativar sobreposição HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Sempre usar a GPU para composição de tela"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Ativar traços"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Selecionar traços ativados"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Nenhum traço ativado"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traços ativados"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Todos os traços ativados"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Mostrar limites de layout"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar limites de corte, margens, etc."</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="force_hw_ui" msgid="6426383462520888732">"Forçar renderização GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Usar aceleração de hardware 2D nos aplicativos"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forçar uso da GPU para desenho em 2D"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Classific. render. GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tempo render. em adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala de anim. da janela"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala anim. de transição"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala de duração do Animator"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Pontos de acesso móveis"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizar dados automaticamente"</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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Calcul. pelo tablet. O cálculo da operadora sobre uso de dados pode ser diferente."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Calculado pelo telefone. O cálculo da operadora pode ser diferente."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"restrito"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Desativar dados móveis?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Definir limite de dados móveis"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Definir limite de dados 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Celular"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Nenhum"</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="8430240158135453271">"Ver configurações do aplicativo"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringir dados de 2º plano"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Desat. dados de seg. plano na rede móvel. Usar Wi-Fi se disp."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desat. dados de seg. plano em redes móveis. Usar outras redes se disp."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Definir um limite de dados para restringir dados em 2o plano"</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="5651588785118290771">"Este recurso pode fazer com que um aplicativo que depende de dados de segundo plano pare de funcionar quando o Wi-Fi não estiver disponível."\n\n"Mais controles adequados de uso de dados podem ser encontrados nas configurações disponíveis no aplicativo."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Este recurso pode fazer com que um aplicativo que depende de dados de segundo plano pare de funcionar quando somente redes de acesso limitado estiverem disponíveis."\n\n"Você pode encontrar controles de uso de dados mais apropriados nas configurações disponíveis no aplicativo."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Restringir dados de segundo plano só é possível quando você define um limite de dados móveis."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Ativar sincronização automática?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"As alterações feitas em suas contas na web serão automaticamente copiadas para o tablet."\n\n"Algumas contas, como Contas do Google, também poderão copiar automaticamente as alterações feitas no tablet para a web."\n" "\n"Para determinar as informações a sincronizar em cada conta, acesse Configurações &gt; Contas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"As alterações feitas em suas contas na web serão automaticamente copiadas para o telefone."\n\n"Algumas contas, como Contas do Google, também poderão copiar automaticamente as alterações feitas no telefone para a web."\n" "\n"Para determinar as informações a sincronizar em cada conta, acesse Configurações &gt; Contas."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desativar sincroniz. automática?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</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_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir limite do uso de dados"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitando uso de dados"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Sua conexão de dados <xliff:g id="NETWORKS">%1$s</xliff:g> será desativada quando o limite especificado for atingido."\n\n"Como o uso de dados é calculado por seu tablet, e sua operadora pode explicar o uso de forma diferente, cogite usar um limite moderado."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Sua conexão de dados <xliff:g id="NETWORKS">%1$s</xliff:g> será desativada quando o limite especificado for atingido."\n\n"Como o uso de dados é calculado por seu telefone, e sua operadora pode explicar o uso de forma diferente, cogite usar um limite moderado."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sua conexão de dados móveis será desativada quando o limite especificado for atingido."\n\n"Como o uso de dados é calculado por seu tablet, e sua operadora pode entender o uso de forma diferente, use um limite moderado."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sua conexão de dados móveis será desativada quando o limite especificado for atingido."\n\n"Como o uso de dados é calculado por seu telefone, e sua operadora pode entender o uso de forma diferente, use um limite moderado."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restringir dados de segundo plano?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Se você restringir os dados móveis de segundo plano, alguns aplicativos e serviços não funcionarão, a menos que você esteja conectado a uma rede Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: por volta de <xliff:g id="TOTAL">%1$s</xliff:g> utilizado"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: aproximadamente <xliff:g id="TOTAL">%1$s</xliff:g> utilizados."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> usados (cálculo do tablet). Cálculo da operadora poderá ser diferente."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> usados (cálculo do tel). Cálculo da operadora poderá ser diferente."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Pontos de acesso de dispositivos móveis"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecione as redes Wi-Fi que são pontos de acesso móveis. Aplicativos em segundo plano podem ser impedidos de usar essas redes. Os aplicativos também podem avisar antes de usar essas redes para grandes downloads."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Para selecionar pontos de acesso para dispositivos móveis, ligue o Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Editar perfil de VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar-se a <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Adicionar perfil de VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Editar perfil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Excluir perfil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Nenhuma conexão de rede. Tente novamente mais tarde."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Falta um certificado. Edite o perfil."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"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="3973201880357468747">"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 par 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="8764686624055084454">"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="3055831259260848004">"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="spellcheckers_settings_title" msgid="399981228588011501">"Corretor ortográfico"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Digite sua senha de backup completo atual aqui"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Digite uma nova senha para backups completos aqui"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Digite mais uma vez a nova senha de backup completo aqui"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Atualizações adicionais do sistema"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Usuários e restrições"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Usuários"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar usuário"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Editar detalhes"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Informações do usuário"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nome"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restrições de conteúdo"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Solicitar PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Classificação do conteúdo"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicativos do sistema"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicativos instalados"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Descartar"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Remover usuário"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Criança travessa"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Remover usuário?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Tem certeza que deseja remover o usuário e todos os dados associados do dispositivo?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
+    <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
 </resources>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 2e9a7ee..2aec04b 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -71,30 +71,10 @@
     <item msgid="4907380534957572531">"Aut"</item>
     <item msgid="4699640516390840297">"Fitg aut"</item>
   </string-array>
-  <string-array name="wifi_status">
-    <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"Tschertgar…"</item>
-    <item msgid="8513729475867537913">"Connectar…"</item>
-    <item msgid="515055375277271756">"Autentificaziun…"</item>
-    <item msgid="1943354004029184381">"Retschaiver l\'adressa IP…"</item>
-    <item msgid="4221763391123233270">"Connectà"</item>
-    <item msgid="624838831631122137">"Fermà"</item>
-    <item msgid="7979680559596111948">"Deconnectar…"</item>
-    <item msgid="1634960474403853625">"Deconnectà"</item>
-    <item msgid="746097431216080650">"Betg reussì"</item>
-  </string-array>
-  <string-array name="wifi_status_with_ssid">
-    <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"Retschertgar…"</item>
-    <item msgid="355508996603873860">"Connectar cun <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
-    <item msgid="554971459996405634">"Autentificaziun cun <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
-    <item msgid="7928343808033020343">"Obtegnair l\'adressa IP da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
-    <item msgid="8937994881315223448">"Connectà cun <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
-    <item msgid="1330262655415760617">"Fermà"</item>
-    <item msgid="7698638434317271902">"Deconnectar da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
-    <item msgid="197508606402264311">"Deconnectà"</item>
-    <item msgid="8578370891960825148">"Senza success"</item>
-  </string-array>
+    <!-- no translation found for wifi_status:10 (6367044185730295334) -->
+    <!-- no translation found for wifi_status:11 (503942654197908005) -->
+    <!-- no translation found for wifi_status_with_ssid:10 (5660739516542454527) -->
+    <!-- no translation found for wifi_status_with_ssid:11 (1805837518286731242) -->
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
     <!-- no translation found for wifi_security:2 (1532568756571457140) -->
@@ -102,11 +82,7 @@
     <!-- 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_eap_method:3 (435667726254379514) -->
     <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
     <!-- no translation found for wifi_p2p_wps_setup:1 (1624323946324499595) -->
     <!-- no translation found for wifi_p2p_wps_setup:2 (5366790421523328066) -->
@@ -137,11 +113,7 @@
     <!-- no translation found for usage_stats_display_order_types:0 (2100172576767439288) -->
     <!-- no translation found for usage_stats_display_order_types:1 (3703676222230317933) -->
     <!-- no translation found for usage_stats_display_order_types:2 (2502754479975776899) -->
-  <string-array name="wifi_eap_entries">
-    <item msgid="8615575908717909498">"PEAP"</item>
-    <item msgid="8667872640594311615">"TLS"</item>
-    <item msgid="7182812872984827322">"TTLS"</item>
-  </string-array>
+    <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nagina"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -149,10 +121,6 @@
     <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 (7468724146672456026) -->
-    <!-- no translation found for wifi_network_setup:3 (7364462169350112617) -->
     <!-- 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) -->
@@ -179,9 +147,6 @@
     <item msgid="3738430123799803530">"Carta SD che po vegnir barattada"</item>
     <item msgid="4498124044785815005">"Laschar decider il sistem"</item>
   </string-array>
-    <!-- no translation found for silent_mode_entries:0 (783505504936446770) -->
-    <!-- no translation found for silent_mode_entries:1 (4804571292609523335) -->
-    <!-- no translation found for silent_mode_entries:2 (595707141547423573) -->
     <!-- 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) -->
@@ -205,6 +170,13 @@
     <!-- 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 animator_duration_scale_entries:0 (6039901060648228241) -->
+    <!-- no translation found for animator_duration_scale_entries:1 (1138649021950863198) -->
+    <!-- no translation found for animator_duration_scale_entries:2 (4394388961370833040) -->
+    <!-- no translation found for animator_duration_scale_entries:3 (8125427921655194973) -->
+    <!-- no translation found for animator_duration_scale_entries:4 (3334024790739189573) -->
+    <!-- no translation found for animator_duration_scale_entries:5 (3170120558236848008) -->
+    <!-- no translation found for animator_duration_scale_entries:6 (1069584980746680398) -->
     <!-- 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) -->
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index fe57b04..2329e7a 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Gea"</string>
     <string name="no" msgid="6731231425810196216">"Na"</string>
+    <!-- no translation found for create (3578857613172647409) -->
+    <skip />
     <string name="device_info_default" msgid="7847265875578739287">"Nunenconuschent"</string>
     <!-- no translation found for header_category_wireless_networks (4944823405420438623) -->
     <skip />
@@ -132,6 +134,10 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir l\'utilisaziun dal dialer bluetooth sch\'il visur è bloccà"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Apparats Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Num da l\'apparat"</string>
+    <!-- no translation found for bluetooth_device_details (4594773497930028085) -->
+    <skip />
+    <!-- no translation found for bluetooth_profile_details (6823621790324933337) -->
+    <skip />
     <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>
     <!-- no translation found for bluetooth_rename_device (787970073150631155) -->
@@ -164,17 +170,16 @@
     <skip />
     <!-- no translation found for progress_scanning (192587958424295789) -->
     <skip />
-    <!-- no translation found for progress_tap_to_pair (5655704645616731277) -->
-    <skip />
     <!-- no translation found for bluetooth_no_devices_found (1085232930277181436) -->
     <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Dumonda d\'associaziun bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Dumonda d\'associaziun"</string>
-    <!-- no translation found for bluetooth_notif_message (1931617700075106801) -->
+    <!-- no translation found for bluetooth_notif_message (5300852675110479862) -->
     <skip />
     <!-- no translation found for bluetooth_show_received_files (5164787486105868895) -->
     <skip />
-    <string name="device_picker" msgid="8721012448931226323">"Tscherna dad apparats bluetooth"</string>
+    <!-- no translation found for device_picker (8398232791303186677) -->
+    <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Dumonda d\'autorisaziun Bluetooth"</string>
     <!-- no translation found for bluetooth_ask_enablement (5279027758886569301) -->
     <skip />
@@ -208,7 +213,7 @@
     <skip />
     <!-- no translation found for bluetooth_phonebook_request (457033227379858269) -->
     <skip />
-    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (5203107624986011263) -->
+    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (6555508756987053866) -->
     <skip />
     <!-- no translation found for bluetooth_pb_remember_choice (2901499974259177202) -->
     <skip />
@@ -249,7 +254,8 @@
     <skip />
     <!-- no translation found for proxy_error_invalid_exclusion_list (6467799485443290961) -->
     <skip />
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Vus stuais endatar ina valur en il champ Port."</string>
+    <!-- no translation found for proxy_error_empty_port (5539106187558215246) -->
+    <skip />
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Il champ «Port» sto esser vid, sch\'il champ «Host» è vid."</string>
     <!-- no translation found for proxy_error_invalid_port (2671425042711054494) -->
     <skip />
@@ -291,19 +297,22 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Definir"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Betg reussì"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Cun success"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Las modificaziuns vegnan ad avair effect sch\'il cabel USB vegn connectà la proxima giada."</string>
+    <!-- no translation found for sdcard_changes_instructions (4482324130377280131) -->
+    <skip />
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activar la memoria da massa USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Bytes en total:"</string>
-    <!-- no translation found for sdcard_settings_not_present_status (2902787003418172125) -->
+    <!-- no translation found for sdcard_settings_not_present_status (1636218515775929394) -->
     <skip />
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Nagina carta SD"</string>
+    <!-- no translation found for sdcard_settings_not_present_status (2048419626134861599) -->
+    <skip />
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bytes disponibels:"</string>
-    <!-- no translation found for sdcard_settings_mass_storage_status (2736378870889777857) -->
+    <!-- no translation found for sdcard_settings_mass_storage_status (7993410985895217054) -->
     <skip />
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"La carta SD vegn utilisada sco memoria da massa"</string>
-    <!-- no translation found for sdcard_settings_unmounted_status (6691584887397909775) -->
+    <!-- no translation found for sdcard_settings_mass_storage_status (2742075324087038036) -->
     <skip />
-    <!-- no translation found for sdcard_settings_unmounted_status (7189526306223689608) -->
+    <!-- no translation found for sdcard_settings_unmounted_status (9191210735703409245) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (6462544066195404905) -->
     <skip />
     <!-- no translation found for sdcard_settings_bad_removal_status (7761390725880773697) -->
     <skip />
@@ -312,9 +321,10 @@
     <!-- no translation found for sdcard_settings_scanning_status (7503429447676219564) -->
     <skip />
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Tschertgar datotecas da multimedia sin la carta SD…"</string>
-    <!-- no translation found for sdcard_settings_read_only_status (3771783090621312312) -->
+    <!-- no translation found for sdcard_settings_read_only_status (3624143937437417788) -->
     <skip />
-    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Carta SD montada mo per lectura"</string>
+    <!-- no translation found for sdcard_settings_read_only_status (4518291824764698112) -->
+    <skip />
     <!-- no translation found for skip_label (47510779345218297) -->
     <skip />
     <string name="next_label" msgid="4693520878012668114">"Vinavant"</string>
@@ -349,8 +359,10 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Connectar als servetschs da datas sche roaming vegn utilisà"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"La connexiun è interrutta perquai che Vus essas sortì da la rait da chasa ed il roaming da datas n\'è betg activà."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activar"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Permetter il roaming da datas? Las tariffas da roaming pon esser considerablas!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Attenziun"</string>
+    <!-- no translation found for roaming_warning (7625933694709170887) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (6068100976707316772) -->
+    <skip />
     <string name="networks" msgid="6333316876545927039">"Tscherner in purschider da rait"</string>
     <!-- no translation found for sum_carrier_select (3616956422251879163) -->
     <skip />
@@ -375,7 +387,8 @@
     <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>
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir la data"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Tscherner in format da data"</string>
+    <!-- no translation found for date_time_date_format (6951498879879281102) -->
+    <skip />
     <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>
     <!-- no translation found for date_picker_title (1338210036394128512) -->
@@ -384,6 +397,11 @@
     <skip />
     <!-- no translation found for biometric_weak_improve_matching_title (8754080894393195194) -->
     <skip />
+    <!-- no translation found for biometric_weak_liveliness_title (2661613702124561096) -->
+    <skip />
+    <!-- no translation found for biometric_weak_liveliness_summary (4199587000948042325) -->
+    <!-- no translation found for biometric_weak_liveliness_summary (7980026533493781616) -->
+    <skip />
     <!-- no translation found for lock_after_timeout (4590337686681194648) -->
     <skip />
     <!-- no translation found for lock_after_timeout_summary (6128431871360905631) -->
@@ -414,9 +432,9 @@
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (923629233459331136) -->
+    <!-- no translation found for crypt_keeper_desc (3839235202103924154) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3504519024884099702) -->
+    <!-- no translation found for crypt_keeper_desc (7663118199519229502) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
@@ -428,13 +446,13 @@
     <skip />
     <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
     <skip />
-    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (4071395977297369642) -->
     <skip />
-    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <!-- no translation found for crypt_keeper_confirm_title (5100339496381875522) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <!-- no translation found for crypt_keeper_final_desc (4453629424172409792) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
+    <!-- no translation found for crypt_keeper_final_desc (5682944380460921880) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
@@ -448,11 +466,13 @@
     <skip />
     <!-- no translation found for crypt_keeper_failed_title (7133499413023075961) -->
     <skip />
-    <!-- no translation found for crypt_keeper_failed_summary (6891198717505120682) -->
+    <!-- no translation found for crypt_keeper_failed_summary (4478225241476039013) -->
     <skip />
-    <!-- no translation found for crypt_keeper_failed_summary (1341912405353765293) -->
+    <!-- no translation found for crypt_keeper_failed_summary (3083477162766772532) -->
     <skip />
-    <!-- no translation found for lock_settings_picker_title (3332098786253116023) -->
+    <!-- no translation found for crypt_keeper_switch_input_method (4168332125223483198) -->
+    <skip />
+    <!-- no translation found for lock_settings_picker_title (1095755849152582712) -->
     <skip />
     <!-- no translation found for backup_lock_settings_picker_title (8530380598637963916) -->
     <skip />
@@ -493,11 +513,11 @@
     <skip />
     <!-- no translation found for unlock_set_unlock_mode_biometric_weak (3008473624490350142) -->
     <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pattern (464022606293547390) -->
+    <!-- no translation found for unlock_set_unlock_mode_pattern (7837270780919299289) -->
     <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pin (1379365142708807163) -->
+    <!-- no translation found for unlock_set_unlock_mode_pin (3541326261341386690) -->
     <skip />
-    <!-- no translation found for unlock_set_unlock_mode_password (6955742995327081060) -->
+    <!-- no translation found for unlock_set_unlock_mode_password (1203938057264146610) -->
     <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>
@@ -510,48 +530,43 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN sto cuntegnair almain %d caracters."</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>
-    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <!-- no translation found for lockpassword_password_too_long (7016906583950201704) -->
     <skip />
-    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <!-- no translation found for lockpassword_pin_too_long (6419879099090294052) -->
     <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>
+    <!-- no translation found for lockpassword_pin_contains_non_digits (1079053457942945709) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_recently_used (7909781183925861119) -->
+    <skip />
+    <!-- no translation found for lockpassword_illegal_character (8742901630116866738) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_alpha (5203836082520634764) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_digit (3958033271435659825) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_symbol (7226621405629726899) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_letters:one (3063853802158131458) -->
+    <!-- no translation found for lockpassword_password_requires_letters:other (8186027808415585970) -->
+    <!-- no translation found for lockpassword_password_requires_lowercase:one (5583986519662091001) -->
+    <!-- no translation found for lockpassword_password_requires_lowercase:other (2693910942679679225) -->
+    <!-- no translation found for lockpassword_password_requires_uppercase:one (2611909966725502768) -->
+    <!-- no translation found for lockpassword_password_requires_uppercase:other (3030801209112209245) -->
+    <!-- no translation found for lockpassword_password_requires_numeric:one (3820355568839621231) -->
+    <!-- no translation found for lockpassword_password_requires_numeric:other (4703982391407595924) -->
+    <!-- no translation found for lockpassword_password_requires_symbols:one (8456579939292408631) -->
+    <!-- no translation found for lockpassword_password_requires_symbols:other (1221290525051187757) -->
+    <!-- no translation found for lockpassword_password_requires_nonletter:one (4594051152085925921) -->
+    <!-- no translation found for lockpassword_password_requires_nonletter:other (3952508584649046404) -->
+    <!-- no translation found for lockpassword_password_recently_used (6098087796784262081) -->
+    <skip />
     <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 />
-    <!-- no translation found for lock_setup (1759001157415978959) -->
+    <!-- no translation found for lock_setup (3355847066343753943) -->
     <!-- no translation found for lock_setup (5507462851158901718) -->
     <skip />
     <string name="device_admin_title" msgid="3562216873644263804">"Administraziun dals apparats"</string>
@@ -575,9 +590,9 @@
     <skip />
     <!-- no translation found for bluetooth_pin_values_hint (3815897557875873646) -->
     <skip />
-    <!-- no translation found for bluetooth_enter_pin_other_device (3617812138113586885) -->
+    <!-- no translation found for bluetooth_enter_pin_other_device (4637977124526813470) -->
     <skip />
-    <!-- no translation found for bluetooth_enter_passkey_other_device (1808735246794073465) -->
+    <!-- no translation found for bluetooth_enter_passkey_other_device (2798719004030279602) -->
     <skip />
     <!-- no translation found for bluetooth_confirm_passkey_msg (3708312912841950052) -->
     <skip />
@@ -596,7 +611,8 @@
     <!-- no translation found for bluetooth_pairing_device_down_error_message (7870998403045801381) -->
     <skip />
     <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>
+    <!-- no translation found for bluetooth_connecting_error_message (229861986106185022) -->
+    <skip />
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Tschertgar apparats"</string>
     <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
     <skip />
@@ -676,6 +692,8 @@
     <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 (8302974395787498915) -->
+    <skip />
     <!-- no translation found for nfc_quick_toggle_summary (5237208142892767592) -->
     <skip />
     <!-- no translation found for android_beam_settings_title (7832812974600338649) -->
@@ -690,6 +708,10 @@
     <skip />
     <!-- no translation found for android_beam_explained (6981652347448777459) -->
     <skip />
+    <!-- no translation found for nsd_quick_toggle_title (3125572815278848258) -->
+    <skip />
+    <!-- no translation found for nsd_quick_toggle_summary (155692215972781276) -->
+    <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar WLAN"</string>
     <!-- no translation found for wifi_settings (1277428034634973011) -->
@@ -698,6 +720,8 @@
     <!-- 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>
+    <!-- no translation found for wifi_setup_wizard_title (70277346338812325) -->
+    <skip />
     <!-- no translation found for wifi_starting (6716593470710880000) -->
     <skip />
     <!-- no translation found for wifi_stopping (244864762599017659) -->
@@ -709,9 +733,9 @@
     <skip />
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Avis da rait"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"M\'avisar sch\'ina rait averta è disponibla"</string>
-    <!-- no translation found for wifi_enable_watchdog_service (3808826765041243874) -->
+    <!-- no translation found for wifi_poor_network_detection (4925789238170207169) -->
     <skip />
-    <!-- no translation found for wifi_enable_watchdog_service_summary (4227430628962787616) -->
+    <!-- no translation found for wifi_poor_network_detection_summary (2466956369738047669) -->
     <skip />
     <!-- no translation found for wifi_setting_sleep_policy_title (9107237003911220057) -->
     <skip />
@@ -720,6 +744,12 @@
     <!-- no translation found for wifi_add_network (6234851776910938957) -->
     <skip />
     <string name="wifi_access_points" msgid="2664629396767022441">"Raits WLAN"</string>
+    <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
+    <skip />
+    <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
+    <skip />
+    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <skip />
     <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>
@@ -727,19 +757,39 @@
     <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_empty_list_wifi_on (3354911729026237372) -->
+    <skip />
+    <!-- no translation found for wifi_other_network (1048006316504242214) -->
+    <skip />
+    <!-- no translation found for wifi_more (3195296805089107950) -->
+    <skip />
+    <!-- no translation found for wifi_setup_wps (8128702488486283957) -->
+    <skip />
     <!-- no translation found for wifi_show_advanced (1793703023711426246) -->
     <skip />
-    <!-- no translation found for wifi_network_setup (2243277654809358812) -->
+    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin (8242979682530043184) -->
+    <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
     <skip />
-    <!-- no translation found for wifi_wps_setup_title (2301524571580808871) -->
+    <!-- no translation found for wifi_wps_onstart_pbc (7204827509934892103) -->
     <skip />
-    <!-- no translation found for wifi_wps_pin_output (7773693032190962123) -->
+    <!-- no translation found for wifi_wps_onstart_pin (8116564886303972764) -->
     <skip />
-    <!-- no translation found for wifi_wps_in_progress (2776555137392461525) -->
+    <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
     <skip />
-    <!-- no translation found for wifi_wps_failed (1648418410092969300) -->
+    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_wep (2702820087105284461) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_tkip (4282401586860713349) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_auth (1174614355181181958) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da la rait"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segirezza"</string>
@@ -766,15 +816,12 @@
     <skip />
     <!-- no translation found for wifi_disabled_network_failure (3111321240793227690) -->
     <skip />
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <!-- no translation found for wifi_disabled_help (5416325603334140666) -->
-    <skip />
     <!-- no translation found for wifi_disabled_password_failure (8659805351763133575) -->
     <skip />
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Betg cuntanschibel"</string>
-    <!-- no translation found for wifi_wps_available_first_item (3538912605343585226) -->
+    <!-- no translation found for wifi_wps_available_first_item (4422547079984583502) -->
     <skip />
-    <!-- no translation found for wifi_wps_available_second_item (6121307881706347616) -->
+    <!-- no translation found for wifi_wps_available_second_item (8427520131718215301) -->
     <skip />
     <!-- no translation found for wifi_secured_first_item (4072076186051083451) -->
     <skip />
@@ -783,11 +830,15 @@
     <!-- 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>
-    <!-- no translation found for wifi_wps_overlap_error (3352261777053283320) -->
+    <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
     <skip />
+    <string name="wifi_forget" msgid="8168174695608386644">"Allontanar"</string>
+    <!-- no translation found for wifi_failed_forget_message (1348172929201654986) -->
+    <skip />
+    <string name="wifi_save" msgid="3331121567988522826">"Memorisar"</string>
+    <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
+    <skip />
+    <string name="wifi_cancel" msgid="6763568902542968964">"Interrumper"</string>
     <!-- no translation found for wifi_advanced_titlebar (1627063574532930090) -->
     <skip />
     <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
@@ -815,38 +866,44 @@
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
     <skip />
-    <!-- no translation found for wifi_p2p_settings_title (5933614000444751775) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_settings_summary (6653169526746701975) -->
+    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
     <skip />
     <!-- no translation found for wifi_p2p_device_info (3191876744469364173) -->
     <skip />
-    <!-- no translation found for wifi_p2p_wps_setup (1780420204385670531) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_wps_pin (6025317359151049787) -->
-    <skip />
     <!-- no translation found for wifi_p2p_persist_network (1646424791818168590) -->
     <skip />
-    <!-- no translation found for wifi_p2p_menu_search (7189970585393813135) -->
+    <!-- no translation found for wifi_p2p_menu_search (3436429984738771974) -->
     <skip />
-    <!-- no translation found for wifi_p2p_menu_create_group (7595229161883902082) -->
+    <!-- no translation found for wifi_p2p_menu_searching (2396704492143633876) -->
     <skip />
-    <!-- no translation found for wifi_p2p_menu_remove_group (4844634506540667517) -->
+    <!-- no translation found for wifi_p2p_menu_rename (8448896306960060415) -->
     <skip />
-    <!-- no translation found for wifi_p2p_menu_advanced (2578792521809265949) -->
+    <!-- no translation found for wifi_p2p_peer_devices (299526878463303432) -->
     <skip />
-    <!-- no translation found for wifi_p2p_available_devices (5943352520059654483) -->
+    <!-- no translation found for wifi_p2p_failed_connect_message (8921447388048243547) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_failed_rename_message (2562182284946936380) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_title (3216846049677448420) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_message (8227342771610125771) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_disconnect_multiple_message (3283805371034883105) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_cancel_connect_title (255267538099324413) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_cancel_connect_message (7477756213423749402) -->
     <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_configure_ap_text" msgid="3474995108398156258">"Configurar il punct d\'access WLAN"</string>
+    <!-- no translation found for wifi_tether_configure_ap_text (61237027772641155) -->
+    <skip />
     <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="display_settings_title" msgid="1708697328627382561">"Visur"</string>
     <!-- no translation found for sound_settings (5534671337768745343) -->
     <skip />
-    <string name="silent_mode_title" msgid="3181479108593217704">"Modus silenzius"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tun da scalin"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- no translation found for all_volume_title (4296957391257836961) -->
@@ -855,8 +912,6 @@
     <skip />
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen dal tun da scalin"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en il modus silenzius"</string>
-    <!-- no translation found for vibrate_on_ring_title (40343855247989536) -->
-    <skip />
     <!-- no translation found for notification_sound_title (312032901303146002) -->
     <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Glisch d\'avis pulsanta"</string>
@@ -886,6 +941,16 @@
     <skip />
     <!-- no translation found for volume_alarm_description (8322615148532654841) -->
     <skip />
+    <!-- no translation found for volume_ring_mute (3018992671608737202) -->
+    <skip />
+    <!-- no translation found for volume_media_mute (3399059928695998166) -->
+    <skip />
+    <!-- no translation found for volume_notification_mute (7955193480006444159) -->
+    <skip />
+    <!-- no translation found for volume_alarm_mute (4452239420351035936) -->
+    <skip />
+    <!-- no translation found for vibrate_when_ringing_title (3885857358303178029) -->
+    <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>
@@ -896,9 +961,9 @@
     <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>
-    <!-- no translation found for dock_not_found_text (9015625921245904495) -->
+    <!-- no translation found for dock_not_found_text (8405432495282299143) -->
     <skip />
-    <!-- no translation found for dock_not_found_text (3882255773040651831) -->
+    <!-- no translation found for dock_not_found_text (1460497923342627801) -->
     <skip />
     <!-- no translation found for dock_sounds_enable_title (885839627097024110) -->
     <skip />
@@ -908,7 +973,8 @@
     <!-- no translation found for dock_sounds_enable_summary_off (5077843049805652363) -->
     <skip />
     <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>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <string name="search_settings" msgid="1910951467596035063">"Tschertgar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Configurar ils parameters e la cronologia da tschertga"</string>
     <!-- no translation found for display_settings (7965901687241669598) -->
@@ -1009,7 +1075,8 @@
     <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>
+    <!-- no translation found for status_prl_version (1007470446618081441) -->
+    <skip />
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <!-- no translation found for status_icc_id (943368755577172747) -->
     <skip />
@@ -1191,7 +1258,7 @@
     <skip />
     <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>
-    <!-- no translation found for master_clear_gesture_explanation (2234954758550554549) -->
+    <!-- no translation found for master_clear_gesture_explanation (826193821455182780) -->
     <skip />
     <!-- no translation found for master_clear_failed (7959646179737950703) -->
     <skip />
@@ -1218,9 +1285,9 @@
     <skip />
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Stizzar tut"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dissegnai per plaschair Voss schema da debloccaziun"</string>
-    <!-- no translation found for media_format_gesture_explanation (1379736318750958338) -->
+    <!-- no translation found for media_format_gesture_explanation (2192044794228379224) -->
     <skip />
-    <!-- no translation found for media_format_gesture_explanation (1681213416497647321) -->
+    <!-- no translation found for media_format_gesture_explanation (6288926293245938415) -->
     <skip />
     <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>
@@ -1264,7 +1331,7 @@
     <string name="location_title" msgid="1029961368397484576">"Mes lieu"</string>
     <!-- no translation found for location_network_based (5569673665032992664) -->
     <skip />
-    <!-- no translation found for location_neighborhood_level (1337612962522836900) -->
+    <!-- no translation found for location_neighborhood_level (2948129720516513300) -->
     <skip />
     <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
     <skip />
@@ -1323,7 +1390,8 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Smatgar sin Menu per mussar l\'agid."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Prender davent il det sche Vus avais terminà."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Colliai almain <xliff:g id="NUMBER">%d</xliff:g> puncts. Empruvai anc ina giada:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Il schema è registrà!"</string>
+    <!-- no translation found for lockpattern_pattern_entered_header (8378617839439987962) -->
+    <skip />
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Dissegnai danovamain il schema per confermar:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Voss nov schema da debloccaziun:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confermar"</string>
@@ -1349,7 +1417,7 @@
     <!-- no translation found for lock_title (2909697418179419990) -->
     <skip />
     <string name="lock_title" product="default" msgid="4059246467204273930">"Segirar Voss telefonin"</string>
-    <!-- no translation found for lock_intro_message (1075370160667458122) -->
+    <!-- no translation found for lock_intro_message (8616353869251700776) -->
     <skip />
     <!-- no translation found for lock_intro_message (8393155371327584659) -->
     <skip />
@@ -1364,7 +1432,7 @@
     <!-- no translation found for applications_settings_header (1014813055054356646) -->
     <skip />
     <string name="install_applications" msgid="4872012136210802181">"Funtaunas nunenconuschentas"</string>
-    <!-- no translation found for install_unknown_applications (8149117044297868948) -->
+    <!-- no translation found for install_unknown_applications (176855644862942064) -->
     <skip />
     <!-- no translation found for install_all_warning (3263360446508268880) -->
     <skip />
@@ -1378,6 +1446,8 @@
     <skip />
     <string name="storage_label" msgid="8700867073480107253">"Memoria"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Aviar sco standard"</string>
+    <!-- no translation found for auto_launch_label_generic (3230569852551968694) -->
+    <skip />
     <!-- no translation found for screen_compatibility_label (663250687205465394) -->
     <skip />
     <string name="permissions_label" msgid="2605296874922726203">"Autorisaziuns"</string>
@@ -1403,6 +1473,8 @@
     <string name="app_factory_reset" msgid="6635744722502563022">"Deinstallar las actualisaziuns"</string>
     <!-- no translation found for auto_launch_enable_text (2652825923953591251) -->
     <skip />
+    <!-- no translation found for always_allow_bind_appwidgets_text (3368654672141202604) -->
+    <skip />
     <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 (1616155457673106022) -->
@@ -1418,6 +1490,14 @@
     <skip />
     <!-- no translation found for show_background_processes (2009840211972293429) -->
     <skip />
+    <!-- no translation found for reset_app_preferences (1321050641018356925) -->
+    <skip />
+    <!-- no translation found for reset_app_preferences_title (6093179367325336662) -->
+    <skip />
+    <!-- no translation found for reset_app_preferences_desc (1118129530999596317) -->
+    <skip />
+    <!-- no translation found for reset_app_preferences_button (2559089511841281242) -->
+    <skip />
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar la capacitad da memorisar"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <!-- no translation found for filter_dlg_title (8693024463731076091) -->
@@ -1461,7 +1541,8 @@
     <!-- no translation found for security_settings_desc (61749028818785244) -->
     <skip />
     <string name="computing_size" msgid="1599186977475211186">"Calcular…"</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"Impussibel da calcular la grondezza dal pachet."</string>
+    <!-- no translation found for invalid_size_value (7563537715280712285) -->
+    <skip />
     <!-- no translation found for empty_list_msg (5993162337235907160) -->
     <skip />
     <string name="version_text" msgid="9189073826278676425">"versiun <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
@@ -1497,6 +1578,10 @@
     <skip />
     <!-- no translation found for app_disable_dlg_text (3562567756362627323) -->
     <skip />
+    <!-- no translation found for app_disable_notifications_dlg_title (7669264654851761857) -->
+    <skip />
+    <!-- no translation found for app_disable_notifications_dlg_text (5088484670924769845) -->
+    <skip />
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisaziun da la memoria"</string>
     <!-- no translation found for storageuse_settings_summary (3748286507165697834) -->
     <skip />
@@ -1572,10 +1657,32 @@
     <skip />
     <!-- no translation found for spellchecker_security_warning (9060897418527708922) -->
     <skip />
+    <!-- no translation found for spellchecker_quick_settings (246728645150092058) -->
+    <skip />
+    <!-- no translation found for spellchecker_language (6041050114690541437) -->
+    <skip />
+    <!-- no translation found for failed_to_open_app_settings_toast (1251067459298072462) -->
+    <skip />
     <!-- no translation found for pointer_settings_category (8183819795164034286) -->
     <skip />
     <!-- no translation found for pointer_speed (1221342330217861616) -->
     <skip />
+    <!-- no translation found for game_controller_settings_category (8794508575329923718) -->
+    <skip />
+    <!-- no translation found for vibrate_input_devices (2599591466928793082) -->
+    <skip />
+    <!-- no translation found for vibrate_input_devices_summary (4595570516865299153) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_title (8030087214949381372) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_setup_button (8514583747236476384) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_dialog_switch_hint (3889961090676293795) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_default_label (2952672513543482165) -->
+    <skip />
+    <!-- no translation found for keyboard_layout_picker_title (556081931972771610) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicziunari da l\'utilisader"</string>
     <!-- no translation found for user_dict_single_settings_title (524997218433540614) -->
     <skip />
@@ -1584,12 +1691,28 @@
     <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>
+    <!-- no translation found for user_dict_settings_add_screen_title (742580720124344291) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_more_options (8848798370746019825) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_less_options (2441785268726036101) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_confirm (6225823625332416144) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_word_option_name (7868879174905963135) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_shortcut_option_name (660089258866063925) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_locale_option_name (5696358317061318532) -->
+    <skip />
     <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>
     <!-- no translation found for user_dict_settings_empty_text (8165273379942105271) -->
     <skip />
-    <!-- no translation found for user_dict_settings_all_languages (7713910347678213719) -->
+    <!-- no translation found for user_dict_settings_all_languages (6742000040975959247) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_more_languages (7316375944684977910) -->
     <skip />
     <string name="testing" msgid="6584352735303604146">"Test"</string>
     <!-- no translation found for testing_phone_info (193561832258534798) -->
@@ -1646,10 +1769,6 @@
     <skip />
     <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>
-    <!-- no translation found for verifier_device_identifier (5079997701152411060) -->
-    <skip />
-    <!-- no translation found for verifier_device_identifier_not_available (1272065992066977324) -->
-    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Restar activ"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Il visur na dorma mai cun chargiar"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Posiziuns faussas"</string>
@@ -1657,8 +1776,34 @@
     <string name="adb_warning_title" msgid="6234463310896563253">"Permetter da debugar USB?"</string>
     <!-- no translation found for adb_warning_message (7316799925425402244) -->
     <skip />
+    <!-- no translation found for dev_settings_warning_title (7244607768088540165) -->
+    <skip />
+    <!-- no translation found for dev_settings_warning_message (2298337781139097964) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_title (7733257271454664956) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_summary (1798088409346660567) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_title (2112813067171502209) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_message (605444326545922054) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_title (2226662853797940829) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_summary (2750027486786530064) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_title (273220585729800783) -->
+    <skip />
+    <!-- no translation found for enforce_read_external_confirm_message (3858482712337574407) -->
+    <skip />
     <string name="gadget_picker_title" msgid="98374951396755811">"Tscherner in gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Tscherner in widget"</string>
+    <!-- no translation found for allow_bind_app_widget_activity_allow_bind_title (2538303018392590627) -->
+    <skip />
+    <!-- no translation found for allow_bind_app_widget_activity_allow_bind (1584388129273282080) -->
+    <skip />
+    <!-- no translation found for allow_bind_app_widget_activity_always_allow_bind (7037503685859688034) -->
+    <skip />
     <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>
@@ -1682,18 +1827,12 @@
     <skip />
     <!-- no translation found for accessibility_speak_password_title (3344423945644925355) -->
     <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 (3264723681038625967) -->
+    <!-- no translation found for accessibility_script_injection_title (7921388904564822855) -->
     <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) -->
@@ -1722,12 +1861,8 @@
     <skip />
     <!-- no translation found for accessibility_service_no_apps_message (7751662416377046539) -->
     <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning_title (4158946557435736650) -->
-    <skip />
     <!-- no translation found for accessibility_script_injection_security_warning_summary (7706858873495386310) -->
     <skip />
-    <!-- no translation found for accessibility_touch_exploration_warning (2442154805472989569) -->
-    <skip />
     <!-- no translation found for accessibility_service_default_description (1072730037861494125) -->
     <skip />
     <!-- no translation found for settings_button (3006713718908152930) -->
@@ -1735,7 +1870,7 @@
     <!-- no translation found for power_usage_summary_title (7190304207330319919) -->
     <skip />
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumaders da l\'accu"</string>
-    <!-- no translation found for power_usage_not_available (3583407442633768046) -->
+    <!-- no translation found for power_usage_not_available (3214000535532434353) -->
     <skip />
     <!-- no translation found for power_usage_level_and_status (7449847570973811784) -->
     <skip />
@@ -1863,7 +1998,8 @@
     <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_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>
+    <!-- no translation found for tts_engine_error (3305141107104670703) -->
+    <skip />
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
     <!-- no translation found for tts_engine_error_reselect (2415399149293842112) -->
     <skip />
@@ -1882,7 +2018,8 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminin"</string>
     <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_notif_engine_install_message (7250804349781973329) -->
+    <skip />
     <!-- no translation found for tts_engine_settings_button (1030512042040722285) -->
     <skip />
     <!-- no translation found for tts_engine_preference_section_title (448294500990971413) -->
@@ -1913,6 +2050,10 @@
     <skip />
     <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
     <skip />
+    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
+    <skip />
+    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
+    <skip />
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <!-- no translation found for credentials_unlock_hint (2301301378040499348) -->
     <skip />
@@ -1931,7 +2072,7 @@
     <!-- no translation found for credentials_not_erased (93461830775441220) -->
     <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"La memoria da las infurmaziuns d\'annunzia è activà"</string>
-    <!-- no translation found for credentials_configure_lock_screen_hint (6048426197489058494) -->
+    <!-- no translation found for credentials_configure_lock_screen_hint (6757119179588664966) -->
     <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>
@@ -1954,9 +2095,9 @@
     <skip />
     <!-- no translation found for local_backup_password_title (3860471654439418822) -->
     <skip />
-    <!-- no translation found for local_backup_password_summary_none (4780151366296088113) -->
+    <!-- no translation found for local_backup_password_summary_none (393503434408227110) -->
     <skip />
-    <!-- no translation found for local_backup_password_summary_change (3615162467655442441) -->
+    <!-- no translation found for local_backup_password_summary_change (2731163425081172638) -->
     <skip />
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <!-- no translation found for backup_erase_dialog_message (7218566008912418809) -->
@@ -1975,10 +2116,10 @@
     <skip />
     <string name="untitled_apn" msgid="1230060359198685513">"Senza num"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
-    <!-- no translation found for sound_category_calls_and_notification_title (4703470169010662085) -->
-    <skip />
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Avis"</string>
-    <!-- no translation found for sound_category_feedback_title (6047518536574673606) -->
+    <!-- no translation found for sound_category_call_ringtone_vibrate_title (1543777228646645163) -->
+    <skip />
+    <!-- no translation found for sound_category_system_title (1480844520622721141) -->
     <skip />
     <!-- no translation found for wifi_setup_title (661074868726906436) -->
     <skip />
@@ -2042,7 +2183,11 @@
     <skip />
     <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
     <skip />
-    <!-- no translation found for account_sync_settings_title (4578227872921044660) -->
+    <!-- no translation found for sync_failed (1696499856374109647) -->
+    <skip />
+    <!-- no translation found for sync_active (8476943765960863040) -->
+    <skip />
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
     <skip />
     <!-- no translation found for sync_is_failing (1591561768344128377) -->
     <skip />
@@ -2064,6 +2209,10 @@
     <skip />
     <!-- no translation found for sync_error (5060969083117872149) -->
     <skip />
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <!-- no translation found for settings_backup (2274732978260797031) -->
     <skip />
     <!-- no translation found for settings_backup_summary (7916877705938054035) -->
@@ -2080,7 +2229,7 @@
     <skip />
     <!-- no translation found for sync_contacts (9174914394377828043) -->
     <skip />
-    <!-- no translation found for sync_plug (5952575609349860569) -->
+    <!-- no translation found for sync_plug (3905078969081888738) -->
     <skip />
     <!-- no translation found for header_application_sync_settings (6205903695598000286) -->
     <skip />
@@ -2108,7 +2257,7 @@
     <skip />
     <!-- no translation found for provider_label (7724593781904508866) -->
     <skip />
-    <!-- no translation found for sync_item_title (1931551540462877488) -->
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <!-- no translation found for cant_sync_dialog_title (8923508322291625282) -->
     <skip />
@@ -2124,8 +2273,6 @@
     <skip />
     <!-- no translation found for try_again (4272075051293936921) -->
     <skip />
-    <!-- no translation found for service_busy (2325014135156127705) -->
-    <skip />
     <!-- no translation found for delete (4219243412325163003) -->
     <skip />
     <!-- no translation found for misc_files (6720680815969643497) -->
@@ -2140,7 +2287,27 @@
     <skip />
     <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
     <skip />
-    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <!-- no translation found for debug_debugging_category (6781250159513471316) -->
+    <skip />
+    <!-- no translation found for debug_app (8349591734751384446) -->
+    <skip />
+    <!-- no translation found for debug_app_not_set (718752499586403499) -->
+    <skip />
+    <!-- no translation found for debug_app_set (2063077997870280017) -->
+    <skip />
+    <!-- no translation found for select_application (5156029161289091703) -->
+    <skip />
+    <!-- no translation found for no_application (2813387563129153880) -->
+    <skip />
+    <!-- no translation found for wait_for_debugger (1202370874528893091) -->
+    <skip />
+    <!-- no translation found for wait_for_debugger_summary (1766918303462746804) -->
+    <skip />
+    <!-- no translation found for debug_input_category (1811069939601180246) -->
+    <skip />
+    <!-- no translation found for debug_drawing_category (6755716469267367852) -->
+    <skip />
+    <!-- no translation found for debug_monitoring_category (7640508148375798343) -->
     <skip />
     <!-- no translation found for strict_mode (1938795874357830695) -->
     <skip />
@@ -2154,9 +2321,31 @@
     <skip />
     <!-- no translation found for show_touches_summary (6684407913145150041) -->
     <skip />
-    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <!-- no translation found for show_screen_updates (5470814345876056420) -->
     <skip />
-    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <!-- no translation found for show_screen_updates_summary (2569622766672785529) -->
+    <skip />
+    <!-- no translation found for show_hw_screen_updates (5036904558145941590) -->
+    <skip />
+    <!-- no translation found for show_hw_screen_updates_summary (1115593565980196197) -->
+    <skip />
+    <!-- no translation found for disable_overlays (2074488440505934665) -->
+    <skip />
+    <!-- no translation found for disable_overlays_summary (3578941133710758592) -->
+    <skip />
+    <!-- no translation found for enable_traces_title (7448835465859512430) -->
+    <skip />
+    <!-- no translation found for enable_traces_dialog_title (5026490474669452929) -->
+    <skip />
+    <!-- no translation found for enable_traces_summary_none (1867562808503494163) -->
+    <skip />
+    <!-- no translation found for enable_traces_summary_num (8978230237777454269) -->
+    <skip />
+    <!-- no translation found for enable_traces_summary_all (3950139649125158247) -->
+    <skip />
+    <!-- no translation found for debug_layout (5981361776594526155) -->
+    <skip />
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
     <skip />
     <!-- no translation found for show_cpu_usage (2389212910758076024) -->
     <skip />
@@ -2164,12 +2353,18 @@
     <skip />
     <!-- no translation found for force_hw_ui (6426383462520888732) -->
     <skip />
-    <!-- no translation found for force_hw_ui_summary (8642000962902609976) -->
+    <!-- no translation found for force_hw_ui_summary (5535991166074861515) -->
+    <skip />
+    <!-- no translation found for track_frame_time (6146354853663863443) -->
+    <skip />
+    <!-- no translation found for track_frame_time_summary (447577515813970287) -->
     <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 animator_duration_scale_title (3406722410819934083) -->
+    <skip />
     <!-- no translation found for debug_applications_category (4206913653849771549) -->
     <skip />
     <!-- no translation found for immediately_destroy_activities (8366775083630234121) -->
@@ -2196,6 +2391,10 @@
     <skip />
     <!-- no translation found for data_usage_menu_show_ethernet (5181361208532314097) -->
     <skip />
+    <!-- no translation found for data_usage_menu_metered (5056695223222541863) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
     <skip />
     <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
@@ -2206,9 +2405,7 @@
     <skip />
     <!-- no translation found for data_usage_label_background (3225844085975764519) -->
     <skip />
-    <!-- no translation found for data_usage_disclaimer (2591250607795265503) -->
-    <skip />
-    <!-- no translation found for data_usage_disclaimer (4735170480663491977) -->
+    <!-- no translation found for data_usage_app_restricted (3568465218866589705) -->
     <skip />
     <!-- no translation found for data_usage_disable_mobile (5211007048880167438) -->
     <skip />
@@ -2230,9 +2427,9 @@
     <skip />
     <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
     <skip />
-    <!-- no translation found for data_usage_list_mobile (8285167120931486089) -->
+    <!-- no translation found for data_usage_list_mobile (5588685410495019866) -->
     <skip />
-    <!-- no translation found for data_usage_list_none (2899530183512542206) -->
+    <!-- no translation found for data_usage_list_none (3933892774251050735) -->
     <skip />
     <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
     <skip />
@@ -2244,16 +2441,26 @@
     <skip />
     <!-- no translation found for data_usage_app_restrict_background (9149728936265100841) -->
     <skip />
-    <!-- no translation found for data_usage_app_restrict_background_summary (6236080762898226645) -->
+    <!-- no translation found for data_usage_app_restrict_background_summary (518658001418490405) -->
     <skip />
     <!-- no translation found for data_usage_app_restrict_background_summary_disabled (7401927377070755054) -->
     <skip />
     <!-- no translation found for data_usage_app_restrict_dialog_title (1613108390242737923) -->
     <skip />
-    <!-- no translation found for data_usage_app_restrict_dialog (5651588785118290771) -->
+    <!-- no translation found for data_usage_app_restrict_dialog (1466689968707308512) -->
     <skip />
     <!-- no translation found for data_usage_restrict_denied_dialog (7086969103661420799) -->
     <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
     <skip />
     <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
@@ -2266,9 +2473,9 @@
     <skip />
     <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
     <skip />
-    <!-- no translation found for data_usage_limit_dialog (6401600837858297985) -->
+    <!-- no translation found for data_usage_limit_dialog_mobile (3893348029612821262) -->
     <skip />
-    <!-- no translation found for data_usage_limit_dialog (5996407024898469862) -->
+    <!-- no translation found for data_usage_limit_dialog_mobile (7962145861903746827) -->
     <skip />
     <!-- no translation found for data_usage_restrict_background_title (2201315502223035062) -->
     <skip />
@@ -2282,7 +2489,21 @@
     <skip />
     <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
     <skip />
-    <!-- no translation found for data_usage_total_during_range (441648308264260691) -->
+    <!-- no translation found for data_usage_total_during_range (4091294280619255237) -->
+    <skip />
+    <!-- no translation found for data_usage_total_during_range_mobile (5961720793603268572) -->
+    <skip />
+    <!-- no translation found for data_usage_total_during_range_mobile (1625833170144610767) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_title (6204750602856383278) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_body (2446827764036316131) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_mobile (5423305619126978393) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_wifi (4151511616349458705) -->
+    <skip />
+    <!-- no translation found for data_usage_metered_wifi_disabled (7566012564261138417) -->
     <skip />
     <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
     <skip />
@@ -2333,16 +2554,22 @@
     <skip />
     <!-- no translation found for vpn_connect (8469608541746132301) -->
     <skip />
-    <!-- no translation found for vpn_edit (1111459297288136079) -->
+    <!-- no translation found for vpn_edit (8647191407179996943) -->
     <skip />
-    <!-- no translation found for vpn_connect_to (7328758950427515753) -->
+    <!-- no translation found for vpn_connect_to (5965299358485793260) -->
     <skip />
     <!-- no translation found for vpn_title (6317731879966640551) -->
     <skip />
-    <!-- no translation found for vpn_create (8966010925994175306) -->
+    <!-- no translation found for vpn_create (5628219087569761496) -->
     <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 vpn_menu_edit (408275284159243490) -->
+    <skip />
+    <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
+    <skip />
+    <!-- no translation found for vpn_no_network (3050233675132726155) -->
+    <skip />
+    <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
+    <skip />
     <!-- no translation found for trusted_credentials_system_tab (3984284264816924534) -->
     <skip />
     <!-- no translation found for trusted_credentials_user_tab (2244732111398939475) -->
@@ -2359,43 +2586,7 @@
     <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 (477937585801538951) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_2_more (7849927882225521983) -->
-    <skip />
-    <!-- no translation found for accessibility_tutorial_lesson_1_text_3 (3973201880357468747) -->
-    <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 (8764686624055084454) -->
-    <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 (3055831259260848004) -->
-    <skip />
-    <!-- no translation found for spellcheckers_settings_title (8843785708050235008) -->
+    <!-- no translation found for spellcheckers_settings_title (399981228588011501) -->
     <skip />
     <!-- no translation found for current_backup_pw_prompt (7735254412051914576) -->
     <skip />
@@ -2411,4 +2602,40 @@
     <skip />
     <!-- no translation found for additional_system_update_settings_list_item_title (214987609894661992) -->
     <skip />
+    <!-- no translation found for user_settings_title (5189224330534906766) -->
+    <skip />
+    <!-- no translation found for user_list_title (2152311434413878709) -->
+    <skip />
+    <!-- no translation found for user_add_user_menu (1675956975014862382) -->
+    <skip />
+    <!-- no translation found for user_details_title (3037625632127241370) -->
+    <skip />
+    <!-- no translation found for user_information_heading (8728151075759863162) -->
+    <skip />
+    <!-- no translation found for user_name_title (7563724675699398319) -->
+    <skip />
+    <!-- no translation found for user_restrictions_heading (4426403050397418553) -->
+    <skip />
+    <!-- no translation found for user_market_requires_pin (3260702297207279414) -->
+    <skip />
+    <!-- no translation found for user_max_content_rating (8297759970216482772) -->
+    <skip />
+    <!-- no translation found for user_system_apps_heading (2408331798732183682) -->
+    <skip />
+    <!-- no translation found for user_market_apps_heading (4657387297168308251) -->
+    <skip />
+    <!-- no translation found for user_discard_user_menu (6638388031088461242) -->
+    <skip />
+    <!-- no translation found for user_remove_user_menu (3210146886949340574) -->
+    <skip />
+    <!-- no translation found for user_new_user_name (7603010274765911161) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_title (3856148232937245711) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_message (5284111415714437285) -->
+    <skip />
+    <!-- no translation found for app_notifications_switch_label (9124072219553687583) -->
+    <skip />
+    <!-- no translation found for help_label (1107174367904110532) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index ea8991c..b9ea10f 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -68,7 +68,7 @@
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Foarte încet"</item>
     <item msgid="2361722960903353554">"Încet"</item>
-    <item msgid="1145554631248513562">"Normală"</item>
+    <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Rapid"</item>
     <item msgid="2538100882620724753">"Foarte rapid"</item>
   </string-array>
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"În curs de deconectare..."</item>
     <item msgid="1634960474403853625">"Deconectată"</item>
     <item msgid="746097431216080650">"Nereuşit"</item>
+    <item msgid="6367044185730295334">"Blocat"</item>
+    <item msgid="503942654197908005">"Evitarea temporară a conexiunii slabe"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"În curs de deconectare de la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"Deconectată"</item>
     <item msgid="8578370891960825148">"Nereuşit"</item>
+    <item msgid="5660739516542454527">"Blocat"</item>
+    <item msgid="1805837518286731242">"Evitarea temporară a conexiunii slabe"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Buton WPS"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Niciunul"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN de la punct de acces"</item>
-    <item msgid="7364462169350112617">"PIN de la acest dispoz."</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Static"</item>
@@ -211,14 +211,9 @@
     <item msgid="3738430123799803530">"Card SD detaşabil"</item>
     <item msgid="4498124044785815005">"Permiteţi sistemului să decidă"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Oprit"</item>
-    <item msgid="4804571292609523335">"Vibrare"</item>
-    <item msgid="595707141547423573">"Dezactivaţi sunetul"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Scurtă"</item>
-    <item msgid="2560532955514699713">"Mediu"</item>
+    <item msgid="2560532955514699713">"Medie"</item>
     <item msgid="2372711992605524591">"Lungă"</item>
   </string-array>
   <string-array name="hdcp_checking_titles">
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animaţie la scara 5x"</item>
     <item msgid="6660750935954853365">"Animaţie la scara 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animaţie dezactivată"</item>
+    <item msgid="1138649021950863198">"Animaţie la scara 0,5x"</item>
+    <item msgid="4394388961370833040">"Animaţie la scara 1x"</item>
+    <item msgid="8125427921655194973">"Animaţie la scara 1,5x"</item>
+    <item msgid="3334024790739189573">"Animaţie la scara 2x"</item>
+    <item msgid="3170120558236848008">"Animaţie la scara 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b029a45..3f16187 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Nu"</string>
+    <string name="create" msgid="3578857613172647409">"Creaţi"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Împiedicaţi apelarea prin Bluetooth când este blocat ecranul"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispozitive Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Nume dispozitiv"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Setări dispozitiv"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Setări pentru profil"</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_rename_device" product="tablet" msgid="787970073150631155">"Redenumiţi tableta"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"În curs de împerechere..."</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="5655704645616731277">"Ating. pt. împerec."</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"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="1931617700075106801">"Atingeţi pentru a împerechea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Atingeţi pentru a împerechea 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="device_picker" msgid="8398232791303186677">"Selector de dispozitive Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitare de permisiune Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"O aplicaţie încearcă să activeze funcţia Bluetooth. Permiteţi?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"O aplicaţie de pe tableta dvs. încearcă să facă tableta detectabilă de alte dispozitive Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Permiteţi?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Numele de gazdă introdus nu este valid."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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_port" msgid="5539106187558215246">"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="2671425042711054494">"Portul introdus nu este valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy-ul HTTP este utilizat de browser, dar nu poate fi utilizat de alte aplicaţii."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Setaţi"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Nereuşit"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Reuşit"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Modificările intră în vigoare când se reconectează cablul USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Modificările intră în vigoare când se reconectează cablul USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Activaţi stocarea în masă prin USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Număr total de octeţi:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Stocarea USB nemontată"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Niciun card SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Stocarea USB nu este montată."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Niciun card SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Octeţi disponibili:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Stoc. USB este utiliz. ca disp. de stocare masivă"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Cardul SD este utilizat ca dispozitiv de stocare în masă"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Puteţi elim. stoc. USB în sig."</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Acum puteţi elimina cardul SD în siguranţă"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Stocare USB utilizată ca dispoz. de stocare masivă."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Cardul SD este utilizat ca dispozitiv de stocare în masă."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Puteţi elimina stoc. USB în siguranţă"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Acum puteţi elimina cardul SD în siguranţă."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Stoc. USB elimin. în timpul funcţionării!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Cardul SD a fost scos în timp ce era încă utilizat!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Octeţi utilizaţi:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Se scan. stoc. USB pt. media..."</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Stoc.USB mont. numai în citire"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Limba"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Conectaţi-vă la serviciile de date în roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Aţi pierdut conectivitatea la date deoarece aţi părăsit reţeaua de domiciliu neavând activat roamingul."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activaţi"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Permiteţi roamingul de date? Puteţi acumula taxe considerabile pentru roaming!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Atenţie"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Când permiteţi roamingul de date puteţi acumula taxe considerabile pentru roaming!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Permiteţi roamingul de date?"</string>
     <string name="networks" msgid="6333316876545927039">"Selectarea operatorului"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Alegeţi un operator de reţea"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data şi ora"</string>
@@ -283,12 +285,14 @@
     <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>
     <string name="date_time_set_date" msgid="7021491668550232105">"Setaţi data"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Selectaţi formatul pentru dată"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Alegeţi formatul de 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="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Îmbunătăţiţi potrivirea feţei"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Verificare mișcare"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Se solicită clipirea"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"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="3504519024884099702">"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_desc" product="tablet" msgid="3839235202103924154">"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 decripta tableta 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="7663118199519229502">"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 decripta telefonul 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="2029407131227814893">"Încărcaţi bateria şi încercaţi din nou."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"Trebuie să setaţi un cod PIN sau o parolă pentru blocarea ecranului înainte de a începe criptarea."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Criptaţi?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operaţia de criptare 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="5682944380460921880">"Operaţia de criptare 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="6689952371032099350">"Aşteptaţi criptarea tabletei. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"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="6891198717505120682">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Selectaţi bloc. ecran."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Comutaţi metoda de introducere"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeţi blocare ecran"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Aleg. blocare rezervă"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Deblocare facială"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Model"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <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="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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"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="6419879099090294052">"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="1079053457942945709">"Codul PIN trebuie să conţină numai cifre de la 0 la 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Administr. dispoz. nu permite utiliz. unui PIN recent."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Parola conţine un caracter nepermis."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Parola trebuie să conţină cel puţin o literă."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Parola trebuie să conţină minimum o cifră."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Parola trebuie să conţină cel puţin 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>
+    <item quantity="one" msgid="3063853802158131458">"Parola trebuie să conţină cel puţin 1 literă."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Parola trebuie să conţină cel puţin 1 minusculă."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Parola trebuie să conţină cel puţin 1 majusculă."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Parola trebuie să conţină cel puţin 1 cifră."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Parola trebuie să conţină cel puţin 1 simbol special."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Parola trebuie să conţină cel puţin 1 caracter care să nu fie o literă."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Administrator dispozitiv nu permite parolă recentă."</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="lock_setup" msgid="1759001157415978959">"Configurare finalizată"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Configurarea este completă."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administrarea dispozitivelor"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Pentru împerecherea cu:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>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_enter_pin_other_device" msgid="4637977124526813470">"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="2798719004030279602">"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="2796550001376088433">"Pentru împerecherea cu:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Introduceţi pe acesta:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, apoi apăsaţi tasta Return sau Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nu s-a putut împerechea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> din cauza unui cod PIN sau al unei chei de acces incorecte."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nu se poate comunica cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Nu s-a putut conecta 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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Permiteţi schimbul de date atunci când telefonul atinge alt dispozitiv"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permiteţi schimbul de date atunci când tableta atinge alt dispozitiv"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permiteţi schimbul de date atunci când telefonul atinge alt dispozitiv"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Pregătit să transmită conţinut din aplicaţii prin NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Dezactivată"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponibilă, deoarece NFC este oprit"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"După activarea acestei funcţii, puteţi transmite conţinutul aplicaţiilor către un alt dispozitiv compatibil NFC, ţinând cele două dispozitive apropiate unul de celălalt. De exemplu, puteţi să transmiteţi pagini din browser, videoclipuri YouTube, persoane din agendă şi multe altele."\n\n"Nu trebuie decât să apropiaţi cele două dispozitive (de obicei, aşezându-le unul în spatele celuilalt) şi să atingeţi ecranul. Aplicaţia determină apoi ce poate fi transmis."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Descoperire serviciu de reţea"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permite aplicaţiilor de pe alte dispozitive să descopere aplicaţii pe acest dispozitiv"</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="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_setup_wizard_title" msgid="70277346338812325">"Selectaţi o reţea Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nu se poate scana pentru reţele"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificare de reţea"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Doresc să fiu notificat când este disponibilă o reţea deschisă"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Evitaţi conexiunile slabe"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"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_poor_network_detection" msgid="4925789238170207169">"Evitaţi conexiunile slabe"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"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="9107237003911220057">"Menţineţi Wi-Fi activat în modul inactiv"</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_wps_pbc" msgid="2668564692207863017">"Buton WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introduceţi PIN WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Se caută reţele Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Altă reţea…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Mai multe"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automată (WPS)"</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="8242979682530043184">"Introduceţi codul PIN de la punctul de acces"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Configurare WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"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_wps_setup_title" msgid="6034518116333042484">"Configurare protejată Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Se porneşte WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Apăsaţi butonul Configurare protejată Wi-Fi de pe router. Acesta poate apărea ca „WPS” sau poate conţine acest simbol:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Introduceţi codul PIN <xliff:g id="NUMBER">%1$s</xliff:g> pe routerul Wi-Fi. Finalizarea configurării poate dura până la două minute."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS finalizată. Se conectează la reţea…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Conectat la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Configurarea WPS este deja în desfăşurare şi poate dura până la două minute pentru a se finaliza"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS eşuată. Încercaţi din nou peste câteva minute."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Setarea de securitate pentru routerul wireless (WEP) nu este acceptată"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Setarea de securitate pentru routerul wireless (TKIP) nu este acceptată"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentificare eşuată. Încercaţi din nou."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"A fost detectată altă sesiune WPS. Încercaţi din nou peste câteva minute."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Salvată"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Dezactivată"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"S-a evitat o conexiune de internet slabă"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Reţeaua a fost evitată din cauza conexiunii slabe. Dezactivaţi acest comportament din ecranul Setări &gt; Wi-Fi, elementul de meniu Avansate."</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_wps_available_first_item" msgid="3538912605343585226">"Reţea protejată disponibilă"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (reţea protejată disponibilă)"</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_failed_connect_message" msgid="8491902558970292871">"Nu s-a putut stabili conexiunea la reţea"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Eliminaţi"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nu s-a putut elimina reţeaua"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Salvaţi"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nu s-a putut salva reţeaua"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anulaţi"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"A fost detect. altă ses. Wi-Fi protejată. Încerc. din nou în 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lungime prefix reţea"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Configuraţi conectivitatea peer-to-peer"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informaţii dispozitiv"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Configurare protejată Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Eliminaţi grupul"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avansate"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Dispozitive disponibile"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Căutaţi dispozitive"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Se caută…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Redenumiţi dispozitivul"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Împerecheaţi dispozitivele"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Conectarea nu s-a putut realiza."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Dispozitivul nu a fost redenumit."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Deconectaţi?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> se va încheia."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> şi cu alte <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispozitive se va încheia."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulaţi invitaţia?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriţi să anulaţi invitaţia de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Configuraţi hotspot Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configuraţi hotspotul 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="display_settings_title" msgid="1708697328627382561">"Afişare"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Mod Silenţios"</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="4296957391257836961">"Volumele"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efecte muzicale"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum sonerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrează la profilul Silenţios"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrare şi sunet"</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="incoming_call_volume_title" msgid="8073714801365904099">"Ton de apel"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Dezactivaţi sunetul pentru tonul de sonerie şi notificări"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Dezactivaţi sunetul muzicii şi al altui conţinut media"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Dezactivaţi sunetul notificărilor"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Dezactivaţi sunetul alarmelor"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrează când sună"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Trebuie să andocaţi tableta înainte de configurarea dispozitivului de andocare audio."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Trebuie să andocaţi telefonul înainte de configurarea dispozitivului de andocare audio."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Trebuie să andocaţi tableta înainte de configurarea dispozitivului de andocare audio."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Trebuie să andocaţi telefonul înainte de configurarea dispozitivului de andocare audio."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sunet de inserare în 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="account_settings" msgid="6403589284618783461">"Conturi"</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="7965901687241669598">"Afişare"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Numărul meu de telefon"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Versiune PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Ştergeţi toate informaţiile personale şi 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="2234954758550554549">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma resetarea configurării din fabrică."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Trebuie să desenaţi modelul de deblocare pentru a confirma resetarea configurării din fabrică."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nu a fost efectuată nicio resetare, deoarece serviciul Golire sistem nu este disponibil."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Resetaţi?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ştergeţi stocarea USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ştergeţi cardul SD şi toate fişierele stocate pe acesta? Acţiunea nu poate fi anulată!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Ştergeţi tot"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenaţi modelul pentru deblocare"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma că doriţi ştergerea stocării USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi stocarea USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Trebuie să desenaţi modelul de 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="6688416425801386511">"Tethering prin USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Reţele mobile"</string>
     <string name="location_title" msgid="1029961368397484576">"Locaţia mea"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Serviciul de localizare Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Permiteţi aplic. să util. date din surse ca reţelele Wi-Fi şi mobile pt. a determina locaţia aprox."</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Permiteţi trimiterea de date anonime de localizare la Google. Permiteţi aplic. acceptate să utilizeze date din surse ca reţelele Wi-Fi sau mobile pt. a determina locaţia 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Apăsaţi pe Meniu pentru ajutor."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ridicaţi degetul când aţi terminat."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conectaţi minimum <xliff:g id="NUMBER">%d</xliff:g> (de) puncte. Încercaţi din nou:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Model înregistrat!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Model înregistrat."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Desenaţi din nou modelul pentru a confirma:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Noul dvs. model pentru deblocare:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmaţi"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Înainte"</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="1075370160667458122">"Protejaţi tableta împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Glisaţi uşor cu degetul pentru a conecta, î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="tablet" msgid="8616353869251700776">"Protejaţi tableta împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Glisaţi uşor cu degetul pentru a conecta, î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="8393155371327584659">"Protejaţi telefonul împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Glisaţi uşor cu degetul pentru a conecta, î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="7041951105633616745">"Gestionaţi aplicaţii"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestionaţi şi eliminaţi aplicaţiile instalate"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gestionaţi aplicaţii, creaţi comenzi rapide pentru lansare rapidă"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Setări aplicaţii"</string>
     <string name="install_applications" msgid="4872012136210802181">"Surse necunoscute"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Permiteţi instalarea aplicaţiilor ce nu aparţin magazinului virtual Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Permiteţi instalarea aplicaţiilor din surse necunoscute"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tableta şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Sunteţi de acord că sunteţi singura persoană 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="8113734576826384682">"Telefonul şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Sunteţi de acord că sunteţi singura persoană 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>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"Prestabilite"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ştergeţi datele"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Dezinstalaţi actualizările"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Aţi ales să lansaţi această aplicaţie în mod prestabilit pentru anumite acţiuni."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Aţi ales să permiteţi acestei aplicaţii să creeze widgeturi şi să acceseze datele acestora."</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="1616155457673106022">"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>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sortaţi după dimensiune"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Afişaţi serv. care funcţ."</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Procese memorie cache"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Resetați pref. aplicații"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Resetaţi pref. aplicații?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Astfel vor fi resetate toate preferinţele pentru:"\n\n" "<li>"aplicaţii dezactivate;"</li>\n" "<li>"notificări de aplicaţii dezactivate;"</li>\n" "<li>"aplicaţii prestabilite pentru acţiuni;"</li>\n" "<li>"restricţii privind datele de fundal pentru aplicaţii."</li>\n\n" Nu veţi pierde nimic din datele aplicaţiilor."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetaţi aplicaţiile"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestionaţi spaţiul"</string>
     <string name="filter" msgid="2018011724373033887">"Filtraţi"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeţi opţiunile de filtrare"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Această aplicaţie poate accesa pe tabletă următoarele:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"Nu s-a putut calcula mărimea pachetului."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Schimbaţi locaţia preferată de instalare pentru noile aplicaţii"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Dezactiv. aplic. încorporată?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Dacă dezactivaţi o aplicaţie încorporată, este posibil ca alte aplicaţii să se comporte necorespunzător."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Dezactivaţi notificările?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Dacă dezactivaţi notificările pentru această aplicaţie, puteţi pierde alerte şi actualizări importante."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizare stocare"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Afişaţi stocarea utilizată de aplicaţii"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicii în curs de funcţionare"</string>
@@ -1042,7 +1078,7 @@
     <string name="service_started_by_app" msgid="818675099014723551">"Iniţiat de aplicaţie"</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> liberă"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> liber(i)"</string>
     <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> util."</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
@@ -1084,19 +1120,39 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"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>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Acest instrument de verificare a ortografiei poate, de asemenea, să culeagă în întregime textul pe care îl introduceţi, inclusiv datele personale, cum ar fi parolele şi numerele cardurilor de credit. Instrumentul provine de la aplicaţia <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi acest instrument de verificare ortografică?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Setări"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Limbă"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Deschiderea setărilor pentru <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> a eşuat"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Viteza indicatorului"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Controler de joc"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Utilizaţi mecanismul de vibrare"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirecţionaţi mecanismul de vibrare pentru controlerul de joc când este conectat."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Alegeţi aspectul tastaturii"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configuraţi aspectele tastaturii"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Pentru comutare, apăsaţi pe Control-Space"</string>
+    <!-- no translation found for keyboard_layout_default_label (2952672513543482165) -->
+    <skip />
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Aspecte tastatură"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicţionarul utilizatorului"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicţionar personal"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicţionare personale"</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_add_screen_title" msgid="742580720124344291">"Expresie"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Mai multe opţ."</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Mai puţine opţ."</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Cuvânt:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Comandă rapidă:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Limbă:"</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="8165273379942105271">"Nu există cuvinte în dicţionarul utilizatorului. Puteţi adăuga un cuvânt atingând butonul Adăugaţi (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Toate limbile"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Pentru toate limbile"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Mai multe limbi..."</string>
     <string name="testing" msgid="6584352735303604146">"Testare"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informaţii tabletă"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informaţii telefon"</string>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Setaţi opţiuni pentru dezvoltarea aplicaţiei"</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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID-ul dispozitivului de dezvoltare"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Nu sunt disponibile informaţii despre dispozitiv"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Activ permanent"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ecranul nu va fi inactiv pe durata încărcării"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permiteţi locaţiile fictive"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteţi locaţiile fictive"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permiteţi depanarea USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Depanarea USB are exclusiv scopuri de dezvoltare. Utilizaţi-o pentru a copia date de pe computer pe dispozitiv, pentru a instala aplicaţii pe dispozitiv fără notificare şi pentru a citi datele din jurnale."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Permiteţi setările pentru dezvoltare?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Aceste setări sunt destinate exclusiv utilizării pentru dezvoltare. Din cauza lor, este posibil ca dispozitivul dvs. şi aplicaţiile de pe acesta să nu mai funcţioneze sau să funcţioneze necorespunzător."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protejaţi stocarea USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplicaţiile trebuie să ceară permisiunea de a citi stocarea USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protejaţi stocarea USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Când stocarea USB este protejată, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă."\n\n"Este posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protejaţi cardul SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplicaţiile trebuie să ceară permisiunea de a citi cardul SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protejaţi cardul SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Când cardul SD este protejat, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă."\n\n"Este posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Alegeţi obiectul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Alegeţi obiectul widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creaţi widgetul şi permiteţi accesul?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"După ce creaţi widgetul, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> poate accesa toate datele pe care acesta le afişează."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permiteţi întotdeauna ca <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> să creeze widgeturi şi să acceseze datele acestora"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> z <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>
@@ -1160,12 +1227,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Rostiţi parolele"</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="3264723681038625967">"Instalaţi scripturile web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Sporiţi accesibilitatea web"</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>
@@ -1180,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nu există servicii instalate"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Aveţi nevoie de un cititor de ecran?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Serviciul TalkBack oferă feedback vocal pentru a ajuta utilizatorii nevăzători şi cu probleme de vedere. Doriţi să îl instalaţi în mod gratuit din Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Instalaţi scripturile web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Doriţi ca aplicaţiile să instaleze scripturi de la Google, care să facă mai accesibil conţinutul web al acestora?"</string>
-    <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="1072730037861494125">"Nu a fost furnizată o descriere."</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_not_available" msgid="3214000535532434353">"Date utilizare baterie nedisp."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1347,7 @@
     <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_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" msgid="3305141107104670703">"Motorul pe care l-aţi ales nu poate rula."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configuraţi"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Alegeţi alt motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Acest motor de sintetizare a vorbirii poate culege în întregime textul vorbit, inclusiv datele personale cum ar fi parolele şi numerele cărţilor de credit. Acesta provine de la motorul <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permiteţi utilizarea acestui motor de sintetizare a vorbirii?"</string>
@@ -1301,7 +1363,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Feminină"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Activ. mot. nou înaintea util."</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>
@@ -1318,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Desenaţi modelul pentru deblocare"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma instalarea acreditării."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Introduceţi parola pentru spaţiul de stocare a certificatelor."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Parola actuală:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Stoc. acredit. este ştearsă."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Nu s-a şters sp. stoc. cert."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stocarea acreditărilor este activată."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Trebuie să setaţi un cod PIN sau o parolă de blocare a ecranului înainte de a putea utiliza spaţiul de stocare a certificatelor."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebuie să setaţi un cod PIN sau o parolă pentru blocarea ecranului înainte de a putea utiliza spaţiul de stocare a certificatelor."</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="5446972770562918934">"Creaţi o copie de rezervă şi resetaţi"</string>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Restabilire automată"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"La reinstalarea unei aplicaţii, restabiliţi setările şi datele pentru care aţi creat 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="4780151366296088113">"Î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="local_backup_password_summary_none" msgid="393503434408227110">"În prezent, copiile de rezervă complete pe desktop nu sunt protejate"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Atingeţi pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Doriţi să opriţi crearea copiilor de rezervă pentru parolele Wi-Fi, marcajele, alte setări, datele aplicaţiilor şi să ştergeţi toate copiile aflate pe serverele Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Setări de administrare a dispozitivului"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Sistem"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ton de sonerie şi vibraţii"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Se efectuează conectarea la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1457,9 @@
     <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_failed" msgid="1696499856374109647">"Sincronizare eşuată"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sincronizare activă"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Sincronizaţi"</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="background_data" msgid="5779592891375473817">"Date de fundal"</string>
@@ -1404,6 +1470,8 @@
     <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="last_synced" msgid="4242919465367022234">"Ultima sincronizare <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Se sincronizează acum…"</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>
@@ -1413,7 +1481,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" "\n"O abordare Google asupra sincronizării datelor, care vă permite accesul la agenda dvs., la întâlniri şi la multe alte informaţii, oriunde v-aţi afla."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"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>
@@ -1427,7 +1495,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Acest cont este necesar pentru unele aplicaţii. Puteţi elimina contul numai prin resetarea tabletei la setările prestabilite din fabrică (acţiune care şterge toate datele personale), din Setări &gt; Creaţi copie de rezervă şi resetaţi."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Acest cont este necesar pentru unele aplicaţii. Puteţi elimina contul numai prin resetarea telefonului la setările prestabilite din fabrică (acţiune care şterge toate datele personale), din Setări &gt; Creaţi copie de rezervă şi resetaţi."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Sincronizarea manuală nu este posibilă"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"În prezent, sincronizarea pentru acest element este dezactivată. Pentru a schimba această setare, activaţi temporar datele de fundal şi sincronizarea automată."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Setări 4G"</string>
@@ -1435,7 +1504,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresă MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduceţi parola pentru a decripta stocarea"</string>
     <string name="try_again" msgid="4272075051293936921">"Încercaţi din nou."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Serviciul este ocupat. Încercaţi din nou."</string>
     <string name="delete" msgid="4219243412325163003">"Ştergeţi"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1511,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Depanare"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Selectaţi aplicaţia de depanare"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nu aţi setat o aplicaţie de depanare"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplicaţie de depanare: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Selectaţi o aplicaţie"</string>
+    <string name="no_application" msgid="2813387563129153880">"Niciuna"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Aşteptaţi depanatorul"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Înaintea executării, aplicaţia aşteaptă ataşarea depanatorului"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Intrare"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Desen"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorizare"</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_screen_updates" msgid="5470814345876056420">"Afiş. actualiz. suprafeţe"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Iluminare suprafeţe toată fereastra la actualizare"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Afiş. actualiz. ecran GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Iluminare ecrane din ferestre la desenarea cu GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Dezactivaţi suprapun. HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizaţi mereu GPU pentru compunerea ecranului"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Activaţi monitorizările"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Select. monitoriz. activ."</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"În prezent, nu există monitorizări activate"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> (de) monitorizări activate în prezent"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Toate monitorizările activate în prezent"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Afişaţi limite aspect"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Afişaţi limitele clipului, marginile etc."</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="force_hw_ui" msgid="6426383462520888732">"Forţaţi redarea cu GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Utilizaţi accelerarea hardware 2D în aplicaţii"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forţaţi utilizarea GPU pentru desen în 2D"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profil redare cu GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Măsurare timp redare în adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Scară durată Animator"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1563,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Hotspoturi mobile"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizaţi datele în mod automat"</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="8621855507876539282">"Nicio aplic. nu a utilizat 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_disclaimer" product="tablet" msgid="2591250607795265503">"Măsurat cu tableta dvs. Evidenţele operat. privind utiliz. datelor pot diferi."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Măsurat cu telefonul dvs. Evidenţele operat. privind utiliz. datelor pot diferi."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"limitată"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Dezactivaţi datele mobile?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Setaţi limita pentru date mobile"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Setaţi limita de date 4G"</string>
@@ -1488,33 +1581,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobile"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Afişaţi setările aplicaţiei"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restricţionaţi datele de fundal"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Dezact. date fundal pt. reţ. date mob. Util. Wi-Fi dacă e disp."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Dezact. date de fundal în reţele mobile. Dacă sunt dispon., utiliz. reţele non-mobile."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Pt. restr. dat. fundal pt. aplic., set. întâi lim. pt. date mob."</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="5651588785118290771">"Această funcţie poate determina oprirea funcţionării unei aplicaţii care depinde de datele din fundal când conexiunea Wi-Fi nu este disponibilă."\n\n"Puteţi găsi mai multe comenzi adecvate pentru utilizarea datelor în setările disponibile din cadrul aplicaţiei."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Această funcţie poate face ca o aplicaţie care depinde de datele de fundal să nu mai funcţioneze când sunt disponibile numai reţele mobile."\n\n"Puteţi găsi comenzi mai adecvate pentru utilizarea datelor în setările disponibile în cadrul aplicaţiei."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Restricţionarea datelor de fundal este posibilă numai dacă aţi setat o limită de date mobile."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activaţi sinc. autom. a datelor?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Modificările aduse conturilor dvs. pe web vor fi copiate în mod automat pe tabletă."\n\n"Unele conturi pot să copieze, de asemenea, în mod automat toate modificările pe care le efectuaţi pe tabletă pe web. Aşa funcţionează un Cont Google."\n\n"Pentru a alege ce tipuri de informaţii se pot sincroniza în fiecare cont, accesaţi Setări &gt; Conturi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Modificările aduse conturilor dvs. pe web vor fi copiate în mod automat pe telefon."\n\n"Unele conturi pot să copieze, de asemenea, în mod automat toate modificările pe care le efectuaţi pe telefon pe web. Aşa funcţionează un Cont Google."\n\n"Pentru a alege ce tipuri de informaţii se pot sincroniza în fiecare cont, accesaţi Setări &gt; Conturi."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Dezact. sinc. autom. a datelor?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Această acţiune va economisi date şi durata bateriei, dar va trebui să sincronizaţi fiecare cont manual pentru a culege informaţiile recente. În plus, nu veţi primi notificări atunci când apar actualizări."</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_warning_editor_title" msgid="3704136912240060339">"Setaţi un avertisment de utilizare a datelor"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setaţi o limită de utilizare a datelor"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitarea utilizării datelor"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Conexiunea de date <xliff:g id="NETWORKS">%1$s</xliff:g> va fi dezactivată la atingerea limitei specificate."\n\n"Din moment ce utilizarea de date este măsurată cu tableta dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să folosiţi o limită estimativă."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Conexiunea de date <xliff:g id="NETWORKS">%1$s</xliff:g> va fi dezactivată la atingerea limitei specificate. "\n\n"Din moment ce utilizarea de date este măsurată cu telefonul dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să folosiţi o limită estimativă."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate."\n\n"Din moment ce utilizarea de date este măsurată de tableta dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să utilizaţi o limită estimativă."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate."\n\n"Din moment ce utilizarea de date este măsurată de telefonul dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să utilizaţi o limită estimativă."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restricţionaţi datele de fundal?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Dacă limitaţi datele mobile de fundal, unele aplicaţii şi servicii nu vor funcţiona decât dacă sunteţi conectat(ă) la o reţea Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: aproximativ <xliff:g id="TOTAL">%1$s</xliff:g> utilizaţi"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: aproximativ <xliff:g id="TOTAL">%1$s</xliff:g> utilizaţi."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> utilizaţi, conform tabletei. Contabilizarea operatorului poate diferi."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> utilizaţi, conform tel. Contabilizarea operatorului dvs. poate diferi."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Hotspoturi mobile"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selectaţi reţelele Wi-Fi care sunt hotspoturi mobile. Utilizarea acestor reţele de către aplicaţii poate fi restricţionată când ele se află în fundal. De asemenea, aplicaţiile pot emite o avertizare înainte de a utiliza aceste reţele pentru descărcări mari."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Reţele mobile"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Reţele Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Pentru a selecta hotspoturi mobile, activaţi Wi-Fi."</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>
@@ -1540,12 +1645,14 @@
     <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_edit" msgid="8647191407179996943">"Editaţi profilul VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Conectaţi-vă la <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Adăugaţi un profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Editaţi profilul"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Ştergeţi profilul"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Nu există nicio conexiune la reţea. Încercaţi din nou mai târziu."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Lipseşte un certificat. Editaţi profilul."</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>
@@ -1554,25 +1661,7 @@
     <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="477937585801538951">"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 uşor cu degetul pe ecran."</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="3973201880357468747">"Pentru a activa o aplicaţie, apăsaţi pe pictograma corespunzătoare. Glisaţi uşor 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="8764686624055084454">"Pentru a derula o listă, puteţi să glisaţi uşor cu 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 uşor 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="3055831259260848004">"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="spellcheckers_settings_title" msgid="399981228588011501">"Verificator ortografic"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Introduceţi aici parola actuală pentru copia de rezervă completă"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introduceţi aici o parolă nouă pentru copiile de rezervă complete"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Reintroduceţi aici noua parolă pentru copia de rezervă completă"</string>
@@ -1580,4 +1669,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anulaţi"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualizări de sistem suplimentare"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Utilizatori şi restricţii"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Utilizatori"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugaţi utilizator"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Editaţi detaliile"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Informaţii despre utilizator"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Nume"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restricţii pentru conţinut"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Este necesar codul PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Evaluarea conţinutului"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicaţii de sistem"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicaţii instalate"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Renunţaţi"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Elimin. utilizatorul"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Copil cicălitor"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Eliminaţi utilizatorul?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Sigur doriţi să eliminaţi de pe dispozitiv utilizatorul şi toate datele asociate acestuia?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Afişaţi notificările"</string>
+    <string name="help_label" msgid="1107174367904110532">"Ajutor"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 7d669bb..da052fd 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Отключение..."</item>
     <item msgid="1634960474403853625">"Нет подключения"</item>
     <item msgid="746097431216080650">"Сбой"</item>
+    <item msgid="6367044185730295334">"Заблокировано"</item>
+    <item msgid="503942654197908005">"Временно избегать плохого соединения"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Отключение от <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Нет подключения"</item>
     <item msgid="8578370891960825148">"Сбой"</item>
+    <item msgid="5660739516542454527">"Заблокировано"</item>
+    <item msgid="1805837518286731242">"Временно избегать плохого соединения"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Push-кнопка"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Нет"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN-код точки доступа"</item>
-    <item msgid="7364462169350112617">"PIN-код этого устройства"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Пользовательские"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Съемная SD-карта"</item>
     <item msgid="4498124044785815005">"На усмотрение системы"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Выкл."</item>
-    <item msgid="4804571292609523335">"Вибросигнал"</item>
-    <item msgid="595707141547423573">"Вкл."</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Небольшая"</item>
     <item msgid="2560532955514699713">"Средняя"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Анимация (масштаб: 5x)"</item>
     <item msgid="6660750935954853365">"Анимация (масштаб: 10x)"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Без анимации"</item>
+    <item msgid="1138649021950863198">"Скорость 0,5x"</item>
+    <item msgid="4394388961370833040">"Скорость 1x"</item>
+    <item msgid="8125427921655194973">"Скорость 1,5x"</item>
+    <item msgid="3334024790739189573">"Скорость 2x"</item>
+    <item msgid="3170120558236848008">"Скорость 5x"</item>
+    <item msgid="1069584980746680398">"Скорость 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартное ограничение"</item>
     <item msgid="4071574792028999443">"Без фоновых процессов"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b206d8e..0a07d3c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Да"</string>
     <string name="no" msgid="6731231425810196216">"Нет"</string>
+    <string name="create" msgid="3578857613172647409">"Создать"</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>
@@ -111,6 +112,8 @@
     <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_device_details" msgid="4594773497930028085">"Настройки устройства"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Настройки профиля"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Без настройки имени, использовать имя аккаунта"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Поиск устройств"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Переименовать планшетный ПК"</string>
@@ -131,13 +134,12 @@
     <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="5655704645616731277">"Выберите устройство"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Устройства 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="1931617700075106801">"Нажмите для подключения к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Нажмите для подключения к устройству \"<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="device_picker" msgid="8398232791303186677">"Выбор устройства"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запрос разрешения на включение Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Приложение запрашивает разрешение включить Bluetooth. Разрешить?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Одному из приложений нужно, чтобы ваш планшетный ПК был доступен для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Включить Bluetooth?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Нажмите, чтобы подключиться к устройству \"<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_acceptance_dialog_text" msgid="6555508756987053866">"Устройство \"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ОК"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Введено недействительное имя хоста."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Список исключений отформатирован неверно. Перечислите исключаемые домены через запятую."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Необходимо заполнить поле порта."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Укажите порт."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Если поле хоста не заполнено, поле порта также следует оставить пустым."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Указанный порт недействителен."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прокси-сервер HTTP используется браузером, но недоступен для других приложений."</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"Изменения вступят в силу после повторного подключения USB-кабеля"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Изменения вступят в силу после повторного подключения 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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB-накопитель не подключен."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Нет 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="6691584887397909775">"USB-накопитель можно отключить"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Теперь можно извлечь SD-карту"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB-накопитель используется как запоминающее устройство."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD-карта используется как запоминающее устройство."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"USB-накопитель можно извлечь."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"SD-карту можно извлечь."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Накопитель извлечен при исп.!"</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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Только для чтения."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Только для чтения."</string>
     <string name="skip_label" msgid="47510779345218297">"Далее"</string>
     <string name="next_label" msgid="4693520878012668114">"Далее"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Язык"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"Возможны высокие расходы на использование роуминга."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Разрешить интернет-роуминг?"</string>
     <string name="networks" msgid="6333316876545927039">"Выбор оператора"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Выберите оператора связи"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата и время"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"Формат даты"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Настройка распознавания"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Настоящий фейсконтроль"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Моргать обязательно"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Функция шифрования доступна для аккаунтов, настроек, загруженных приложений и их данных, а также для мультимедийных и прочих файлов. После шифрования данных планшетного ПК при каждом его включении необходимо будет вводить числовой PIN-код или пароль для дешифрования. Единственный способ отключить шифрование – сброс настроек, в результате которого все данные будут потеряны."\n\n"Шифрование занимает не менее часа. Перед его запуском необходимо подключить зарядное устройство и не отключать его до завершения операции. В случае ее прерывания данные будут потеряны полностью или частично."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Шифрование доступно для аккаунтов, настроек, загруженных приложений и их данных, а также для мультимедийных и прочих файлов. После шифрования данных телефона при каждом его включении необходимо будет вводить числовой PIN-код или пароль, чтобы выполнить дешифрование данных. Единственный способ отключить шифрование – сброс настроек, в результате которого все данные будут потеряны."\n\n"Шифрование займет не менее одного часа. Перед его запуском необходимо подключить зарядное устройство и не отключать его до окончания операции. В случае прерывания шифрования будут потеряны все данные или часть из них."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить PIN-код или пароль. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные."\n\n"Шифрование занимает не менее часа. Батарея должна быть полностью заряжена, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать его, данные будут частично или полностью потеряны."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить 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="2029407131227814893">"Зарядите батарею и повторите попытку."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Подключите зарядное устройство и повторите попытку."</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_dialog_need_password_message" msgid="4071395977297369642">"Перед шифрованием необходимо задать PIN-код или пароль блокировки экрана."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Выполнить шифрование?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа, в течение которого устройство будет перезагружено несколько раз."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Если прервать шифрование, данные будут потеряны. Операция займет не менее часа, в течение которого устройство будет перезагружено несколько раз."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифрование"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Дождитесь завершения шифрования планшета. Выполнено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Дождитесь завершения шифрования телефона. Выполнено: <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="2223340178473871064">"Введите пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Сбой шифрования"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Данные на вашем планшетном ПК больше недоступны из-за прерванного шифрования."\n\n"Чтобы продолжить использовать устройства, выполните сброс до заводских настроек. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Данные на вашем телефоне больше недоступны из-за прерванного шифрования."\n\n"Чтобы продолжить использовать устройство, выполните сброс до заводских настроек. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Тип блокировки"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Данные на вашем планшетном ПК больше недоступны из-за того, что шифрование было прервано. "\n\n"Чтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Данные на вашем телефоне больше недоступны из-за того, что шифрование было прервано. "\n\n"Чтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Сменить способ ввода"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Блокировка экрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Доп. способ блокировки"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокировка экрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Изменение блок. экрана"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Фейсконтроль"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Графический ключ"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-код"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Пароль"</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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"ПИН-код должен содержать не менее %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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Пароль должен содержать не более <xliff:g id="NUMBER">%d</xliff:g> симв."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-код должен содержать не более <xliff:g id="NUMBER">%d</xliff:g> зн."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN-код должен состоять из цифр от 0 до 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Использовать недавний PIN-код запрещено."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Пароль содержит недопустимые символы."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Пароль должен содержать хотя бы одну букву."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Пароль должен содержать хотя бы одну цифру."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Пароль должен содержать хотя бы один символ."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"Пароль должен содержать хотя бы 1 букву"</item>
-    <item quantity="other" msgid="7278096339907683541">"Пароль должен содержать буквы (не менее %d)"</item>
+    <item quantity="one" msgid="3063853802158131458">"Пароль должен содержать хотя бы одну букву."</item>
+    <item quantity="other" msgid="8186027808415585970">"Пароль должен содержать буквы (не менее %d)."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"Пароль должен содержать хотя бы 1 строчную букву"</item>
-    <item quantity="other" msgid="588499075580432178">"Пароль должен содержать строчные символы (не менее %d)"</item>
+    <item quantity="one" msgid="5583986519662091001">"Пароль должен содержать хотя бы одну строчную букву."</item>
+    <item quantity="other" msgid="2693910942679679225">"Пароль должен содержать строчные буквы (не менее %d)."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"Пароль должен содержать хотя бы 1 заглавную букву"</item>
-    <item quantity="other" msgid="2183090598541826806">"Пароль должен содержать заглавные буквы (не менее %d)"</item>
+    <item quantity="one" msgid="2611909966725502768">"Пароль должен содержать хотя бы одну заглавную букву."</item>
+    <item quantity="other" msgid="3030801209112209245">"Пароль должен содержать заглавные буквы (не менее %d)."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"Пароль должен содержать хотя бы 1 цифру"</item>
-    <item quantity="other" msgid="995673409754935278">"Пароль должен содержать цифры (не менее %d)"</item>
+    <item quantity="one" msgid="3820355568839621231">"Пароль должен содержать хотя бы одну цифру."</item>
+    <item quantity="other" msgid="4703982391407595924">"Пароль должен содержать цифры (не менее %d)."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"Пароль должен содержать хотя бы 1 специальный символ."</item>
-    <item quantity="other" msgid="3047460862484105274">"Пароль должен содержать специальные символы (не менее %d)"</item>
+    <item quantity="one" msgid="8456579939292408631">"Пароль должен содержать хотя бы один специальный символ."</item>
+    <item quantity="other" msgid="1221290525051187757">"Пароль должен содержать специальные символы (не менее %d)."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"Пароль должен содержать хотя бы 1 небуквенный символ."</item>
-    <item quantity="other" msgid="5574191164708145973">"Пароль должен содержать небуквенные символы (не менее %d)"</item>
+    <item quantity="one" msgid="4594051152085925921">"Пароль должен содержать хотя бы один небуквенный символ."</item>
+    <item quantity="other" msgid="3952508584649046404">"Пароль должен содержать небуквенные символы (не менее %d)."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Администратор устройства запрещает использование последнего пароля"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Использовать недавний пароль запрещено."</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="lock_setup" msgid="1759001157415978959">"Настройка завершена"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Блокировка настроена."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Для подключения к устройству <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> введите пароль:"</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_enter_pin_other_device" msgid="4637977124526813470">"Возможно, потребуется ввести PIN-код на другом устройстве."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Возможно, потребуется ввести ключ доступа на другом устройстве."</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="2796550001376088433">"Для подключения к устройству <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> введите на нем код <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, а затем нажмите клавишу Return или Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Не удалось подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", так как введен неверный PIN-код или пароль."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Не удается установить соединение с устройством \"<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_connecting_error_message" msgid="229861986106185022">"Не удалось подключиться к <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Разрешить обмен данными при совмещении телефона с другим устройством"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Разрешить обмен данными при совмещении планшета с другим устройством"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Разрешить обмен данными при совмещении телефона с другим устройством"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Обмен данными по NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Выключено"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно, так как отключена связь малого радиуса действия"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Когда включена эта функция, данные приложений можно передавать на другие устройства с поддержкой связи малого радиуса действия. Например, отправлять страницы браузера, видео YouTube, контакты и другие сведения."\n\n"Просто разместите устройства поблизости (например, совместите их задние панели) и коснитесь экрана. Передаваемые данные зависят от приложения."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Обнаружение сетевых служб"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Разрешить приложениям на других устройствах обнаруживать приложения на этом устройстве"</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="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_setup_wizard_title" msgid="70277346338812325">"Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не удалось начать поиск сетей."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Уведомления о сетях"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Сообщать при обнаружении открытой сети"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Фильтр сетей Wi-Fi"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Не использовать сети Wi-Fi с плохим интернет-соединением"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Фильтр сетей Wi-Fi"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Не использовать сети Wi-Fi с плохим интернет-соединением"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"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_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Вход по PIN-коду WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Поиск сетей Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Другие сети…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Ещё"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Автонастройка (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Дополнительно"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"Введите PIN-код точки доступа"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Настройка WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Введите 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_wps_setup_title" msgid="6034518116333042484">"Безопасная настройка Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запуск WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Нажмите кнопку \"Безопасная настройка Wi-Fi\" на своем маршрутизаторе. Она может называться WPS, а также содержать следующий символ:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Введите PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> на маршрутизаторе Wi-Fi. Для завершения настройки потребуется не более двух минут."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Ошибок нет. Подключение к сети…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Установлено подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Выполняется настройка WPS. На завершение этого процесса потребуется не более двух минут."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Ошибка. Повторите попытку через несколько минут."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Безопасная настройка беспроводного маршрутизатора (WEP) не поддерживается"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Безопасная настройка беспроводного маршрутизатора (TKIP) не поддерживаются"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ошибка аутентификации. Повторите попытку."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Обнаружен другой сеанс WPS. Повторите попытку через несколько минут."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Имя сети (SSID)"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безопасность"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Уровень сигнала"</string>
@@ -530,27 +552,27 @@
     <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_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="3111321240793227690">"Включено"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Сеть отклонена, так как соединение неустойчивое. Чтобы изменить параметры, выберите \"Настройки &gt; Wi-Fi\" и откройте меню \"Дополнительные функции\"."</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="3538912605343585226">"Доступна защищенная сеть"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (доступна защищенная сеть)"</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_failed_connect_message" msgid="8491902558970292871">"Не удалось подключиться к сети."</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"Удалить"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Не удалось удалить сеть."</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сохранить"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не удалось сохранить сеть."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отмена"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Обнаружен другой защищенный сеанс Wi-Fi. Повторите попытку позже."</string>
     <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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Длина префикса сети"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Настройка одноранговых подключений"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Информация об устройстве"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"WPS"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Введите 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_remove_group" msgid="4844634506540667517">"Удалить группу"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Дополнительно"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Список"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Поиск устройств"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Поиск…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Переименовать устройство"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Обнаруженные устройства"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Не удалось подключиться."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Не удалось переименовать устройство."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Отключиться?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"После отключения соединение с <xliff:g id="PEER_NAME">%1$s</xliff:g> будет прервано."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"После отключения соединение с \"<xliff:g id="PEER_NAME">%1$s</xliff:g>\" и другими устройствами (<xliff:g id="PEER_COUNT">%2$s</xliff:g>) будет прервано."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Отмена приглашения"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы собираетесь отменить приглашение на подключение к устройству \"<xliff:g id="PEER_NAME">%1$s</xliff:g>\". Продолжить?"</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_configure_ap_text" msgid="3474995108398156258">"Настройка точки доступа"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Настройка точки доступа"</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="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Режим без звука"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Громкость"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Звуковые эффекты"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Громкость звонка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Виброзвонок без звука"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Вибросигнал и рингтон"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Отключить рингтон и другие уведомления"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Отключить звук"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Скрыть уведомления"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Скрыть оповещения"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вибросигнал и рингтон"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"Чтобы настроить док-станцию, установите в нее планшетный ПК."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Чтобы настроить док-станцию, установите в нее телефон."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Чтобы настроить док-станцию, установите в нее планшетный ПК."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Чтобы настроить док-станцию, установите в нее телефон."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Звук при установке в док-станцию"</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="account_settings" msgid="6403589284618783461">"Аккаунты"</string>
     <string name="search_settings" msgid="1910951467596035063">"Поиск"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Настроить параметры и управлять историей поиска"</string>
     <string name="display_settings" msgid="7965901687241669598">"Экран"</string>
@@ -682,7 +710,7 @@
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Отмена"</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_title" msgid="3342887311059985961">"Обновление системы"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Версия Android"</string>
     <string name="model_number" msgid="3765737700545384794">"Модель"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"Версия 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>
@@ -810,7 +838,7 @@
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Возврат к заводским настройкам и удаление всех данных из памяти телефона"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:"\n\n<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Будут удалены все данные из "<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_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="7744115866662613411">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"USB-накопитель"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Удалить всю личную информацию и загруженные приложения без возможности восстановления?"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Стереть все"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Начертить графический ключ"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Для подтверждения сброса настроек необходимо начертить графический ключ."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Чтобы подтвердить сброс настроек, начертите графический ключ."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Сброс не выполнен, поскольку служба System Clear недоступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Выполнить сброс?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Очистить USB-накопитель"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Удалить с 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="nosdcard" msgid="2192044794228379224">"Чтобы подтвердить очистку USB-накопителя, начертите графический ключ."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Чтобы подтвердить очистку 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="6688416425801386511">"USB-модем"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
     <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
     <string name="location_network_based" msgid="5569673665032992664">"По координатам сети"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Использовать Wi-Fi и мобильные сети для определения местоположения"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Разрешить отправку анонимных данных о местоположении и позволить приложениям определять его с помощью 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>
@@ -882,7 +910,7 @@
     <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="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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Для справки нажмите \"Меню\"."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"По завершении отпустите палец."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Соедините точки (как минимум <xliff:g id="NUMBER">%d</xliff:g>). Повторите попытку:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Графический ключ разблокировки записан!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Графический ключ сохранен."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Для подтверждения начертите графический ключ повторно:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Новый графический ключ разблокировки:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Подтвердить"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Далее"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Безопасность планшетного ПК"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Обеспечение безопасности телефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Создайте графический ключ разблокировки экрана, и никто, кроме вас, не сможет воспользоваться вашим планшетом. Для этого соедините в произвольном порядке не менее четырех точек на экране. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Создайте графический ключ разблокировки экрана, и никто, кроме вас, не сможет воспользоваться вашим планшетным ПК. Для этого соедините в произвольном порядке не менее четырех точек на экране. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Чтобы никто, кроме вас, не мог воспользоваться вашим телефоном, создайте графический ключ разблокировки экрана. Для этого соедините в произвольном порядке не менее четырех точек на следующем экране. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управление приложениями"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление установленными приложениями и их удаление"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Управление приложениями, настройка клавиш быстрого запуска"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Настройки приложения"</string>
     <string name="install_applications" msgid="4872012136210802181">"Неизвестные источники"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Разрешить установку приложений, полученных не из Маркета"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Разрешить установку приложений из неизвестных источников"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Ваши личные данные и данные планшетного ПК более уязвимы для атак приложений из неизвестных источников. Вы соглашаетесь с тем, что несете полную ответственность за любой ущерб, нанесенный планшетному ПК, и потерю данных, связанные с использованием этих приложений."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ваши личные данные и данные телефона более уязвимы для атак приложений из неизвестных источников. Вы соглашаетесь с тем, что несете полную ответственность за любой ущерб, нанесенный телефону, и потерю данных, связанные с использованием этих приложений."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Расширенные настройки"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"О приложении"</string>
     <string name="storage_label" msgid="8700867073480107253">"Память"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Запуск по умолчанию"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"По умолчанию"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Совместимость с экраном"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Разрешения"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кэш"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Стереть данные"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Удалить обновления"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Это приложение по умолчанию используется для некоторых действий."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Это приложение может создавать виджеты и получать их данные."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Значения по умолчанию не установлены."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Удалить настройки по умолчанию"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Возможно, приложение не предназначено для вашего экрана. Здесь можно настроить параметры его отображения."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Упорядочить по размеру"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Показать активные службы"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Показать процессы в кэше"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Сбросить настройки"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Сбросить настройки?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Будут сброшены следующие настройки:"\n\n" "<li>"список отключенных приложений;"</li>\n" "<li>"уведомления для отключенных приложений;"</li>\n" "<li>"список приложений по умолчанию;"</li>\n" "<li>"ограничения на передачу данных в фоновом режиме."</li>\n\n" Данные приложений удалены не будут."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Да"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управление местом"</string>
     <string name="filter" msgid="2018011724373033887">"Фильтр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Выберите параметры фильтра"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"У этого приложения есть доступ к следующей информации на устройстве:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"У этого приложения есть доступ к следующей информации на устройстве:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Вычисление..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"Не удалось вычислить размер пакета"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"Не удалось определить размер пакета."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Нет приложений сторонних разработчиков."</string>
     <string name="version_text" msgid="9189073826278676425">"Версия <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Переместить"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Изменить папку для установки приложений"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Отключить приложение?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Отключение встроенной службы может нарушить работу других приложений."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Отключить уведомления?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Если в настройках этого приложения отключены уведомления, вы можете пропустить важные оповещения и обновления."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Использование памяти"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Объем памяти, занимаемый приложениями"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Работающие приложения"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"При использовании этого способа могут собираться все вводимые данные, в том числе пароли и номера кредитных карт. Способ ввода запрашиваетя приложением \"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>\". Использовать этот способ ввода?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Для проверки орфографии будет использоваться приложение <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>, которое может собирать все вводимые данные, в том числе пароли и номера кредитных карт. Продолжить?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Настройки"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Язык"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Не удалось открыть настройки приложения \"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>\""</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Мышь и сенсорная панель"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Скорость указателя"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Игровые контроллеры"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Виброотклик"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Включать виброотклик на игровом контроллере"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Выбор раскладки клавиатуры"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Настроить раскладки клавиатуры"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Для смены нажмите CTRL + Пробел"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"По умолчанию"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Раскладка клавиатуры"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Словарь пользователя"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Пользовательский словарь"</string>
     <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_add_screen_title" msgid="742580720124344291">"Фраза"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Больше настроек"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Меньше настроек"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"ОК"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Слово:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Быстрые клавиши:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Язык:"</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="8165273379942105271">"В пользовательском словаре пока ничего нет. Добавлять слова можно с помощью кнопки \"Добавить ( + )\"."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Все языки"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Для всех языков"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Другой язык"</string>
     <string name="testing" msgid="6584352735303604146">"Проверка"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информация о планшетном ПК"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информация о телефоне"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Настройка параметров для разработчиков"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отладка по USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Включить режим отладки при подключении к компьютеру по USB"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Идентификатор устройства"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Информация об устройстве недоступна"</string>
-    <string name="keep_screen_on" msgid="1146389631208760344">"Оставить включенным"</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="7316799925425402244">"Отладка по USB – это режим, который позволяет использовать ваше устройство как внешний накопитель: перемещать файлы (с компьютера и на компьютер), напрямую устанавливать приложения, а также просматривать системные журналы."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Изменение настроек"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Только для разработчиков. Изменение этих настроек может привести к сбоям или неправильной работе устройства и приложений."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Защитить USB-накопитель"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Запрашивать разрешение для считывания данных с USB-накопителя"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Защитить USB-накопитель?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Если USB-накопитель защищен, приложения должны запрашивать разрешение для считывания данных с него."\n\n"Некоторые приложения могут не работать. В этом случае дождитесь, пока они не обновятся."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Защитить SD-карту"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Запрашивать разрешение для считывания данных с SD-карты"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Защитить SD-карту?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Если SD-карта защищена, приложения должны запрашивать разрешение для считывания данных с нее."\n\n"Некоторые приложения могут не работать. В этом случае дождитесь, пока они не обновятся."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Выбор гаджета"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Выбор виджета"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Создать виджет и разрешить доступ?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Когда вы создаете виджет, приложение \"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>\" получает доступ ко всем его данным."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Всегда разрешать приложению \"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>\" создавать виджеты и получать их данные"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Большой текст"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Кнопка питания завершает вызов"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Озвучивать пароли"</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="3264723681038625967">"Установка веб-скриптов"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Расширение доступности"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Службы не установлены"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Нужна программа чтения с экрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Бесплатное приложение TalkBack дает голосовое описание элементов интерфейса для пользователей с нарушением зрения. Установить его из Android Маркета?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Установить веб-скрипты?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Разрешить приложениям устанавливать скрипты Google для повышения доступности веб-контента?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Эта функция меняет способ сенсорной навигации устройства. Включить?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Нет описания"</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_not_available" msgid="3214000535532434353">"Расход батареи неизвестен."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"Невозможно запустить синтезатор речи."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Настроить"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Выбрать другую систему"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Данная система синтеза речи может записывать произносимые слова, включая личные данные, такие как пароли и номера кредитных карт. Это осуществляет система <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Разрешить использование этой системы синтеза речи?"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"Включите новый модуль."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Начертите графический ключ"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Чтобы подтвердить установку учетных данных, начертите графический ключ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Введите пароль для хранилища учетных данных."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текущий пароль:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Хранилище регистрационных данных очищено."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Не удалось очистить хранилище."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилище регистрационных данных включено."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Прежде чем использовать хранилище учетных данных, необходимо задать PIN-код или пароль для блокировки экрана."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Перед использованием хранилища учетных данных необходимо задать PIN-код или пароль блокировки экрана."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тональный сигнал экстренного вызова"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Восстановление и сброс"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Автовосстановление"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При переустановке приложения восстановить резервную копию настроек и данных"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для резервного копирования"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Полные резервные копии в настоящее время не защищены."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Выберите этот параметр, чтобы изменить или удалить пароль для резервного копирования"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Полные резервные копии в настоящее время не защищены"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Изменить или удалить пароль для резервного копирования"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Прекратить резервное копирование паролей точек доступа Wi-Fi, закладок, других настроек и данных приложений, а также удалить все копии с серверов Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Настройки администрирования устройства"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Администратор активирован и разрешает приложению <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">"Рингтон и уведомления"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Оповещения"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Отклик на действия"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Вибросигнал и рингтон"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"Системные уведомления"</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="3747859666621319757">"Подключение к сети Wi-Fi: <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -1375,7 +1438,7 @@
     <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_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="5317003416385428036">"Поиск доступных сетей..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Ошибка синхронизации"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Синхронизация активна"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Синхронизация"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Проблемы с синхронизацией. Скоро все заработает."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Добавить аккаунт"</string>
     <string name="background_data" msgid="5779592891375473817">"Фоновый режим"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Синхронизация включена"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Синхронизация выключена"</string>
     <string name="sync_error" msgid="5060969083117872149">"Ошибка синхронизации"</string>
+    <string name="last_synced" msgid="4242919465367022234">"Последняя синхронизация: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Синхронизация…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Добро пожаловать в Google Sync."</font>\n"Технология синхронизации Google позволяет получать данные о контактах, встречах в календаре и многом другом с любого устройства."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Настройки синхронизации"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Cинхронизация данных"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Изменить пароль"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Аккаунт необходим для доступа к некоторым приложениям. Чтобы удалить его, нужно восстановить на устройстве настройки по умолчанию (в результате все личные данные будут удалены). Это можно сделать в разделе \"Настройки &gt; Резервное копирование и сброс\"."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Аккаунт необходим для доступа к некоторым приложениям. Чтобы удалить его, нужно восстановить на устройстве настройки по умолчанию (в результате все личные данные будут удалены). Это можно сделать в разделе \"Настройки &gt; \"Резервное копирование и сброс\"."</string>
     <string name="provider_label" msgid="7724593781904508866">"Подписки на рассылки оператора"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Не удалось синхронизировать данные"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизация отключена. Чтобы включить ее, временно разрешите передачу данных в фоновом режиме и автоматическую синхронизацию."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Настройки 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"МАС-адрес для 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Введите пароль для расшифровки данных хранилища"</string>
     <string name="try_again" msgid="4272075051293936921">"Повторите попытку."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Служба занята. Повторите попытку."</string>
     <string name="delete" msgid="4219243412325163003">"Удалить"</string>
     <string name="misc_files" msgid="6720680815969643497">"Разное"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"Выбрать все"</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="debug_debugging_category" msgid="6781250159513471316">"Отладка"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Выберите приложение для отладки"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Приложение для отладки не задано"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Отладка приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="select_application" msgid="5156029161289091703">"Выбор приложения"</string>
+    <string name="no_application" msgid="2813387563129153880">"Ничего"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Подождите, пока подключится отладчик"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Приложение ожидает подключения отладчика"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Ввод текста"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Рисование"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Мониторинг"</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="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_touches_summary" msgid="6684407913145150041">"Отображать точки в местах нажатия на экран"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Показ. обнов. поверхности"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Подсвечивать окна полностью при их обновлении"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Показывать обнов. экрана"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Подсвечивать области экрана при отрисовке с GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Откл. аппарат. наложения"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Всегда использовать GPU при компоновке экрана"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Включить трассировки"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Включение трассировок"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Все трассировки отключены"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Включено трассировок: <xliff:g id="NUM">%1$d</xliff:g>"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Все трассировки включены"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Показывать границы макета"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Показывать границы клипа, поля и т. д."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показывать загрузку ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Экран, показывающий текущую загрузку ЦП"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Ускорить работу GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Использовать аппаратное ускорение 2D в приложениях"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Всегда использовать GPU для двухмерного рисования"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Запись времени работы GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Измерение времени для adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Окно: масштаб"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Переход: масштаб"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Скорость анимации"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Приложения"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не сохранять действия"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Удалять сводку действий после их завершения"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Точки доступа к моб. сети"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Автосинхронизация данных"</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="8621855507876539282">"В этот период не было трафика от приложений."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Активный режим"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Фоновый режим"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Определено устройством. Объем трафика, учтенный оператором, может отличаться."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Определено устройством. Объем трафика, учтенный оператором, может отличаться."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"доступ ограничен"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Отключить мобильную передачу данных?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Установить лимит"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Лимитировать трафик 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Моб. сети"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Нет сетей"</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="8430240158135453271">"Настройки приложения"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Лимит фон. данных"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Отключить фоновый режим для мобильных сетей. Использовать Wi-Fi."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Откл. фоновый режим для моб. сетей (использовать другие сети)"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Сначала установите лимит для мобильного трафика."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ограничение фонового режима"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Если нет доступа к Wi-Fi, эта функция может приостановить приложения, использующие фоновый режим обмена данными."\n\n"Более подходящие параметры можно найти в настройках этих приложений."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Если будут доступны только мобильные сети, программы, зависящие от фонового режима, могут перестать работать."\n\n"Установите другие параметры передачи данных в настройках приложения."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ограничение фонового режима возможно только при лимитировании мобильного трафика."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Включить автосинхронизацию?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство."\n\n"В некоторых случаях также выполняется обратная синхронизация."\n\n"Чтобы указать для каждого аккаунта, какие данные нужно синхронизировать, перейдите в меню \"Настройки &gt; Аккаунты\"."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство."\n\n"В некоторых случаях также выполняется обратная синхронизация."\n\n"Чтобы указать для каждого аккаунта, какие данные нужно синхронизировать, перейдите в меню \"Настройки &gt; Аккаунты\"."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Отключить автосинхронизацию?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Это сократит трафик и расход энергии. Однако чтобы получать новые данные, необходимо будет синхронизировать каждый аккаунт вручную. При этом уведомления об обновлениях отображаться не будут."</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_warning_editor_title" msgid="3704136912240060339">"Настройка предупреждения"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Лимитирование трафика"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Объем трафика ограничен"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Когда лимит трафика будет исчерпан, передача данных по сетям <xliff:g id="NETWORKS">%1$s</xliff:g> прекратится."\n\n"Старайтесь не достигать лимита, так как оператор и устройство могут учитывать трафик по-разному."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Когда лимит трафика будет исчерпан, передача данных по сетям <xliff:g id="NETWORKS">%1$s</xliff:g> прекратится."\n\n"Старайтесь не достигать лимита, так как оператор и устройство могут учитывать трафик по-разному."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"По достижении лимита трафика передача данных по мобильной сети будет отключена."\n\n"Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"По достижении лимита трафика передача данных по мобильной сети будет отключена."\n\n"Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ограничение фонового режима"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> (трафик, определенный устройством). Данные оператора могут отличаться."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> (трафик, определенный устройством). Данные оператора могут отличаться."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Точки доступа к моб. сети"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Выберите сети Wi-Fi с тарификацией трафика. Возможно, приложения не смогут использовать их для работы в фоновом режиме. Кроме того, перед загрузкой больших объемов данных может появляться предупреждение."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобильные сети"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Сети Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Чтобы выбрать точку доступа, включите Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Изменение профиля VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Подключение к профилю \"<xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Добавить профиль VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Изменить профиль"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Удалить профиль"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Отсутствует сетевое соединение. Повторите попытку позже."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Отсутствует сертификат. Измените профиль."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"Функция \"Изучение касанием\" позволяет узнавать, к чему вы прикоснулись на экране. Например, сейчас отображаются значки приложений. Попробуйте найти их на ощупь."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Хорошо. Проведите пальцем по экрану, пока не найдете по крайней мере еще один значок."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Чтобы активировать элемент, нажмите на него. Перелистывайте экран, пока не найдете значок <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="8764686624055084454">"Чтобы прокрутить список, проведите двумя пальцами по экрану. Сейчас на экране отображен список названий приложений. Для начала найдите в нем несколько элементов, проведя пальцем по экрану."</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="3055831259260848004">"Это всё. Чтобы выйти, нажмите кнопку \"<xliff:g id="FINISH">%s</xliff:g>\"."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Проверка орфографии"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Проверка правописания"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Введите текущий пароль"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Введите новый пароль"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Подтвердите пароль"</string>
@@ -1582,4 +1670,22 @@
     <!-- no translation found for percentage (5866131581207788624) -->
     <skip />
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дополнительные обновления системы"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Ограничения пользователей"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Пользователи"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Добавить пользователя"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Изменить сведения"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Информация о пользователе"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Имя"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Ограничения на контент"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Требуется PIN-код"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Рейтинг контента"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Системные приложения"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Установленные приложения"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Отменить"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Удалить"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Удалить аккаунт?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Действительно удалить с устройства аккаунт пользователя и все его данные?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Включить уведомления"</string>
+    <string name="help_label" msgid="1107174367904110532">"Справка"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 78b4862..6b04bed 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Prebieha odpájanie..."</item>
     <item msgid="1634960474403853625">"Odpojený"</item>
     <item msgid="746097431216080650">"Neúspešné"</item>
+    <item msgid="6367044185730295334">"Blokované"</item>
+    <item msgid="503942654197908005">"Dočasne bolo zabránené slabému pripojeniu"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Prebieha odpájanie od siete <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="197508606402264311">"Odpojený"</item>
     <item msgid="8578370891960825148">"Neúspešné"</item>
+    <item msgid="5660739516542454527">"Blokované"</item>
+    <item msgid="1805837518286731242">"Dočasne bolo zabránené slabému pripojeniu"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Stlačenie tlačidla"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Žiadne"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Kód PIN z prístup. bodu"</item>
-    <item msgid="7364462169350112617">"Kód PIN zo zariadenia"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statická"</item>
@@ -211,15 +211,10 @@
     <item msgid="3738430123799803530">"Odnímateľná karta SD"</item>
     <item msgid="4498124044785815005">"Automaticky vyberie systém"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Vypnúť"</item>
-    <item msgid="4804571292609523335">"Vibrovať"</item>
-    <item msgid="595707141547423573">"Vypnúť zvuk"</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>
+    <item msgid="3511504869290423954">"Krátka"</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>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Mierka animácie 5x"</item>
     <item msgid="6660750935954853365">"Mierka animácie 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animácia je vypnutá"</item>
+    <item msgid="1138649021950863198">"Mierka animácie 0,5x"</item>
+    <item msgid="4394388961370833040">"Mierka animácie 1x"</item>
+    <item msgid="8125427921655194973">"Mierka animácie 1,5x"</item>
+    <item msgid="3334024790739189573">"Mierka animácie 2x"</item>
+    <item msgid="3170120558236848008">"Mierka animácie 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5976402..5441a07 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Áno"</string>
     <string name="no" msgid="6731231425810196216">"Nie"</string>
+    <string name="create" msgid="3578857613172647409">"Vytvoriť"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabrániť použitiu vytáčania Bluetooth pri uzamknutej obrazovke"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Zariadenia Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Názov zariadenia"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Nastavenia zariadenia"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Nastavenia profilu"</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_rename_device" product="tablet" msgid="787970073150631155">"Premenovať tablet"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Párovanie..."</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="5655704645616731277">"Dotykom spárujete"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"V blízk. nie sú žiadne 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="1931617700075106801">"Zariadenie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ spárujete dotykom"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> spárujete dotykom."</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="device_picker" msgid="8398232791303186677">"Výber zariadenia Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Žiadosť o povolenie zariadenia Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikácia chce zapnúť pripojenie Bluetooth. Povoliť?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikácia v tablete chce prepnúť váš tablet do viditeľného režimu pre ostatné zariadenia Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Povoliť?"</string>
@@ -155,10 +157,10 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"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_12_hour_sample" msgid="3259617262618020574">"1:00 pop."</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zvoľte časové pásmo"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Miestne nastavenie (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Zadaný názov hostiteľa nie je platný."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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_port" msgid="5539106187558215246">"Musíte 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="2671425042711054494">"Zadaný port nie je platný."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Prehliadač používa server proxy pre protokol HTTP, ale ostatné aplikácie ho používať nemusia."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Nastaviť"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Neúspešné"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Úspešné"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Zmena sa prejaví pri ďalšom pripojení kábla USB."</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Zmena sa prejaví pri ďalšom pripojení kábla USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Povoliť veľkokapacitné pamäťové zariadenie USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Celková kapacita (bajty):"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Ukl. priestor USB nie je pripojený"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Žiadna karta SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Úložisko USB nie je pripojené."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Žiadna karta SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Pamäť k dispozícii (bajty):"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Ukl. priestor USB sa používa ako veľkokapac. pamäťové zariad."</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Karta SD sa používa ako veľkokapacitné pamäťové zariadenie"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Úložisko USB môžete odobrať"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Teraz môžete kartu SD bezpečne odobrať"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Úložisko USB sa používa ako veľkokapacitné pamäťové zariadenie."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Karta SD sa používa ako veľkokapacitné pamäťové zariadenie."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Úložisko USB môžete odobrať."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Teraz môžete kartu SD bezpečne odobrať."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Ukl. priestor USB odstr. počas prevádzky."</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Karta SD bola odstránená počas prevádzky."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Obsadená pamäť (bajty):"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Hľad. médií v ukl. priestore USB..."</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Úložisko USB je pripojené len na čítanie."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Jazyk"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Dátové služby sa môžu pripojiť pri roamingu"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Pripojenie dátových služieb bolo prerušené, pretože ste opustili domovskú sieť a dátové služby pri roamingu máte vypnuté."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Zapnúť"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Naozaj chcete povoliť dátové služby pri roamingu? Môžu sa účtovať vysoké poplatky."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Pozor"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Ak povolíte dátové služby pri roamingu, môžu sa účtovať vysoké poplatky."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Povoliť dátové služby pri roamingu?"</string>
     <string name="networks" msgid="6333316876545927039">"Výber operátora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Zvoliť sieťového operátora"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dátum a čas"</string>
@@ -283,12 +285,14 @@
     <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>
     <string name="date_time_set_date" msgid="7021491668550232105">"Nastavenia dátumu"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Formát dátumu"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Vyberte 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="date_picker_title" msgid="1338210036394128512">"Dátum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Čas"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Zlepšiť priraďovanie tvárí"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Kontrola živosti"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Vyžadovať žmurknutie očami"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"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="3504519024884099702">"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ť aj viac ako 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_desc" product="tablet" msgid="3839235202103924154">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní tabletu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v tablete vymažú."\n\n"Šifrovanie môže trvať aj viac ako 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, stratíte niektoré alebo všetky údaje."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní telefónu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v telefóne vymažú."\n\n"Šifrovanie môže trvať aj viac ako 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, stratíte niektoré alebo 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="2029407131227814893">"Nabite batériu a skúste to znova."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"Pred spustením šifrovania musíte nastaviť heslo alebo kód PIN uzamknutia obrazovky."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Šifrovať?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Operácia šifrovania 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="5682944380460921880">"Operácia šifrovania je nevratná a ak ju prerušíte, prídete o údaje. Šifrovanie môže trvať viac ako hodinu. Telefón sa počas tejto doby 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="6689952371032099350">"Čakajte na dokončenie procesu šifrovania tabletu. Dokončené: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Čakajte na dokončenie šifrovania telefónu. 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="2223340178473871064">"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="6891198717505120682">"Šifrovanie bolo prerušené a nie je možné ho dokončiť. Výsledkom je, že údaje vo vašom tablete už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj tablet, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania tabletu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Šifrovanie bolo prerušené a nie je možné ho dokončiť. Výsledkom je, že údaje vo vašom telefóne už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj telefón, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania telefónu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Vyberte uzam. obrazov."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom tablete už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj tablet, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania tabletu príležitosť obnoviť všetky údaje, ktoré sa zálohovali do vášho účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom telefóne už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj telefón, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania telefónu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Prepnúť metódu vstupu"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zvoľte uzamk. obrazov."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vybrať zámku zálohy"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Odomknutie tvárou"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Vzor"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Heslo"</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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovať najmenej %d znakov"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Heslo musí mať menej ako <xliff:g id="NUMBER">%d</xliff:g> znakov."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Kód PIN musí mať menej ako <xliff:g id="NUMBER">%d</xliff:g> číslic."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Kód PIN musí obsahovať len číslice 0 až 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Správca zariadení neumožňuje používanie nedávneho kódu PIN."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Heslo obsahuje neplatný znak."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Heslo musí obsahovať najmenej jedno písmeno."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Heslo musí obsahovať najmenej jednu číslicu."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Heslo musí obsahovať najmenej jedno písmeno."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Heslo musí obsahovať najmenej jedno malé písmeno."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Heslo musí obsahovať najmenej jedno veľké písmeno."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Heslo musí obsahovať najmenej jednu číslicu."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Heslo musí obsahovať najmenej jeden špeciálny symbol."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Heslo musí obsahovať najmenej jeden znak iný ako písmeno."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Správca zariadení neumožňuje používanie nedávneho hesla."</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="lock_setup" msgid="1759001157415978959">"Nastavenie bolo dokončené"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Nastavenie je dokončené."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Správa 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>
@@ -409,12 +414,12 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Správa pripojenia, nastavenie názvu zariadenia a viditeľnosti"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Žiadosť o párovanie zariadenia Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Ak chcete svoje zariadenie spárovať so zariadením <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, zadajte tento kód PIN požadovaný zariadením:"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Ak chcete svoje zariadenie spárovať so zariadením <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, zadajte kód PIN požadovaný zariadením:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Ak chcete svoje zariadenie spárovať so zariadením <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, zadajte tento prístupový kľúč vyžadovaný zariadením:"</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_enter_pin_other_device" msgid="4637977124526813470">"Tento kód PIN bude možno treba zadať aj na druhom zariadení."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Ak chcete svoje zariadenie spárovať so zariadením <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, zadajte na ňom kód <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> a stlačte kláves Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nepodarilo sa spárovať so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, pretože ste zadali nesprávny kód PIN alebo prístupový kľúč."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"So zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nie je možné komunikovať."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Nepodarilo sa pripojiť k zariadeniu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Povoliť výmenu údajov, ak sa telefón dotýka iného zariadenia"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povoliť výmenu údajov, ak sa tablet dotýka iného zariadenia"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povoliť výmenu údajov, ak sa telefón dotýka iného zariadenia"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Prenos obsahu aplikácie prostredníctvom technológie NFC je pripravený"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Vyp."</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nedostupné, pretože je vypnutá technológia NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Ak je táto funkcia zapnutá a podržíte zariadenia blízko pri sebe, môžete odosielať obsah aplikácií do iného zariadenia s technológiou NFC. Napríklad môžete odosielať stránky prehliadača, videá YouTube, osobné kontakty a ďalšie."\n\n"Stačí priložiť zariadenia k sebe (obyčajne zadnými stranami) a potom sa dotknúť obrazovky. Aplikácia určí, aký obsah bude odoslaný."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Vyhľadávanie sieťových služieb"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Povoliť aplikáciám v iných zariadeniach hľadať aplikácie v tomto zariadení"</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="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_setup_wizard_title" msgid="70277346338812325">"Vybrať sieť Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Siete sa nedajú vyhľadávať"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Upozornenie na sieť"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Oznamovať dostupné nezabezpečené siete"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Vyhnúť sa nekvalitným pripojeniam"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Nepoužívať sieť Wi-Fi, pokiaľ nemá dostatočne kvalitné internetové pripojenie"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vyhnúť sa nekvalitným pripojeniam"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nepoužívať sieť Wi-Fi, pokiaľ nemá dostatočne kvalitné internetové pripojenie"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Ponechať pripojenie Wi-Fi zapnuté v režime spánku"</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_wps_pbc" msgid="2668564692207863017">"Tlačidlo WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadanie kódu WPS PIN"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Priame prip. 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_empty_list_wifi_on" msgid="3354911729026237372">"Prebieha vyhľadávanie sietí Wi-Fi..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Iná sieť..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Viac"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatické nastavenie (WPS)"</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="8242979682530043184">"Zadajte kód PIN z prístupového bodu"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Nastavenie WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"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_wps_setup_title" msgid="6034518116333042484">"Zabezpečené nastavenie siete Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spúšťanie WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Stlačte na svojom smerovači tlačidlo Chránené nastavenie Wi-Fi. Môže byť označené písmenami WPS alebo týmto symbolom:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Zadajte vo svojom smerovači siete Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavenia môže trvať až dve minúty."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Spustenie WPS sa podarilo. Prebieha pripájanie k sieti…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS prebieha a dokončenie procesu môže trvať až dve mnúty."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spustenie WPS zlyhalo. Skúste to znova o niekoľko minút."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Zlyhanie overenia totožnosti. Skúste to znova."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Bola rozpoznaná ďalšia relácia WPS. Skúste to znova o niekoľko minút."</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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Bolo zabránené slabému internetovému pripojeniu"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Sieť nebola použitá z dôvodu slabého pripojenia. Toto nastavenie môžete vypnúť na obrazovke Nastavenia &gt; Wi-Fi v položke ponuky Rozšírené."</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_wps_available_first_item" msgid="3538912605343585226">"Dostupná zabezpečená sieť"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (dostupná zabezpečená sieť)"</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_failed_connect_message" msgid="8491902558970292871">"Nepodarilo sa pripojiť k sieti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstrániť"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nepodarilo sa odstrániť záznam siete"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Uložiť"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nepodarilo sa uložiť sieť"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Zrušiť"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Bola zistená ďalšia zabezpečená relácia Wi-Fi. Skúste to znova o pár 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Dĺžka sieťovej predpony"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Priame pripojenie Wi-Fi"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Nastaviť pripojenie typu peer-to-peer"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Priame pripojenie Wi-Fi"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informácie o zariadení"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Zabezpečené nastavenie siete Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Odstrániť skupinu"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Rozšírené"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Dostupné zariadenia"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Vyhľadávanie zariadení"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Prebieha vyhľadávanie..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Premenovať zariadenie"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Partnerské zariadenia"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Nepodarilo sa pripojiť."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Premenovanie zariadenia zlyhalo."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Odpojiť?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Ak sa odpojíte, ukončíte spojenie so zariadením <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ak sa odpojíte, ukončíte spojenie so zariadením <xliff:g id="PEER_NAME">%1$s</xliff:g> a ďalšími zariadeniami (<xliff:g id="PEER_COUNT">%2$s</xliff:g>)."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušiť pozvánku?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušiť pozvánku na spojenie s klientom <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Konfigurácia prístupového bodu Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nastaviť hotspot 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="display_settings_title" msgid="1708697328627382561">"Zobraziť"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Tichý režim"</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="4296957391257836961">"Hlasitosti"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Hudobné efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitosť vyzváňania"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovať v tichom režime"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrovať a vyzváňať"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Predvolené upozornenie"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikať kontrolkou upozornenia"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváňací tón"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Vypnúť zvuk tónu zvonenia a upozornení"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Vypnúť zvuk hudby a iných médií"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Vypnúť zvuk upozornení"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Vypnúť zvuk budíka"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrovať pri zvonení"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Pred nastavením zvuku doku v ňom musí byť vložený tablet."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Pred nastavením zvuku doku v ňom musí byť vložený telefón."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Pred nastavením zvuku doku v ňom musí byť vložený tablet."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Pred nastavením zvuku doku v ňom musí byť vložený telefón."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Zvuk pri vkladaní do 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="account_settings" msgid="6403589284618783461">"Účty"</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="7965901687241669598">"Zobrazenie"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Moje telefónne číslo"</string>
     <string name="status_min_number" msgid="3519504522179420597">"Min."</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Verzia PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vymazať všetky vaše osobné údaje a prevzaté aplikácie? Túto akciu nebude 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="2234954758550554549">"Ak chcete potvrdiť obnovenie továrenských nastavení, musíte nakresliť bezpečnostný vzor."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Obnovenie továrenských nastavení musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"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="7572642091599403668">"Obnoviť?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Vymazať ukladací priestor USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Chcete kartu SD vymazať a odstrániť tak všetky súbory, ktoré sú na nej uložené? Túto akciu nebude možné vrátiť späť."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Odstrániť všetko"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Nakreslite bezpečnostný vzor"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Vymazanie ukladacieho priestoru USB treba potvrdiť pomocou bezpečnostného vzoru."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Vymazanie úložiska USB musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"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="6688416425801386511">"Tethering cez USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilné siete"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja poloha"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Služba určovania polohy Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Povoliť aplikáciám používať údaje zo siete Wi-Fi a mobilných sietí na určenie približnej polohy"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Povoliť odosielanie anonymných údajov o polohe spoločnosti Google. Umožniť tiež povoleným aplikáciám určiť vašu približnú polohu pomocou údajov zo zdrojov ako sú mobilné siete a siete Wi-Fi."</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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pomocníka zobrazíte stlačením klávesy Menu."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Na záver zdvihnite prst z obrazovky."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Minimálny počet spojených bodov je <xliff:g id="NUMBER">%d</xliff:g>. Skúste to znova:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Vzor bol zaznamenaný."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Vzor bol zaznamenaný."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Znova nakreslite bezpečnostný vzor pre potvrdenie:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Nový bezpečnostný vzor:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potvrdiť"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Ď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="1075370160667458122">"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="tablet" msgid="8616353869251700776">"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 chcete začať, dotknite sa tlačidla Ďalej."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"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 prejdením prstom v akomkoľvek poradí. Spojiť treba aspoň štyri bodky. "\n\n"Keď chcete začať, dotknite sa tlačidla „Ďalej“."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovať aplikácie"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Správa a odstraňovanie nainštalovaných aplikácií"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Správa aplikácií a nastavenie rýchleho spustenia"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavenia aplikácie"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznáme zdroje"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Povoliť inštaláciu aplikácií, ktoré nepochádzajú zo služby Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Povoliť inštaláciu aplikácií z neznámych zdrojov"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Váš tablet a osobné údaje sú zraniteľnejšie voči útokom aplikácií z neznámych zdrojov. Súhlasíte s tým, že ste výhradne zodpovedný/-á za všetky škody na tablete alebo stratu údajov, ktoré môžu vzniknúť v dôsledku používania týchto aplikácií."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Váš telefón a osobné údaje sú zraniteľnejšie voči útokom aplikácií z neznámych zdrojov. Súhlasíte s tým, že ste výhradne zodpovedný/-á za všetky škody na telefóne alebo stratu údajov, ktoré môžu vzniknúť v dôsledku používania týchto aplikácií."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Rozšírené nastavenia"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Vymazanie údajov"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Odinštalácia aktualizácií"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Pre niektoré akcie ste sa rozhodli spúšťať túto aplikáciu ako predvolenú."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Tejto aplikácii ste povolili vytváranie miniaplikácií a pristupovanie k ich údajom."</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="1616155457673106022">"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>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Zoradiť podľa veľkosti"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Ukázať spustené služby"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Procesy vo vyrov. pamäti"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Obnoviť predvoľby aplik."</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnoviť predvoľby aplik.?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Touto akciou obnovíte všetky predvoľby pre:"\n\n" "<li>"zakázané aplikácie,"</li>\n" "<li>"zakázané upozornenia aplikácií,"</li>\n" "<li>"predvolené aplikácie na vykonávanie akcií,"</li>\n" "<li>"obmedzenia údajov na pozadí pre aplikácie."</li>\n\n" O žiadne údaje aplikácií neprídete."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnoviť aplikácie"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa pamäte"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrovať"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Zvoľte možnosti filtra"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Táto aplikácia môže pristupovať k nasledujúcim funkciám tabletu:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"Nepodarilo sa vypočítať veľkosť balíčka."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Zmena preferovaného umiestnenia pre inštaláciu nových aplikácií"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Zakázať vstavanú aplikáciu?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ak zakážete vstavané aplikácie, ostatné aplikácie sa môžu správať zvláštne."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vypnúť upozornenia?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ak v tejto aplikácii vypnete upozornenia, môžete prísť o dôležité upozornenia a aktuálne informácie."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využitie ukl. priestoru"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Zobraziť úložisko používané aplikáciami"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spustené služby"</string>
@@ -1042,7 +1078,7 @@
     <string name="service_started_by_app" msgid="818675099014723551">"Spustené aplikáciou."</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> voľná"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> voľnej"</string>
     <string name="service_foreground_processes" msgid="7583975676795574276">"Využité: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Pri metóde vstupu 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ť túto metódu vstupu?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Táto kontrola pravopisu môže zhromažďovať zadávaný text vrátane osobných údajov, ako sú napríklad heslá alebo čísla kreditných kariet. Je používaná aplikáciou <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Chcete povoliť túto kontrolu pravopisu?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Nastavenia"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Jazyk"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Nastavenia aplikácie <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> sa nepodarilo otvoriť"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Myš/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Rýchlosť ukazovateľa"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Herné ovládače"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Použiť vibrovanie"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Presmerovať vibrácie do herného ovládača, pokiaľ je pripojený."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Zvoľte rozloženie klávesnice"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Nastaviť rozloženia klávesnice"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Prepnite klávesmi ctrl-space"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predvolené"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Rozloženia klávesnice"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Používateľský slovník"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobný slovník"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobné 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_add_screen_title" msgid="742580720124344291">"Fráza"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Viac možností"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Menej možností"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Slovo:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Skratka:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Jazyk:"</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="8165273379942105271">"V používateľskom slovníku nie sú žiadne slová. Slovo pridáte dotknutím sa tlačidla Pridať (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Všetky jazyky"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Pre všetky jazyky"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Ďalšie jazyky..."</string>
     <string name="testing" msgid="6584352735303604146">"Testovanie"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informácie o tablete"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informácie o telefóne"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID zariadenia pre vývoj"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Informácie o zariadení nie sú k dispozícii"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Nezamykať obrazovku"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka sa pri nabíjaní neprepne do režimu spánku"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povoliť ladenie USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ladenie USB je určené iba na účely vývoja. Použite ho na kopírovanie údajov medzi počítačom a zariadením, inštaláciu aplikácií do zariadenia bez upozornenia a čítanie údajov denníka."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Povoliť nastavenia pre vývojárov?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Tieto nastavenia sú určené len pre vývojárov. Môžu spôsobiť poruchu alebo nesprávne fungovanie zariadenia a nainštalovaných aplikácií."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Chrániť úložisko USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikácie musia pred čítaním z úložiska USB žiadať povolenie"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Chrániť úložisko USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Keď je úložisko USB chránené, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie."\n\n"Pri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Chrániť kartu SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikácie musia pred čítaním z karty SD vyžiadať povolenie"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Chrániť kartu SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Keď je karta SD chránená, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie."\n\n"Pri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Vyberte modul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Vyberte miniaplikáciu"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvoriť miniaplikáciu a povoliť prístup?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Po vytvorení miniaplikácie bude môcť hostiteľ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> získať prístup ku všetkým údajom, ktoré miniaplikácia zobrazuje."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Vždy povoliť aplikácii <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> vytvárať miniaplikácie a pristupovať k ich údajom"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> dní <xliff:g id="HOURS">%2$d</xliff:g> h <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> h <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>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Hovorené heslá"</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="3264723681038625967">"Inštalácia webových skriptov"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Zlepšiť dostupnosť webu"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nie sú nainštalované žiadne služby"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrebujete čítačku obrazovky?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Aplikácia Talkback poskytuje hovorenú odozvu na pomoc nevidomým a slabozrakým používateľom. Chcete si túto aplikáciu bezplatne nainštalovať zo služby Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Nainštalovať webové skripty?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Chcete, aby aplikácie prevzali zo služby Google skripty, ktoré uľahčia prístup k ich obsahu?"</string>
-    <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="1072730037861494125">"K dispozícii nie je žiadny popis."</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_not_available" msgid="3214000535532434353">"Údaje o spotrebe nie sú k dispozícii."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"Vybratý nástroj nie je možné spustiť."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurovať"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Zvoliť iný nástroj"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Nástroj na syntézu reči môže zhromažďovať všetok hovorený text, vrátane osobných údajov, ako sú heslá alebo čísla kreditných kariet. Je založený na nástroji <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Chcete aktivovať nástroj na syntézu reči?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Žena"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Nástroj pred použ. 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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Nakreslite bezpečnostný vzor"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Inštaláciu poverení je potrebné potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Zadajte heslo pre úložisko poverení."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuálne heslo:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Ukl. priestor pover. je vymaz."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Úložisko poverení nemožno vym."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Ukladací priestor poverení je aktivovaný."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Pred použitím úložiska poverení musíte nastaviť kód PIN alebo heslo uzamknutia obrazovky."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Pred použitím úložiska poverení musíte nastaviť heslo alebo kód PIN uzamknutia obrazovky."</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="5446972770562918934">"Zálohovať a obnoviť"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovenie"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri preinštalovaní aplikácie obnoviť zálohované údaje a nastavenia"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo pre zálohu do PC"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Úplné zálohy na počítači nie sú momentálne 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="local_backup_password_summary_none" msgid="393503434408227110">"Úplné zálohy na počítači nie sú momentálne chránené"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotykom zmeníte alebo odstránite heslo pre úplné zálohy do počítača"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Chcete zastaviť zálohovanie hesiel sietí Wi-Fi, záložiek, ďalších nastavení a údajov aplikácií a vymazať všetky kópie na serveroch Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavenia správy zariadení"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Systém"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Tón zvonenia a vibrovanie"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Prebieha pripájanie k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Synchronizácia zlyhala"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Synchronizácia je aktívna"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Synchronizácia"</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="background_data" msgid="5779592891375473817">"Údaje na pozadí"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Posledná synchronizácia: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Prebieha synchronizácia..."</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Víta vás služba Google Sync"</font>" "\n"Spoločnosť Google pomocou nej synchronizuje údaje a umožňuje vám tak pristupovať ku kontaktom, stretnutiam a ďalším informáciám, nech ste kdekoľvek."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Nastavenia synchronizácie aplikácie"</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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Niektoré aplikácie vyžadujú tento účet. Odstrániť ich môžete obnovením tabletu na predvolené továrenské nastavenia (čím odstránite všetky vaše osobné údaje) v časti Nastavenia &gt; Zálohovať a obnoviť."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Tento účet je vyžadovaný niektorými aplikáciami. Môžete ho odstrániť iba obnovením telefónu na predvolené továrenské nastavenia (čím odstránite všetky vaše osobné údaje) v časti Nastavenia &gt; Zálohovať a obnoviť."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nie je možné ručne synchronizovať"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizácia tejto položky je momentálne zakázaná. Ak chcete toto nastavenie zmeniť, dočasne zapnite prenos údajov na pozadí a automatickú synchronizáciu."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Nastavenia 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ak chcete dešifrovať ukladací priestor, zadajte heslo"</string>
     <string name="try_again" msgid="4272075051293936921">"Skúsiť znova."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Táto služba je zaneprázdnená. Skúste to znova."</string>
     <string name="delete" msgid="4219243412325163003">"Odstrániť"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Ladenie"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Vybrať aplikáciu na ladenie"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Nie je nastavená žiadna aplikácia na ladenie"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplikácia na ladenie: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Výber aplikácie"</string>
+    <string name="no_application" msgid="2813387563129153880">"Nič"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Čakať na ladiaci nástroj"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Apl. na ladenie čaká na pripojenie lad. nástroja"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Vstup"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Kresba"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorovanie"</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_screen_updates" msgid="5470814345876056420">"Zobraziť aktual. obsahu"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Celý obsah okna pri aktualizácii bliká"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Zobr. aktual. zobraz. GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Zobrazenia v oknách vykresľované s GPU blikajú"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Zakázať hardvér. prekrytia"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy používať jednotku GPU na skladanie obrazovky"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Povoliť sledovania"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Vybrať povolené sledovania"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Momentálne nie sú povolené žiadne sledovania"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Počet aktuálne povolených sledovaní: <xliff:g id="NUM">%1$d</xliff:g>"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Všetky sledovania sú v súčasnosti povolené"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Zobraziť hranice rozlož."</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Zobraziť v klipe ohraničenie, okraje a pod."</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="force_hw_ui" msgid="6426383462520888732">"Vynútiť vykresľovanie GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Používať v aplikáciách hardvérovú akceleráciu 2D"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Vynútiť použitie jednotky GPU na vykresľovanie 2D"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profilové vykresľ. GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Merať čas vykresľov. v adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Mierka dĺžky animácie"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobilné hotspoty"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Automatická synchronizácia údajov"</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="8621855507876539282">"V tomto období nevyužili dáta žiadne aplikácie."</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_disclaimer" product="tablet" msgid="2591250607795265503">"Merané vaším tabletom. Údaje o využití dát od operátora môžu byť odlišné."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Merané vaším telefónom. Údaje o využití dát od operátora môžu byť odlišné."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"obmedzené"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Zakázať mobilné dáta?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Nastaviť dát. limit mobil. sietí"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Nastaviť dátový limit siete 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobil"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Ž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="8430240158135453271">"Zobraziť nastavenia aplikácie"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Obmedzenie dátových prenosov na pozadí"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Zakázať údaje na pozadí v mobilnej dátovej sieti. Ak bude dostupná sieť Wi-Fi, bude použitá."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Zakázať údaje na pozadí v mob. sieťach. Použiť iné ako mob. siete, ak sú k disp."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Nastav. dát. limitu mob. siete obmedzíte údaje na poz. pre apl."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Obmedziť údaje na pozadí?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Táto funkcia môže spôsobiť, že aplikácia, ktorá je závislá na údajoch na pozadí, prestane fungovať, keď nie je k dispozícii sieť Wi-Fi."\n" "\n"Vhodnejšie ovládacie prvky dátových prenosov nájdete v nastaveniach jednotlivých aplikácií."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ak budú k dispozícii len mobilné siete, môže táto funkcia spôsobiť, že aplikácie, ktoré údaje na pozadí vyžadujú, nebudú fungovať."\n\n"Vhodnejšie spôsoby ovládania využívania údajov nájdete v nastaveniach aplikácie."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Obmedzenie údajov na pozadí je možné len v prípade, že ste nastavili dátový limit pre mobilnú sieť."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Zapnúť automat. synchr. údajov?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Všetky zmeny vykonané v rámci vašich účtov na webe sa automaticky skopírujú do vášho tabletu."\n\n"Niektoré účty môžu tiež automaticky skopírovať na web akékoľvek zmeny vykonané v tablete. Týmto spôsobom funguje aj účet Google."\n\n"Typy informácií, ktoré sa budú v jednotlivých účtoch synchronizovať, môžete nastaviť v sekcii Nastavenia &gt; Účty."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Všetky zmeny vykonané v rámci vašich účtov na webe sa automaticky skopírujú do vášho telefónu."\n\n"Niektoré účty môžu tiež automaticky skopírovať na web akékoľvek zmeny vykonané v telefóne. Týmto spôsobom funguje aj účet Google."\n\n"Typy informácií, ktoré sa budú v jednotlivých účtoch synchronizovať, môžete nastaviť v sekcii Nastavenia &gt; Účty."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vypnúť automat. synchr. údajov?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Toto nastavenie šetrí spotrebu dát a batérie. Na získanie najnovších informácií však budete musieť každý účet synchronizovať ručne. Nebudete tiež dostávať upozornenia na dostupné aktualizácie."</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_warning_editor_title" msgid="3704136912240060339">"Nastaviť upozornenie o využívaní údajov"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastaviť limit využívania údajov"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Nastavuje sa obmedzenie dátových prenosov"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Po prekročení stanoveného limitu bude vaše dátové spojenie <xliff:g id="NETWORKS">%1$s</xliff:g> zakázané."\n\n"Keďže je využitie dát merané vaším tabletom a operátor môže využitie dát účtovať inak, mali by ste nastaviť bezpečný limit."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Po prekročení stanoveného limitu bude vaše dátové spojenie <xliff:g id="NETWORKS">%1$s</xliff:g> zakázané."\n\n"Keďže je využitie dát merané vaším telefónom a operátor môže využitie dát účtovať inak, mali by ste nastaviť bezpečný limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané."\n\n"Keďže sa využitie dát meria pomocou vášho tabletu a operátor môže využitie dát účtovať inak, zvážte nastavenie nižšieho limitu."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané."\n\n"Keďže sa využitie dát meria pomocou vášho telefónu a operátor môže využitie dát účtovať inak, zvážte nastavenie nižšieho limitu."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Obmedziť údaje na pozadí?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ak obmedzíte mobilné údaje na pozadí, niektoré aplikácie a služby nebudú fungovať, pokiaľ nebudete mať pripojenie k sieti Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: využitých približne <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: využitých približne <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: podľa meraní tabletu využitých asi <xliff:g id="TOTAL">%1$s</xliff:g>. Operátor môže využitie dát účtovať inak."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: podľa meraní telefónu využitých asi <xliff:g id="TOTAL">%1$s</xliff:g>. Operátor môže využitie dát účtovať inak."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilné hotspoty"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Vyberte siete Wi-Fi, ktoré sú mobilnými hotspotmi. Aplikáciám na pozadí môže byť používanie týchto sietí zakázané. Aplikácie môžu tiež pred preberaním veľkých súborov pomocou týchto sietí zobraziť upozornenie."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilné siete"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Siete Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Ak chcete vybrať mobilné hotspoty, zapnite pripojenie k sieti  Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Upraviť profil siete VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Pripojiť k profilu <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Pridať profil siete VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Upraviť profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Odstrániť profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Nie je k dispozícii žiadne sieťové pripojenie. Skúste to znova neskôr."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Chýba certifikát. Upravte profil."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"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="3973201880357468747">"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="8764686624055084454">"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="3055831259260848004">"Prešli ste si celú príručku. Ak ju chcete ukončiť, nájdite tlačidlo <xliff:g id="FINISH">%s</xliff:g> a klepnite naň."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Oprava pravopisu"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Kontrola pravopisu"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Tu zadajte aktuálne heslo pre úplné zálohy"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Tu zadajte nové heslo pre úplné zálohy"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Tu zadajte znova nové heslo pre úplné zálohy"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Zrušiť"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g> %%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ďalšie aktualizácie systému"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Používatelia a obmedzenia"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Používatelia"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Pridať používateľa"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Upraviť podrobnosti"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Informácie o používateľovi"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Meno"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Obmedzenia obsahu"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Vyžadovať PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Hodnotenie obsahu"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Systémové aplikácie"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Nainštalované aplikácie"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Zahodiť"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Odstr. používateľa"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Otravné dieťa"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Odstrániť používateľa?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Naozaj chcete odstrániť používateľa a všetky priradené údaje zo zariadenia?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Zobraziť upozornenia"</string>
+    <string name="help_label" msgid="1107174367904110532">"Pomocník"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 684cb86..0e358f6 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Prekinjanje povezave ..."</item>
     <item msgid="1634960474403853625">"Prekinjena povezava"</item>
     <item msgid="746097431216080650">"Ni uspelo"</item>
+    <item msgid="6367044185730295334">"Blokirano"</item>
+    <item msgid="503942654197908005">"Začasno izogibanje slabi povezavi"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Prekinjanje povezave z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
     <item msgid="197508606402264311">"Prekinjena povezava"</item>
     <item msgid="8578370891960825148">"Ni uspelo"</item>
+    <item msgid="5660739516542454527">"Blokirano"</item>
+    <item msgid="1805837518286731242">"Začasno izogibanje slabi povezavi"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Pritisnite gumb"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Brez"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN iz dostopne točke"</item>
-    <item msgid="7364462169350112617">"PIN iz te naprave"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statično"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Izmenljiva kartica SD"</item>
     <item msgid="4498124044785815005">"Naj odloči sistem"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Izklopi"</item>
-    <item msgid="4804571292609523335">"Vibriraj"</item>
-    <item msgid="595707141547423573">"Izklopi zvok"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
     <item msgid="2560532955514699713">"Srednja"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Merilo animacije: 5 x"</item>
     <item msgid="6660750935954853365">"Merilo animacije: 10 x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animacija izklopljena"</item>
+    <item msgid="1138649021950863198">"Merilo animacije: 0,5 x"</item>
+    <item msgid="4394388961370833040">"Merilo animacije: 1 x"</item>
+    <item msgid="8125427921655194973">"Merilo animacije: 1,5 x"</item>
+    <item msgid="3334024790739189573">"Merilo animacije: 2 x"</item>
+    <item msgid="3170120558236848008">"Merilo animacije: 5 x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d67599a1..3036ff8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
+    <string name="create" msgid="3578857613172647409">"Ustvari"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prepreči uporabo telefona Bluetooth, kadar je zaslon zaklenjen"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Naprave Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Ime naprave"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Nastavitve naprave"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Nastavitve profila"</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_rename_device" product="tablet" msgid="787970073150631155">"Preimenuj tablični računalnik"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Seznanjanje ..."</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="5655704645616731277">"Dotaknite se, da vzpostavite povezavo"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"V bližini ni 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="1931617700075106801">"Dotaknite se za povezovanje z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Dotaknite se za povezovanje 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="device_picker" msgid="8398232791303186677">"Izbirnik naprav Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zahteva za dovoljenje za uporabo funkcije Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Program želi vklopiti Bluetooth. Želite omogočiti?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Program v tabličnem računalniku želi vklopiti Bluetooth in nastaviti tablični računalnik, da ga bodo lahko druge naprave odkrile <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite omogočiti?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Dotaknite se za povezavo z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>E«"</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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"V redu"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Ime gostitelja, ki ste ga vtipkali, ni veljavno."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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_port" msgid="5539106187558215246">"Izpolniti morate polje vrat."</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="2671425042711054494">"Vtipkana številka vrat je neveljavna."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP lahko uporablja brskalnik, drugi programi pa ne."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Nastavi"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Ni uspelo"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Uspelo"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Spremembe začnejo veljati ob ponovnem priklopu kabla USB"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Spremembe začnejo veljati ob vnovičnem priklopu kabla USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Omogoči masovni pomnilnik USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Skupno število bajtov:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Pomnilnik USB ni vpet"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Ni kartice SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Pomnilnik USB ni vpet."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Ni kartice SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Število razpoložljivih bajtov:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Pomnilnik USB kot napr. za množ. shr."</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Kartica SD se uporablja kot naprava za množično shranjevanje"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Zdaj lahko varno odstranite pomnilnik USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Zdaj lahko varno odstranite kartico SD"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB kot naprav. za množ. shr."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Kartica SD se uporablja kot naprava za množično shranjevanje."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Zdaj lahko varno odstranite pomnilnik USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Zdaj lahko varno odstranite kartico SD."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Pomnilnik USB je bil odstranjen, ko je bil še v uporabi."</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Kartico SD ste odstranili, ko je bila še v uporabi."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Zasedeni bajti:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Iskanje predstavnostnih datotek na pomnilniku USB ..."</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Pomnilnik USB je vpet samo za branje."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Jezik"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Med gostovanjem vzpostavi povezavo s podatkovnimi storitvami"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Podatkovna povezava ni mogoča, ker ste zapustili domače omrežje, podatkovno gostovanje pa je izklopljeno."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Vklopi"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Ali želite dovoliti podatkovno gostovanje? Stroški gostovanja utegnejo biti veliki."</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Pozor"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Če dovolite podatkovno gostovanje, so lahko stroški gostovanja visoki."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Želite dovoliti podatkovno gostovanje?"</string>
     <string name="networks" msgid="6333316876545927039">"Izbira operaterja"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Izbira omrežnega operaterja"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum in ura"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Nastavi uro"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Izberite časovni pas"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Nastavi datum"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Izberi obliko datuma"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Izbira oblike 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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ura"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Izboljšano ujemanje obraza"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Preverjanje živosti"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Zahtevaj mežikanje"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Š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 svoje 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="3504519024884099702">"Š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 svoje 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_desc" product="tablet" msgid="3839235202103924154">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate tablični računalnik, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke."\n\n"Šifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, računalnik pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate telefon, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke."\n\n"Šifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, telefon pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</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="2029407131227814893">"Napolnite baterijo in poskusite znova."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"Preden lahko začnete s šifriranjem, morate nastaviti kodo PIN ali geslo za zaklepanje zaslona."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Želite šifrirati?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Šifriranja ne morete razveljaviti ali prekiniti, ker lahko izgubite podatke. Š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="5682944380460921880">"Šifriranja ne morete razveljaviti ali prekiniti, ker lahko izgubite podatke. Šifriranje traja eno uro ali več in v tem času se bo telefon večkrat znova zagnal."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifriranje"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"Vnesite geslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifriranje ni uspelo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. "\n\n"Če želite tablični računalnik spet uporabljati, morate ponastaviti tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. "\n\n"Če želite telefon spet uporabljati, morate ponastaviti tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Izberite zakl. zaslona"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. "\n\n"Če želite tablični računalnik spet uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. "\n\n"Če želite telefon ponovno uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi ponovno nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Preklopite način vnosa"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Izberite zakl. zaslona"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Izberite varnostno zaklepanje"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Odklepanje z obrazom"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Vzorec"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Koda PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Geslo"</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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Koda PIN mora vsebovati vsaj %d znakov"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Geslo mora imeti manj kot toliko znakov: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN mora imeti manj kot toliko številk: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN lahko vsebuje samo števke od 0 do 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Skrbnik naprave ne dovoli uporabe nedavne kode PIN."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Geslo ima neveljaven znak."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Geslo mora vsebovati vsaj eno črko."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Geslo mora imeti vsaj eno števko."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Geslo mora imeti 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>
+    <item quantity="one" msgid="3063853802158131458">"Geslo mora imeti vsaj eno črko."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Geslo mora imeti vsaj eno malo črko."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Geslo mora imeti vsaj eno veliko črko."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Geslo mora imeti vsaj eno številko."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Geslo mora imeti vsaj en posebni znak."</item>
+    <item quantity="other" msgid="1221290525051187757">"Geslo mora imeti vsaj toliko posebnih znakov: %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>
+    <item quantity="one" msgid="4594051152085925921">"Geslo mora imeti vsaj en znak, ki ni črka."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"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="lock_setup" msgid="1759001157415978959">"Nastavitev je končana"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Namestitev je končana."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Skrbništvo 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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Če želite vzpostaviti povezavo z napravo:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Vnesite 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_enter_pin_other_device" msgid="4637977124526813470">"Ta PIN boste morda morali vnesti tudi v drugi napravi."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Če želite vzpostaviti povezavo z napravo:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>V njej vnesite:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> in pritisnite Return ali Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Zaradi nepravilne kode PIN ali gesla ni mogoče vzpostaviti povezave z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ni mogoče vzpostaviti povezave."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Povezave z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ni bilo mogoče vzpostaviti."</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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Dovoli izmenjavo podatkov, ko se telefon dotakne druge naprave"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dovoli izmenjavo podatkov, ko se tablični računalnik dotakne druge naprave"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dovoli izmenjavo podatkov, ko se telefon dotakne druge naprave"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Pripravljen za prenos vsebine programa prek NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Izklopljeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ni na voljo, ker je NFC izklopljen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Če je ta funkcija vklopljena, lahko vsebino iz programa prenesete v drugo napravo, ki podpira NFC, tako da napravi približate. Prenesete lahko na primer strani brskalnika, videoposnetke v YouTubu, stike iz programa Ljudje in drugo."\n\n"Približajte napravi (običajno s hrbtno stranjo) in se dotaknite zaslona. Kaj se prenese, je odvisno od programa."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Odkrivanje omrežnih storitev"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Dovoli, da aplikacije v drugih napravah odkrivajo aplikacije v tej napravi"</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="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_setup_wizard_title" msgid="70277346338812325">"Izberi Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ni mogoče iskati omrežij"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Obveščanje o omrežjih"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Obvesti me, ko bo na voljo odprto omrežje"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Izogni se slabim povezavam"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Omrežje Wi-Fi uporabi samo, če je na voljo dobra internetna povezava."</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izogni se slabim povezavam"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Omrežje Wi-Fi uporabi, samo če je na voljo dobra internetna povezava"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Ohrani povezavo Wi-Fi med spanjem"</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_wps_pbc" msgid="2668564692207863017">"Gumb za WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Vnos kode PIN za WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Iskanje omrežij Wi-Fi ..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Drugo omrežje ..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Več"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Samodej. nastavitev (WPS)"</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="8242979682530043184">"Vnesite PIN iz dostopne točke"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Nastavitev WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"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_wps_setup_title" msgid="6034518116333042484">"Zaščitena nastavitev Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Zagon nastavitve WPS ..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pritisnite gumb »Zaščitena nastavitev za Wi-Fi« na usmerjevalniku. Morda se imenuje »WPS« ali vsebuje ta simbol."</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Vnesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> za usmerjevalnik Wi-Fi. Nastavitev lahko traja do dve minuti."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Nastavitev WPS je uspela. Povezovanje z omrežjem ..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Povezava z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> je vzpostavljena"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Nastavitev WPS že poteka in lahko traja do dve minuti"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Nastavitev WPS ni uspela. Poskusite znova čez nekaj minut."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Varnostna nastavitev brezžičnega usmerjevalnika (WEP) ni podprta"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Varnostna nastavitev brezžičnega usmerjevalnika (TKIP) ni podprta"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Preverjanje pristnosti ni uspelo. Poskusite znova."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Zaznana je druga seja WPS. Poskusite znova čez nekaj minut."</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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Slaba internetna povezava je bila izpuščena"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Omrežje zaradi slabe povezave ni bilo uporabljeno. To delovanje lahko izklopite v nastavitvah, tako da na zaslonu za Wi-Fi izberete menijski element »Dodatno«."</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_wps_available_first_item" msgid="3538912605343585226">"Na voljo je zaščiteno omrežje"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (na voljo je zaščiteno omrežje)"</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_failed_connect_message" msgid="8491902558970292871">"Vzpostavljanje povezave z omrežjem ni uspelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pozabi"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Pozabljanje omrežja ni uspelo"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Shrani"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Shranjevanje omrežja ni uspelo"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Prekliči"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Zaznana je bila druga zaščit. seja Wi-Fi. 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Prehod"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Dolžina predpone omrežja"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Nastavitev povezljivosti enakovrednih naprav"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Podatki o napravi"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Nastavitev zaščitene povezave Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Odstrani skupino"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Dodatno"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Razpoložljive naprave"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Išči naprave"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Iskanje …"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Preimenovanje naprave"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Enakovredne naprave"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Povezava ni mogoča."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Naprave ni bilo mogoče preimenovati."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Želite prekiniti povezavo?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Če prekinete, se prekine povezava z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Če prekinete povezavo, bo prekinjena povezava z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g> in še toliko drugimi: <xliff:g id="PEER_COUNT">%2$s</xliff:g>."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Želite preklicati povabilo?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ali želite preklicati povabilo za povezavo z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Konfiguriraj brezžično dostopno točko"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nastavitev dostopne točke 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> prenosna brezžična dostopna točka"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Tihi način"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvonjenja telefona"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnost"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Glasbeni učinki"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnost zvonjenja"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibriraj v tihem načinu"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibriranje in zvonjenje"</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="incoming_call_volume_title" msgid="8073714801365904099">"Zvonjenje"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Izklop zvonjenja in obvestil"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Izklop glasbe in drugih medijev"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Izklop zvoka obvestil"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Izklop alarmov"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibriranje ob zvonjenju"</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>
@@ -623,14 +651,15 @@
     <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" product="tablet" msgid="9015625921245904495">"Če želite nastaviti zvok, mora biti telefon v stojalu."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Če želite nastaviti zvok telefona, mora biti telefon v stojalu."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Preden nastavite zvok, mora biti tablični računalnik v stojalu."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Preden nastavite zvok, mora biti telefon v stojalu."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Zvok ob vstavitvi v stojalo"</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>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <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="7965901687241669598">"Prikaz"</string>
@@ -702,7 +731,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Moja telefonska številka"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_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_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Želite izbrisati vse osebne podatke in prenesene programe? Tega dejanja ni mogoče razveljaviti."</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="2234954758550554549">"Narisati morate vzorec za odklepanje, če želite potrditi ponastavitev tovarniških podatkov."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Če želite potrditi ponastavitev na tovarniške nastavitve, morate narisati vzorec za odklepanje."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Ponastavitev ni opravljena, ker storitev System Clear ni na voljo."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Želite ponastaviti?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Izbriši pomnilnik USB"</string>
@@ -838,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ali želite izbrisati vse datoteke, shranjene na kartici SD? Dejanja ni mogoče razveljaviti."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Izbriši vse"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Narišite vzorec za odklepanje"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Če želite potrditi brisanje pomnilnika USB, morate narisati vzorec za odklepanje."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Narisati morate vzorec za odklepanje, če želite potrditi izbris kartice SD."</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Če želite potrditi brisanje pomnilnika USB, morate narisati vzorec za odklepanje."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Če želite potrditi brisanje kartice SD, morate narisati vzorec za odklepanje."</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="6688416425801386511">"Internet prek USB-ja"</string>
@@ -870,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilna omrežja"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Googlova lokacijska storitev"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Programi lahko za določanje približne lokacije  uporabijo podatke iz omrežij Wi-Fi in mobilnih omrežij"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Dovoli pošilj. anon. lok. pod. Googlu. Odobr. aplikac. dov. upor. pod. iz virov, kot so Wi-Fi in mob. omr., za dol. pribl. lokac."</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>
@@ -915,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Če želite pomoč, pritisnite meni."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ko končate, dvignite prst."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Povežite vsaj <xliff:g id="NUMBER">%d</xliff:g> pik. Poskusite znova:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Vzorec shranjen."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Vzorec shranjen."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Znova narišite vzorec, da ga potrdite:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Novi vzorec za odklepanje:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potrdi"</string>
@@ -937,7 +966,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"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="1075370160667458122">"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="tablet" msgid="8616353869251700776">"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="8393155371327584659">"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="7041951105633616745">"Upravljaj programe"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje in odstranjevanje nameščenih programov"</string>
@@ -945,7 +974,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Upravljanje programov, nastavljanje bližnjic za hiter zagon"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavitve programov"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznani viri"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Dovoli nameščanje programov, ki niso iz storitve Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Dovoli namestitev aplikacij iz neznanih virov"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Programi iz neznanih virov lažje napadejo tablični računalnik in osebne podatke. Strinjate se, da ste za morebitno škodo, nastalo v tabličnem računalniku, ali izgubo podatkov, ki sta posledica uporabe teh programov, odgovorni izključno sami."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Programi iz neznanih virov lažje napadejo telefon in osebne podatke. Strinjate se, da ste izključno sami odgovorni za morebitno škodo, nastalo v telefonu, ali izgubo podatkov, ki sta posledica uporabe teh programov."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Dodatne nastavitve"</string>
@@ -953,6 +982,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Podatki 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="auto_launch_label_generic" msgid="3230569852551968694">"Privzete nastavitve"</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>
@@ -972,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Počisti podatke"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Odstrani posodobitve"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Izbrali ste, da se bo pri nekaterih dejanjih ta program samodejno zagnal."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Aplikaciji dovolite, da ustvari pripomočke in dostopa do njihovih podatkov."</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="1616155457673106022">"Ta program morda ni namenjen za vaš zaslon. Tu lahko nastavite način prilagajanja zaslonu."</string>
@@ -982,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Razvrsti po velikosti"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Pokaži storitve, ki se izvajajo"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaži predpom. procese"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Ponast. nast. aplikacije"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ponastavitev nastavitev?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ponastavili boste vse nastavitve za:"\n\n" "<li>"Onemogočene aplikacije"</li>\n" "<li>"Obvestila o onemogočenih aplikacijah"</li>\n" "<li>"Privzete aplikacije za dejanja"</li>\n" "<li>"Omejitve podatkov v ozadju za aplikacije"</li>\n\n" Podatkov aplikacij ne boste izgubili."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Ponastavitev aplikacij"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostor"</string>
     <string name="filter" msgid="2018011724373033887">"Filtriraj"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Izberite možnosti filtriranja"</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ta program ima v tabličnem računalniku dostop do:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ta program ima v telefonu dostop do tega:"</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="invalid_size_value" msgid="7563537715280712285">"Velikosti paketa ni bilo mogoče izračunati."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nimate nameščenih programov drugih ponudnikov."</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>
@@ -1032,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Spremenite prednostno namestitveno mesto za nove programe."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Želite onemogočiti vgrajen program?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Če onemogočite vgrajen program, bodo drugi programi morda nepravilno delovali."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Želite izklopiti obvestila?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Če izklopite obvestila za to aplikacijo, boste morda zamudili pomembna opozorila in posodobitve."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uporaba pomnilnika"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ogled pomnilnika, ki ga uporabljajo programi"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Zagnane storitve"</string>
@@ -1084,19 +1121,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Ta način vnosa lahko morda 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>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ta pregledovalnik črkovanja bo morda lahko zbral vse besedilo, ki ga vnesete, vključno z osebnimi podatki, kot so gesla in številke kreditnih kartic. Pregledovalnik je iz programa <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Ga želite uporabiti?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Nastavitve"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Jezik"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Ni mogoče odpreti nastavitev za <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Miška/sledilna ploščica"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Hitrost kazalca"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Krmilnik za igre"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Uporaba vibriranja"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Preusmeritev vibriranja v krmilnik za igre, ko je povezan."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Izbira razporeditve tipkovnice"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Nastavitev razporeditev tipkovnice"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Preklopite s Ctrl + preslednica"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Privzeto"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Razporeditve tipkovnice"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uporabniški slovar"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osebni slovar"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osebni slovarji"</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_add_screen_title" msgid="742580720124344291">"Besedna zveza"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Več možnosti"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Manj možnosti"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"V redu"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Beseda:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Bližnjica:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Jezik:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Za vse jezike"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Več jezikov ..."</string>
     <string name="testing" msgid="6584352735303604146">"Preizkušanje"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informacije o tabličnem računalniku"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informacije o telefonu"</string>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Nastavi možnosti za razvoj programov"</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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID razvojne naprave"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Podatki o napravi niso na voljo"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Brez zaklepanja"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Med polnjenjem se zaslon ne bo nikoli zaklenil"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ali dovolite odpravljanje težav s povezavo USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Odpravljanje težav s povezavo USB je namenjeno samo za razvoj. Lahko ga uporabljate za kopiranje podatkov med računalnikom in napravo, nameščanje programov v napravo brez obveščanja in branje podatkov v dnevniku."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Ali želite omogočiti nastavitve za razvijanje?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Te nastavitve so namenjene samo za razvijanje in lahko povzročijo prekinitev ali napačno delovanje naprave in programov v njej."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Zaščiti shrambo USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikacije morajo zahtevati dovoljenje za branje shrambe USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Želite zaščititi shrambo USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Če je shramba USB zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe."\n\n"Nekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Zaščiti kartico SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacije morajo zahtevati dovoljenje za branje kartice SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Želite zaščititi kartico SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Če je kartica SD zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe."\n\n"Nekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Izberi pripomoček"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Izberite pripomoček"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite ustvariti pripomoček in dovoliti dostop?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Ko ustvarite pripomoček, ima <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> dostop do vseh podatkov, ki jih ta prikazuje."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Vedno dovoli, da <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ustvari pripomočke in dostopa do njihovih podatkov"</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>
@@ -1160,12 +1227,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Izgovorite gesla"</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="3264723681038625967">"Namestite spletne skripte"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Izboljšanje dostopnosti do spleta"</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>
@@ -1180,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nameščena ni nobena storitev"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrebujete bralnik zaslona?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Program TalkBack daje izgovorjene povratne informacije za pomoč slepim in slabovidnim uporabnikom. Ali ga želite brezplačno namestiti iz trgovine Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Želite namestiti spletne skripte?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Ali želite, da programi namestijo skripte iz Googla, ki omogočajo širšo dostopnost njihove spletne vsebine?"</string>
-    <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="1072730037861494125">"Ni opisa."</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_not_available" msgid="3214000535532434353">"Podatki o porabi baterije niso na voljo."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1347,7 @@
     <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_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" msgid="3305141107104670703">"Izbranega mehanizma ni mogoče zagnati."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguriraj"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Izberite drug mehanizem"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ta mehanizem za sintezo govora bo morda lahko zbiral izgovorjeno besedilo, vključno z osebnimi podatki, kot so gesla in številke kreditnih kartic. Omogoča ga mehanizem <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Ali želite omogočiti uporabo tega mehanizma za sintezo govora?"</string>
@@ -1301,7 +1363,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Ženski"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Pred upor. omogoč. nov mehan."</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>
@@ -1318,6 +1380,8 @@
     <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 zaupanja vredna potrdila overiteljev"</string>
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Narišite vzorec za odklepanje"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Če želite potrditi ponastavitev na tovarniške nastavitve, morate narisati vzorec za odklepanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Vnesite geslo za shrambo poverilnic."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutno geslo:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Shramba poverilnic je izbrisana."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Shrambe pover. ni mogoče izbr."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Shramba poverilnic je omogočena."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Pred uporabo shrambe poverilnic morate nastaviti PIN ali geslo za zaklepanje zaslona."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Preden lahko uporabite shrambo poverilnic, morate nastaviti kodo PIN ali geslo za zaklepanje zaslona."</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="5446972770562918934">"Izdelaj varnostno kopijo in ponastavi"</string>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Samodejna obnovitev"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri vnovični namestitvi programa obnovite varnostno kopirane nastavitve in podatke"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Geslo za varn. kop. rač."</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Popolne varnostne kopije podatkov v računalniku trenutno niso zaščitene."</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="local_backup_password_summary_none" msgid="393503434408227110">"Popolne varnostne kopije namizja trenutno niso zaščitene"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotaknite se, če želite spremeniti ali odstraniti geslo za popolno varnostno kopiranje namizja."</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Ali želite ustaviti varnostno kopiranje gesel za Wi-Fi, zaznamkov, drugih nastavitev in podatkov programov ter izbrisati vse kopije v Googlovih strežnikih?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavitve skrbništva naprave"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Sistem"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ton zvonjenja in vibriranje"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Vzpostavljanje povezave z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> ..."</string>
@@ -1393,7 +1457,10 @@
     <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_failed" msgid="1696499856374109647">"Sinhronizacija ni uspela"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Sinhronizacija je aktivna"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <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="background_data" msgid="5779592891375473817">"Podatki v ozadju"</string>
@@ -1404,6 +1471,10 @@
     <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>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <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>
@@ -1413,7 +1484,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Pozdravljeni v storitvi Google Sync."</font>" "\n"Googlov pristop k sinhroniziranju 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="6205903695598000286">"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>
@@ -1427,7 +1498,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Ta račun je potreben za nekatere programe. Odstranite ga lahko samo tako, da tablični računalnik obnovite na privzete nastavitve (s tem izbrišete vse osebne podatke) v možnosti Nastavitve &gt; Varnostno kopiranje in ponastavitev."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Ta račun zahtevajo nekateri programi. Odstranite ga lahko samo tako, da telefon obnovite na privzete nastavitve (s tem izbrišete vse osebne podatke) pri možnosti Nastavitve &gt; Varnostno kopiranje in ponastavitev."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Ročna sinhronizacija ni mogoča"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinhronizacija za ta element je trenutno onemogočena. Če želite spremeniti nastavitev, vklopite podatke v ozadju in samodejno sinhronizacijo."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Nastavitve za 4G"</string>
@@ -1435,7 +1507,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Naslov 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Vnesite geslo za dešifriranje shrambe"</string>
     <string name="try_again" msgid="4272075051293936921">"Poskusite znova."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Storitev je zasedna. Poskusite znova."</string>
     <string name="delete" msgid="4219243412325163003">"Izbriši"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1514,46 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Iskanje napak"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Izberite program za iskanje napak"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Program za iskanje napak ni nastavljen"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Program za iskanje napak: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Izberite program"</string>
+    <string name="no_application" msgid="2813387563129153880">"Nič"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Počakajte na iskalnik napak"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Progr, kjer se išče nap., čaka isk. nap. pred izv."</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Vnos"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Risba"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Spremljanje"</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_screen_updates" msgid="5470814345876056420">"Pokaži posodob. površine"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Ob posodobitvi osvetli celotne površine oken"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Pokaži posod. pogleda GPE"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Osvetli poglede v oknih pri risanju z GPE"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Onem. strojni medp."</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Za sestavljanje slike vedno uporabi graf. procesor"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Omogoči sledi"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Izbira omogočenih sledi"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Trenutno ni omogočenih sledi"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Št. trenutno omogočenih sledi: <xliff:g id="NUM">%1$d</xliff:g>"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Vse sledi so trenutno omogočene"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Prikaz mej postavitve"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <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="force_hw_ui" msgid="6426383462520888732">"Vsili upodabljanje z GPU-jem"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Uporabi 2D-strojno pospeševanje v programih"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Za risanje 2D vsili uporabo grafičnega procesorja"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Upod. profilov z GPU-jem"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Merjenje časa upodab. v dumpsys gfxinfo lupine adb"</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="animator_duration_scale_title" msgid="3406722410819934083">"Lestvica trajanja animacije"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1567,15 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobilne dostopne točke"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <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="8621855507876539282">"V tem obdobju ni podatkov uporabljal noben 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_disclaimer" product="tablet" msgid="2591250607795265503">"Merjeno s tabličnim računalnikom. Operaterjev obračun uporabe podatkov se lahko razlikuje."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Merjeno s telefonom. Operaterjev obračun uporabe podatkov se lahko razlikuje."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"omejeno"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Želite onemogočiti mobilne podatke?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Nast. omejitev mobilnih podatkov"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Nastavi omejitev podatkov za 4G"</string>
@@ -1488,33 +1586,50 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobilno"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Ogled nastavitev programa"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Omejitev podatkov v ozadju"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Prenos podatkov v ozadju onemogoči samo v mobilnih omrežjih. Če je na voljo, bo uporabljen Wi-Fi."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Onem. prenos podat. v ozadju v mob. omr. Upor. bodo nemob. omr."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Če želite za ta program omejiti prenos podatkov v ozadju, nastavite omejitev prenosa podatkov v mobilnih omrežjih."</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="5651588785118290771">"Program, ki je odvisen od podatkov v ozadju, lahko zaradi te funkcije preneha delovati, če Wi-Fi ni na voljo."\n\n"Ustrezne kontrolnike za uporabo podatkov najdete v nastavitvah v programu."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ta funkcija lahko povzroči prenehanje delovanja aplikacije, ki je odvisna od podatkov v ozadju, če so na voljo samo mobilna omrežja."\n\n"Ustreznejši kontrolniki za uporabo podatkov so na voljo v nastavitvah v aplikaciji."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Prenos podatkov v ozadju lahko omejite samo, če nastavite omejitev količine podatkov, prenesenih v mobilnih omrežjih."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <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_warning_editor_title" msgid="3704136912240060339">"Nastavi opozorilo o uporabi podatkov"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavitev omejitve količine prenesenih podatkov"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Omejitev porabe podatkov"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Vaša podatkovna povezava (<xliff:g id="NETWORKS">%1$s</xliff:g>) bo onemogočena, ko dosežete omejitev."\n\n"Ker uporabo podatkov meri telefon, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Vaša podatkovna povezava (<xliff:g id="NETWORKS">%1$s</xliff:g>) bo onemogočena, ko dosežete omejitev."\n\n"Ker uporabo podatkov meri telefon, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Vaša mobilna podatkovna povezava bo onemogočena, ko dosežete omejitev."\n\n"Ker uporabo podatkov meri tablični računalnik, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Vaša mobilna podatkovna povezava bo onemogočena, ko dosežete omejitev."\n\n"Ker uporabo podatkov meri telefon, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Želite omejiti podatke v ozadju?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Če omejite prenos mobilnih podatkov v ozadju, nekateri programi in storitve ne bodo delovali, kadar niste povezani v omrežje Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: približna količina prenesenih podatkov <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: približna količina prenesenih podatkov: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: približna količina prenesenih podatkov, merjena s tabličnim računalnikom: <xliff:g id="TOTAL">%1$s</xliff:g>. Operater jo lahko obračunava drugače."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: približna količina prenesenih podatkov, merjena s telefonom: <xliff:g id="TOTAL">%1$s</xliff:g>. Operater jo lahko obračunava drugače."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilne dostopne točke"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Izberite omrežja Wi-Fi, ki so mobilne dostopne točke. Aplikacijam v ozadju lahko omejite uporabo teh omrežij. Aplikacije vas lahko tudi opozorijo pred uporabo teh omrežij za prenos velike količine podatkov."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilna omrežja"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Omrežja Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Če želite izbrati mobilne dostopne točke, vklopite Wi-Fi."</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>
@@ -1540,12 +1655,14 @@
     <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_edit" msgid="8647191407179996943">"Urejanje profila VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Povezovanje z <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Dodajanje profila VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Urejanje profila"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Brisanja profila"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Ni omrežne povezave. Poskusite pozneje."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Ni potrdila. Uredite profil."</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>
@@ -1554,25 +1671,7 @@
     <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="477937585801538951">"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="3973201880357468747">"Če želite aktivirati program, ki se ga dotikate, ga tapnite. Pomikajte prst, dokler ne najdete ikone za <xliff:g id="APP_NAME">%s</xliff:g>. Nato ikono enkrat tapnite, da ga 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="8764686624055084454">"Č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="3055831259260848004">"Končali ste vadnico. Če jo želite zapustiti, poiščite gumb <xliff:g id="FINISH">%s</xliff:g> in se ga dotaknite."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Preverjanje črkovanja"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Črkovalnik"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Sem vnesite trenutno geslo za popolno varnostno kopiranje"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Sem vnesite novo geslo za popolno varnostno kopiranje"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Znova vnesite novo geslo za popolno varnostno kopiranje"</string>
@@ -1580,4 +1679,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Prekliči"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatne posodobitve sistema"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Uporabniki in omejitve"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Uporabniki"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj uporabnika"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Urejanje podrobnosti"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Podatki o uporabniku"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Ime"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Omejitve vsebine"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Zahteva za kodo PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Ocena vsebine"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Sistemske aplikacije"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Nameščene aplikacije"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Zavrzi"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Odstrani uporabnika"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Nadležen otrok"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Želite odstr. uporabnika?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Ali ste prepričani, da želite iz naprave odstraniti uporabnika in vse povezane podatke?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaži obvestila"</string>
+    <string name="help_label" msgid="1107174367904110532">"Pomoč"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index af91986..6652d97 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Прекидање везе..."</item>
     <item msgid="1634960474403853625">"Веза је прекинута"</item>
     <item msgid="746097431216080650">"Неуспешно"</item>
+    <item msgid="6367044185730295334">"Блокирано"</item>
+    <item msgid="503942654197908005">"Привремено избегавање лоше везе"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Прекидање везе са мрежом <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Веза је прекинута"</item>
     <item msgid="8578370891960825148">"Неуспешно"</item>
+    <item msgid="5660739516542454527">"Блокирано"</item>
+    <item msgid="1805837518286731242">"Привремено избегавање лоше везе"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Притискање дугмета"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ништа"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN са приступне тачке"</item>
-    <item msgid="7364462169350112617">"PIN са овог уређаја"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Статички"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Уклоњива SD картица"</item>
     <item msgid="4498124044785815005">"Нека систем одлучи"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Искључено"</item>
-    <item msgid="4804571292609523335">"Вибрирај"</item>
-    <item msgid="595707141547423573">"Искључи звук"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
     <item msgid="2560532955514699713">"Средње"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Размера анимације 5x"</item>
     <item msgid="6660750935954853365">"Размера анимације 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Анимација је искључена"</item>
+    <item msgid="1138649021950863198">"Размера анимације 0,5x"</item>
+    <item msgid="4394388961370833040">"Размера анимације 1x"</item>
+    <item msgid="8125427921655194973">"Размера анимације 1,5x"</item>
+    <item msgid="3334024790739189573">"Размера анимације 2x"</item>
+    <item msgid="3170120558236848008">"Размера анимације 5x"</item>
+    <item msgid="1069584980746680398">"Размера анимације 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандардно ограничење"</item>
     <item msgid="4071574792028999443">"Без позадинских процеса"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d9fbe15..2c3bc30 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Да"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
+    <string name="create" msgid="3578857613172647409">"Направи"</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>
@@ -111,6 +112,8 @@
     <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_device_details" msgid="4594773497930028085">"Подешавања уређаја"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Подешавања профила"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Није подешен назив, користи се назив налога"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Скенирај за уређаје"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Преименуј таблет"</string>
@@ -131,13 +134,12 @@
     <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="5655704645616731277">"Додирните за упаривање"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Нема 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="1931617700075106801">"Додирните да бисте упарили са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Додирните да бисте упарили са уређајем <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="device_picker" msgid="8398232791303186677">"Бирач Bluetooth уређаја"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Захтев за Bluetooth дозволу"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Апликација жели да укључи Bluetooth. Желите ли то да дозволите?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Апликација на таблету жели да учини таблет видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли то да дозволите?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Додирните да бисте се повезали са уређајем „<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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Потврди"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Име хоста које сте унели није важеће."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Листа изузимања коју сте унели није исправно обликована. Унесите листу раздвојену зарезима која садржи изузете домене."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Потребно је да попуните поље порта."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Треба да попуните поље порта."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поље за порт мора да буде празно ако је поље за назив хоста празно."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Унели сте неважећи порт."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прегледач користи HTTP прокси, али друге апликације не могу да га користе."</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"Промене ступају на снагу када USB кабл буде поново повезан"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Промене ће ступити на снагу када 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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB меморија није прикључена."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Нема 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="6691584887397909775">"Можете безбедно да уклоните USB меморију"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Сада можете безбедно да уклоните SD картицу"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB се користи као масовна меморија"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD картица се користи као уређај за масовно складиштење."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Сада можете да уклоните USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Сада можете безбедно да уклоните 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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB мемор. је само за читање."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Постављена SD картица је само за читање."</string>
     <string name="skip_label" msgid="47510779345218297">"Прес."</string>
     <string name="next_label" msgid="4693520878012668114">"Следеће"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Језик"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"Када омогућите пренос података у ромингу, могу да настану велики трошкови роминга!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Желите ли да дозволите пренос података у ромингу?"</string>
     <string name="networks" msgid="6333316876545927039">"Избор оператера"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Избор мрежног оператера"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Датум и време"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"Избор формата датума"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Побољшање подударања лица"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Провера живости"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Захтевај трептај ока"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када шифрујете таблет, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите: Не можете да опозовете шифровање таблета осим уколико не вратите фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје један сат или дуже. Потребно је да батерија на почетку буде напуњена и да таблет буде укључен док не завршите шифровање. Уколико прекинете процес шифровања, изгубићете све податке или део њих."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када шифрујете телефон, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите: не можете да опозовете шифровање телефона осим уколико не вратите фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје један сат или дуже. Потребно је да батерија на почетку буде напуњена и да телефон буде укључен док не завршите шифровање. Уколико прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали таблет, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете таблет осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете таблет док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали телефон, потребно је да унесете нумерички 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="2029407131227814893">"Напуните батерију и покушајте поново."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Укључите пуњач и покушајте поново."</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_dialog_need_password_message" msgid="4071395977297369642">"Потребно је да подесите PIN или лозинку за закључавање екрана да бисте могли да започнете шифровање."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Желите ли да шифрујете?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Операција шифровања је неопозива и уколико је прекинете, изгубићете податке. Шифровање траје један сат или дуже и у том периоду таблет ће се поново покренути неколико пута."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Операција шифровања је неопозива и уколико је прекинете, изгубићете податке. Шифровање траје један сат или дуже и у том периоду телефон ће се поново покренути неколико пута."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифровање"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Сачекајте да се таблет шифрује. Довршено је <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Сачекајте да се телефон шифрује. Довршено је <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="2223340178473871064">"Унесите лозинку"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифровање није успело"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. "\n\n" Да бисте наставили да користите таблет, морате да обавите враћање на фабричка подешавања. Када подесите таблет након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. "\n\n"Да бисте наставили да користите телефон, морате да обавите враћање на фабричка подешавања. Када подесите телефон након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Избор закључав. екрана"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. "\n\n" Да бисте наставили да користите таблет, потребно је да га вратите на фабричка подешавања. Када подесите таблет након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. "\n\n"Да бисте наставили да користите телефон, потребно је да га вратите на фабричка подешавања. Када подесите телефон након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Пребаци методе уноса"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Избор закључав. екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Закључавање рез. коп."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Закључавање екрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промена закључ. екрана"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Откључавање лицем"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Шаблон"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Лозинка"</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>
@@ -362,44 +367,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Лозинка мора да има мање од <xliff:g id="NUMBER">%d</xliff:g> знак(ов)а."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN мора да има мање од <xliff:g id="NUMBER">%d</xliff:g> цифре(ара)."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN мора да садржи само цифре 0–9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Администратор уређаја не дозвољава употребу недавно коришћеног PIN-а."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Лозинка садржи неважећи знак."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Лозинка мора да садржи најмање једно слово."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Лозинка мора да садржи најмање једну цифру."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Лозинка мора да садржи најмање један симбол."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"Лозинка мора да садржи најмање 1 слово"</item>
-    <item quantity="other" msgid="7278096339907683541">"Број слова које лозинка мора да садржи: најмање %d"</item>
+    <item quantity="one" msgid="3063853802158131458">"Лозинка мора да садржи најмање 1 слово."</item>
+    <item quantity="other" msgid="8186027808415585970">"Лозинка мора да садржи најмање %d слова."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"Лозинка мора да садржи најмање 1 мало слово"</item>
-    <item quantity="other" msgid="588499075580432178">"Број малих слова које лозинка мора да садржи: најмање %d"</item>
+    <item quantity="one" msgid="5583986519662091001">"Лозинка мора да садржи најмање 1 мало слово."</item>
+    <item quantity="other" msgid="2693910942679679225">"Лозинка мора да садржи најмање %d мала(их) слова."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"Лозинка мора да садржи најмање 1 велико слово"</item>
-    <item quantity="other" msgid="2183090598541826806">"Број великих слова које лозинка мора да садржи: најмање %d"</item>
+    <item quantity="one" msgid="2611909966725502768">"Лозинка мора да садржи најмање 1 велико слово."</item>
+    <item quantity="other" msgid="3030801209112209245">"Лозинка мора да садржи најмање %d велика(их) слова."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"Лозинка мора да садржи најмање 1 цифру"</item>
-    <item quantity="other" msgid="995673409754935278">"Број цифара које лозинка мора да садржи: најмање %d"</item>
+    <item quantity="one" msgid="3820355568839621231">"Лозинка мора да садржи најмање 1 цифру."</item>
+    <item quantity="other" msgid="4703982391407595924">"Лозинка мора да садржи најмање %d цифре(ара)."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"Лозинка мора да садржи најмање 1 специјални симбол"</item>
-    <item quantity="other" msgid="3047460862484105274">"Број специјалних симбола које лозинка мора да садржи: најмање %d"</item>
+    <item quantity="one" msgid="8456579939292408631">"Лозинка мора да садржи најмање 1 посебан симбол."</item>
+    <item quantity="other" msgid="1221290525051187757">"Лозинка мора да садржи најмање %d посебна(их) симбола."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"Лозинка мора да садржи најмање 1 знак који није слово"</item>
-    <item quantity="other" msgid="5574191164708145973">"Број знакова који нису слова које лозинка мора да садржи: најмање %d"</item>
+    <item quantity="one" msgid="4594051152085925921">"Лозинка мора да садржи најмање 1 знак који није слово."</item>
+    <item quantity="other" msgid="3952508584649046404">"Лозинка мора да садржи најмање %d знак(ов)а који нису слова."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Администратор уређаја не дозвољава употребу недавно коришћене лозинке"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Администратор уређаја не дозвољава употребу недавно коришћене лозинке."</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="lock_setup" msgid="1759001157415978959">"Подешавање је довршено"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Подешавање је довршено."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"За упаривање са уређајем:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Унесите потребни приступни кôд уређаја:"</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_enter_pin_other_device" msgid="4637977124526813470">"Можда ће бити потребно да унесете овај PIN и на другом уређају."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Можда ће бити потребно да унесете овај приступни кôд и на другом уређају."</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="2796550001376088433">"За упаривање са уређајем:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Унесите на њему:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, а затим притисните Return или Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Упаривање са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> није могуће због нетачног PIN-а или приступног кода."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Није могуће комуницирати са уређајем <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_connecting_error_message" msgid="229861986106185022">"Није могуће повезати се са уређајем <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Омогућавање размене података када телефон додирне други уређај"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Омогућавање размене података када таблет додирне други уређај"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Омогућавање размене података када телефон додирне други уређај"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Спремно за пренос садржаја апликација преко NFC-а"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Искључено"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно зато што је NFC искључен"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Када је ова функција укључена, можете да преносите садржај апликација на други уређај на коме је омогућен NFC тако што ћете приближити уређаје један другоме. На пример, можете да преносите странице прегледача, YouTube видео снимке, контакте из апликације Људи и још пуно тога."\n\n"Само прислоните уређаје један на други (обично са задње стране), а затим додирните екран. Апликација одређује шта ће бити пренето."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Откривање мрежне услуге"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Дозвољава апликацијама на другим уређајима да откривају апликације на овом уређају"</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="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_setup_wizard_title" msgid="70277346338812325">"Избор Wi-Fi мреже"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Није могуће скенирати мреже"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Обавештење мреже"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Обавести ме када је отворена мрежа доступна"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Избегавај лоше везе"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Не користи Wi-Fi мрежу осим ако нема добру интернет везу"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Избегавај лоше везе"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Не користи Wi-Fi мрежу осим ако нема добру интернет везу"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Не искључуј 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_wps_pbc" msgid="2668564692207863017">"WPS дугме"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Унос WPS PIN-а"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Тражење Wi-Fi мрежа..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Још"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Аутоматско подешавање (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Прикажи напредне опције"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"Унесите PIN са приступне тачке"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Подешавање WPS-а"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Унесите 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_wps_setup_title" msgid="6034518116333042484">"Заштићено подешавање Wi-Fi-ја"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Покретање WPS-а..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Притисните дугме Заштићено подешавање Wi-Fi-ја на рутеру. Можда се зове „WPS“ или садржи овај симбол:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Унесите PIN <xliff:g id="NUMBER">%1$s</xliff:g> на Wi-Fi рутеру. Подешавање ће бити довршено за највише два минута."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS је успео. Повезивање на мрежу..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Повезано са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS је већ покренут и биће довршен за највише два минута"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS није успео. Покушајте поново за неколико минута."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Безбедносно подешавање бежичног рутера (WEP) није подржано"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Безбедносно подешавање бежичног рутера (TKIP) није подржано"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Потврда аутентичности није успела. Покушајте поново."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Откривена је друга WPS сесија. Покушајте поново за неколико минута."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Мрежни SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безбедност"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Јачина сигнала"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Сачувано"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Онемогућено"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Онемогућено због лоше интернет везе"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Мрежа је избегнута због лоше везе. Искључите ово подешавање на екрану Подешавања &gt; Wi-Fi, ставка менија Напредно."</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="3538912605343585226">"Заштићена мрежа је доступна"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (заштићена мрежа је доступна)"</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_failed_connect_message" msgid="8491902558970292871">"Повезивање са мрежом није успело"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Брисање мреже није успело"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сачувај"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Чување мреже није успело"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Откажи"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Откривена је још једна Wi-Fi заштићена сесија. Покушајте опет за пар минута."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Мрежни пролаз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Дужина префикса мреже"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Подешавање везе између равноправних уређаја"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Информације о уређају"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi заштићено подешавање"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Унесите 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_remove_group" msgid="4844634506540667517">"Уклони групу"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Напредна подешавања"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Доступни уређаји"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Претражи уређаје"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Претраживање…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Преименуј уређај"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Равноправни уређаји"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Повезивање није могуће."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Преименовање уређаја није успело."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Желите ли да прекинете везу?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Ако прекинете везу, окончаћете везу са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ако прекинете везу, окончаћете везу са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g> и другим уређајима (<xliff:g id="PEER_COUNT">%2$s</xliff:g>)."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Желите ли да откажете позивницу?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Желите ли да откажете позивницу за повезивање са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_ap_text" msgid="61237027772641155">"Подеси 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="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Нечујни режим"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Звук звона телефона"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Јачине звука"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Музички ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Јачина звука звона"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрација у нечујном режиму"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Вибрирај и звони"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Искључи звук мелодије звона и обавештења"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Искључи музику и друге медије"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Искључи звук обавештења"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Искључи звук аларма"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вибрирај када звони"</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>
@@ -623,14 +651,15 @@
     <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="9015625921245904495">"Потребно је да поставите таблет на базну станицу пре него што подесите звук базне станице."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Потребно је да поставите телефон на базну станицу пре него што подесите звук базне станице."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Треба да поставите таблет на базну станицу пре него што подесите звук базне станице."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Потребно је да поставите телефон на базну станицу пре него што подесите звук базне станице."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Звук уметања базне станице"</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>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <string name="search_settings" msgid="1910951467596035063">"Претрага"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Управљање подешавањима претраге и историјом"</string>
     <string name="display_settings" msgid="7965901687241669598">"Приказ"</string>
@@ -702,7 +731,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Желите ли да избришете све личне информације и преузете апликације? Не можете да опозовете ову радњу!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Избриши све"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Нацртајте шаблон за откључавање"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Морате да нацртате шаблон за откључавање да бисте потврдили враћање фабричких података."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Треба да нацртате шаблон за откључавање да бисте потврдили враћање фабричких података."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Није обављено враћање на почетне вредности зато што услуга брисања система није доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Враћање на почетне вредности?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Брисање USB меморије"</string>
@@ -838,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Желите ли да избришете 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="nosdcard" msgid="2192044794228379224">"Потребно је да нацртате шаблон за откључавање да бисте потврдили да желите да избришете USB меморију."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Треба да нацртате шаблон за откључавање да бисте потврдили да желите да избришете 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="6688416425801386511">"USB Интернет повезивање"</string>
@@ -870,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Мобилне мреже"</string>
     <string name="location_title" msgid="1029961368397484576">"Мојa локацијa"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google-ова услуга лоцирања"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Нека апликације користе податке из извора као што су Wi-Fi и мобилне мреже за приближну локацију"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Дозволи да се анонимни подаци о локацији шаљу Google-у. Дозволи и да одобрене аплик. за утврђивање прибл. локације користе податке са извора, као што су 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>
@@ -915,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Притисните „Мени“ да бисте добили помоћ."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Пустите прст када завршите."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Повежите се са најмање <xliff:g id="NUMBER">%d</xliff:g> тачке(ака). Покушајте поново:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Шаблон је снимљен!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Образац је снимљен."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Поново нацртајте шаблон како бисте потврдили:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Нови шаблон за откључавање:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Потврди"</string>
@@ -937,7 +966,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Следеће"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Обезбеђивање таблета"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Обезбеђивање телефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Заштитите таблет од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану повежите тачке прстом било којим редоследом. Морате да повежете најмање четири тачке. "\n\n"Да ли сте спремни да почнете? Додирните Следеће."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Заштитите таблет од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану превлачите прстом да бисте повезали тачке било којим редоследом. Потребно је да повежете најмање четири тачке. "\n\n"Да ли сте спремни да почнете? Додирните Даље."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Заштитите телефон од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану повежите прстом најмање четири тачке било којим редоследом. "\n\n"Спремни сте да почнете? Додирните Следеће."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управљај апликацијама"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управљање инсталираним апликацијама и њихово уклањање"</string>
@@ -945,7 +974,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Управљање апликацијама, подешавање пречица за брзо покретање"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Подешавања апликације"</string>
     <string name="install_applications" msgid="4872012136210802181">"Непознати извори"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Омогућавање инсталирања апликација које нису са Market-а"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Дозволи инсталацију апликација из непознатих извора"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Таблет и лични подаци су подложнији нападу апликација из непознатих извора. Сагласни сте да сте само ви одговорни за сву штету на таблету или губитак података до којих може да дође услед коришћења ових апликација."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Телефон и лични подаци су подложнији нападу апликација из непознатих извора. Сагласни сте да сте само ви одговорни за сву штету на телефону или губитак података до којих може да дође услед коришћења ових апликација."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Напредна подешавања"</string>
@@ -953,6 +982,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Информације о апликацији"</string>
     <string name="storage_label" msgid="8700867073480107253">"Складиште"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Подразумевано покрени"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Подразумевана подешавања"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Компатибилност екрана"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Дозволе"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кеш"</string>
@@ -972,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Обриши податке"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Деинсталирај ажурирања"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Изабрали сте подразумевано покретање ове апликације за неке радње."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Изабрали сте да дозволите овој апликацији да прави виџете и приступа њиховим подацима."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Нису постављене подразумеване вредности."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Обриши подразумевано"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Ова апликација можда није дизајнирана за ваш екран. Овде можете да контролишете како ће се прилагодити вашем екрану."</string>
@@ -982,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Сортирај према величини"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Прикажи покренуте услуге"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Прикажи кеширане процесе"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Ресетуј подешавања аплик."</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Жел. да ресет. под. апл.?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Овим ћете ресетовати сва подешавања за:"\n\n" "<li>"Онемогућене апликације"</li>\n" "<li>"Обавештења о онемогућеним апликацијама"</li>\n" "<li>"Подразумеване апликације за радње"</li>\n" "<li>"Ограничења података у позадини за апликације"</li>\n\n" Нећете изгубити никакве податке о апликацијама."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Ресетуј апликације"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управљај простором"</string>
     <string name="filter" msgid="2018011724373033887">"Филтрирај"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Избор опција филтера"</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ова апликација може да приступа следећим ставкама на таблету:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ова апликација може да приступа следећим ставкама на телефону:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Израчунавање..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"Није могуће израчунати величину пакета"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"Није могуће израчунати величину пакета."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Нисте инсталирали ниједну апликацију независног произвођача."</string>
     <string name="version_text" msgid="9189073826278676425">"верзија <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Премести"</string>
@@ -1032,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Мењање жељене локације за инсталацију нових апликација"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Желите да онемогућите уграђену апл.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ако онемогућите уграђену апликацију, друге апликације ће се можда неочекивано понашати."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Желите ли да искљ. обавештења?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ако искључите обавештења за ову апликацију, можете да пропустите важна обавештења и ажурирања."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Коришћење меморије"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Преглед искоришћене меморије по апликацијама"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Покренуте услуге"</string>
@@ -1084,19 +1121,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Овај метод уноса можда може да прикупља сав текст који уносите, укључујући личне податке, као што су лозинке и бројеви кредитних картица. Потиче од апликације <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Желите ли да користите овај метод уноса?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Овај контролор правописа можда може да прикупља сав текст који куцате, укључујући личне податке као што су лозинке и бројеви кредитних картица. Потиче од апликације <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Желите ли да користите овај контролор правописа?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Подешавања"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Језик"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Отварање подешавања за апликацију <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> није успело"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Миш/додирна табла"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Брзина показивача"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Контролер за игре"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Користи вибрацију"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Преусмерите вибрацију на контролер за игре када је повезан."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Избор распореда тастатуре"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Подеси распореде тастатуре"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Да бисте пребацили, притисните Control-Spacebar"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Подразумевано"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Распореди тастатуре"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Кориснички речник"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Лични речник"</string>
     <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_add_screen_title" msgid="742580720124344291">"Фраза"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Више опција"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Мање опција"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"Потврди"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Реч:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Пречица:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Језик:"</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="8165273379942105271">"Немате ниједну реч у корисничком речнику. Додајте реч додиром на дугме Додај (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Сви језици"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"За све језике"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Још језика..."</string>
     <string name="testing" msgid="6584352735303604146">"Тестирање"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информације о таблету"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информације о телефону"</string>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Подешавање опција за програмирање апликације"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отклањање USB грешака"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим отклањања грешака када је USB повезан"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ИД програмирања уређаја"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Информације о уређају нису доступне"</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="7316799925425402244">"Отклањање USB грешака намењено је само за сврхе програмирања. Користите га за копирање података са рачунара на уређај и обрнуто, инсталирање апликација на уређају без обавештења и читање података из евиденције."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Желите ли да омогућите програмерска подешавања?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ова подешавања су намењена само за програмирање. Могу да изазову престанак функционисања или неочекивано понашање уређаја и апликација на њему."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Заштити USB меморију"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Апликације морају да захтевају дозволу за читање USB меморије"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Желите да заштитите USB меморију?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Када је USB меморија заштићена, апликације морају да захтевају дозволу за читање података из спољне меморије."\n\n"Неке апликације можда неће функционисати док их програмери не буду ажурирали."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Заштити SD картицу"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Апликације морају да захтевају дозволу за читање SD картице"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Желите да заштитите SD картицу?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Када је SD картица заштићена, апликације морају да захтевају дозволу за читање података из спољне меморије."\n\n"Неке апликације можда неће функционисати док их програмери не буду ажурирали."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Избор гаџета"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Избор виџета"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Желите ли да направите виџет и дозволите приступ?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Када направите виџет, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> може да приступа свим подацима које приказује."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Увек дозволи да <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> прави виџете и приступа њиховим подацима"</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>
@@ -1160,12 +1227,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Велики текст"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Дугме за напајање прекида позив"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Изговорите лозинке"</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="3264723681038625967">"Инсталирање веб скрипти"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Побољшајте приступачност Веба"</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>
@@ -1180,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ниједна услуга није инсталирана"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Потребан вам је читач екрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack пружа говорне повратне информације како би помогао слепим корисницима и корисницима са слабим видом. Да ли желите да га бесплатно инсталирате са Android Market-а?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Желите ли да инсталирате веб скрипте?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Да ли желите да апликације инсталирају скрипте из Google-а помоћу којих ће њихов веб садржај постати приступачнији?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ова функција мења начин на који уређај реагује на додир. Желите ли да је укључите?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Није наведен опис."</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_not_available" msgid="3214000535532434353">"Нема података о кориш. батерије"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1347,7 @@
     <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" msgid="3305141107104670703">"Није могуће покренути уређај који сте изабрали."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигуриши"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Изабери други уређај"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ова технологија за синтезу говора можда може да прикупља сав текст који ће бити изговорен, укључујући личне податке као што су лозинке и бројеви кредитних картица. То потиче из технологије <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Желите ли да омогућите коришћење ове технологије за синтезу говора?"</string>
@@ -1301,7 +1363,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"Омогући нов механизам пре употребе."</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>
@@ -1318,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Нацртајте шаблон за откључавање"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Потребно је да нацртате шаблон за откључавање да бисте потврдили инсталацију акредитива."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Унесите лозинку за складиште акредитива."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Тренутна лозинка:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Складиште акред. је избрисано."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Није могуће oбрисати складиште акредитива."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Складиште акредитива је омогућено."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Морате да подесите PIN или лозинку за закључавање екрана да бисте могли да користите складиште акредитива."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Треба да подесите PIN или лозинку за закључавање екрана да бисте могли да користите складиште акредитива."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за хитне позиве"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитни позив"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Прављење резервне копије и враћање на почетне вредности"</string>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Аутоматско враћање"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Када поново инсталирате апликацију, вратите резервне копије подешавања и података"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Рез. копија лоз. рачунара"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Резервне копије читавог система тренутно нису заштићене."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Изаберите да бисте променили или уклонили лозинку за прављење резервних копија читавог система на рачунару"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Резервне копије читавог система тренутно нису заштићене"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Додирните да бисте променили или уклонили лозинку за прављење резервних копија читавог система на рачунару"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Желите ли да зауставите прављење резервних копија Wi-Fi лозинки, обележивача, осталих подешавања и података о апликацијама, као и да избришете све копије на Google серверима?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Подешавања администрације уређаја"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Овај администратор је активан и омогућава да апликација <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">"Мелодија звона и обавештења"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Обавештења"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Систем"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Мелодија звона и вибрација позива"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"Систем"</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="3747859666621319757">"Повезивање са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1457,10 @@
     <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_failed" msgid="1696499856374109647">"Синхронизација није успела"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Синхронизација је активна"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <string name="sync_is_failing" msgid="1591561768344128377">"Синхронизација тренутно има проблема. Ускоро ће се вратити."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Додај налог"</string>
     <string name="background_data" msgid="5779592891375473817">"Подаци о позадини"</string>
@@ -1404,6 +1471,10 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Синхрон. је УКЉУЧЕНА"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Синхр. је ИСКЉУЧЕНА"</string>
     <string name="sync_error" msgid="5060969083117872149">"Грешка при синхрон."</string>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <string name="settings_backup" msgid="2274732978260797031">"Направи резервну копију подешавања"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Прављење резервне копије подешавања"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Синхронизуј одмах"</string>
@@ -1413,7 +1484,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Добро дошли у Google синхронизацију!"</font>\n"Google-ов приступ синхронизовању података како би се омогућио приступ контактима, обавезама и још много чему без обзира на то где се налазите."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Подешавања синхронизације апликација"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Подаци и синхронизација"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Промени лозинку"</string>
@@ -1427,7 +1498,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Неке апликације захтевају овај налог. Можете да га уклоните једино ако вратите таблет на подразумеване фабричке вредности (чиме бришете све личне податке) у менију Подешавања &gt; Резервна копија и враћање на почетне вредности."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Неке апликације захтевају овај налог. Можете да га уклоните једино ако вратите телефон на подразумеване фабричке вредности (чиме бришете све личне податке) у менију Подешавања &gt; Прављење резервне копије и враћање на почетне вредности."</string>
     <string name="provider_label" msgid="7724593781904508866">"Пријаве за Push"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"Синхр. <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Ручно синхронизовање није могуће"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизација за ову ставку је тренутно онемогућена. Да бисте променили ово подешавање, привремено укључите позадинске податке и аутоматску синхронизацију."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Подешавања за 4G"</string>
@@ -1435,7 +1507,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC адреса"</string>
     <string name="enter_password" msgid="4131758584074246224">"Унесите лозинку да бисте дешифровали меморију"</string>
     <string name="try_again" msgid="4272075051293936921">"Покушајте поново."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Услуга је заузета. Покушајте поново."</string>
     <string name="delete" msgid="4219243412325163003">"Избриши"</string>
     <string name="misc_files" msgid="6720680815969643497">"Разне датотеке"</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>
@@ -1443,21 +1514,46 @@
     <string name="select_all" msgid="1562774643280376715">"Изабери све"</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="debug_debugging_category" msgid="6781250159513471316">"Отклањање грешака"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Изаберите апликацију за отклањање грешака"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Нема подешених апликација за отклањање грешака"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Апликација за отклањање грешака: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Бирање апликације"</string>
+    <string name="no_application" msgid="2813387563129153880">"Ништа"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Сачекај програм за отклањање грешака"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Аплик. чека прог. за отклањ. грешака да приложи пре извршавања"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Унос"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Цртање"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Надгледање"</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_screen_updates" msgid="5470814345876056420">"Прик. ажурирања површине"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Осветли све површине прозора када се ажурирају"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Прикажи ажур. GPU приказа"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Осветли приказе у прозор. када се црта са GPU-ом"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Онемог. HW пост. елементе"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Увек користи GPU за компоновање екрана"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Омогући трагове"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Изабери омогућене трагове"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Тренутно нема омогућених трагова"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Тренутно су омогућени трагови (<xliff:g id="NUM">%1$d</xliff:g>)"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Сви трагови су тренутно омогућени"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Прикажи границе распореда"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Прик. употребу процесора"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Постав. елемент са тренутном употребом процесора"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Принудни приказ пом. GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Коришћење 2D хардверског убрзања у апликацијама"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Принудно користи GPU за 2D цртање"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Прикажи профил помоћу GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Мери време приказивања у adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Размера анимације прозора"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Размера анимације прелаза"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator размера трајања"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Апликације"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не чувај активности"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Уништи сваку активност чим је корисник напусти"</string>
@@ -1471,13 +1567,15 @@
     <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_menu_metered" msgid="5056695223222541863">"Мобилни хотспотови"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <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="8621855507876539282">"У овом периоду апликације нису користиле податке."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Први план"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Позадина"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Мерење је обавио таблет. Oбрачун потрошње података оператера може да се разликује."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Мерење је обавио телефон. Обрачун потрошње података оператера може да се разликује."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"ограничена"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Желите ли да онемогућите податке за мобилне уређаје?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Подеси ограничење за мобил. под."</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Подеси ограничење за 4G податке"</string>
@@ -1488,33 +1586,50 @@
     <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_list_mobile" msgid="5588685410495019866">"Мобилне"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Ниједна"</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="8430240158135453271">"Прикажи подешавања апликације"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ограничи позадинске податаке"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Онемогући позадинске податке само у мобилној мрежи. Wi-Fi се користи ако је доступан."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Онемогући позадинске податке у мобилним мрежама. Користи немобилне мреже ако су доступне."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"За ограничење позадинских података за ову апл. прво ограничите мобилне податке."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Желите ли да ограничите позадинске податке?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Ова функција може да заустави апликацију која зависи од позадинских података када Wi-Fi није доступан."\n\n"Адекватније контроле за коришћење података можете да нађете у подешавањима доступним унутар апликације."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ова функција може да заустави апликацију која зависи од позадинских података када су доступне само мобилне мреже."\n\n"Адекватније контроле за коришћење података можете да пронађете у подешавањима доступним у оквиру апликације."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ограничавање позадинских података је могуће само када будете подесили ограничење за мобилне податке."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <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_warning_editor_title" msgid="3704136912240060339">"Подешавање упозорења о коришћењу података"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Подешавање ограничења за коришћење података"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ограничавање потрошње података"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Веза за пренос података мреже <xliff:g id="NETWORKS">%1$s</xliff:g> биће онемогућена када се достигне назначено ограничење."\n\n"Пошто таблет мери потрошњу података, а оператер може да обрачуна потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Веза за пренос података мреже <xliff:g id="NETWORKS">%1$s</xliff:g> биће онемогућена када се достигне назначено ограничење."\n\n"Пошто телефон мери потрошњу података, а оператер може да обрачуна потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобилна веза за пренос података биће онемогућена када се достигне назначено ограничење."\n\n"Пошто таблет мери потрошњу података, а оператер може да обрачунава потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобилна веза за пренос података биће онемогућена када се достигне назначено ограничење."\n\n"Пошто телефон мери потрошњу података, а оператер може да обрачунава потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Желите ли да ограничите позадинске податке?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати осим ако нисте повезани са Wi-Fi мрежом."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: Искоришћено је око <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: Искоришћено је око <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: Таблет је измерио да је искоришћено око <xliff:g id="TOTAL">%1$s</xliff:g>. Оператер можда другачије мери."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: Телефон је измерио да је искоришћено око <xliff:g id="TOTAL">%1$s</xliff:g>. Оператер можда другачије мери."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Мобилни хотспотови"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Изаберите Wi-Fi мреже које су хотспотови за мобилне уређаје. Апликације неће моћи да користе ове мреже када су у позадини. Апликације ће вас можда и упозорити пре коришћења ових мрежа за велика преузимања."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилне мреже"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi мреже"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Да бисте изабрали мобилне хотспотове, укључите Wi-Fi."</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>
@@ -1540,12 +1655,14 @@
     <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_edit" msgid="8647191407179996943">"Измена VPN профила"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Повезивање на профил <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Додавање VPN профила"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Измени профил"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Избриши профил"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Није успостављена мрежна веза. Покушајте поново касније."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Недостаје сертификат. Измените профил."</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>
@@ -1554,25 +1671,7 @@
     <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="477937585801538951">"Након што укључите Истраживање додиром, можете да додирнете екран да бисте сазнали на шта сте ставили прст. На пример, тренутни екран садржи иконе апликација. Пронађите неку од њих тако што ћете додирнути екран и превлачити прст наоколо."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Одлично. Наставите да превлачите прстом по екрану док не нађете још најмање једну икону."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Да бисте активирали нешто преко чега прелазите прстима, додирните га. Превлачите прстом док не пронађете икону за <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="8764686624055084454">"Да бисте померали кроз листу, можете да вучете два прста дуж екрана. На пример, тренутни екран садржи листу назива апликација коју можете да померате нагоре или надоле. Као прво, покушајте да идентификујете неколико ставки на листи тако што ћете превлачити један прст наоколо."</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="3055831259260848004">"Дошли сте до краја водича. Да бисте изашли, пронађите и додирните дугме <xliff:g id="FINISH">%s</xliff:g>."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Провера правописа"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Провера правописа"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Овде унесите тренутну лозинку за прављење резервне копије читавог система"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Овде унесите нову лозинку за прављење резервних копија читавог система"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Овде поново унесите нову лозинку за прављење резервне копије читавог система"</string>
@@ -1580,4 +1679,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Откажи"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Додатна ажурирања система"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Корисници и ограничења"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Корисници"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Додај корисника"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Измена детаља"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Информације о кориснику"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Име"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Ограничења садржаја"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Захтева PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Оцена садржаја"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Системске апликације"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Инсталиране апликације"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Одбаци"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Уклони корисника"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Несташно дете"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Уклоните корисника?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Желите ли заиста да уклоните корисника и све повезане податке са уређаја?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Прикажи обавештења"</string>
+    <string name="help_label" msgid="1107174367904110532">"Помоћ"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 82bf6d3..c6afcbf 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Kopplar ifrån…"</item>
     <item msgid="1634960474403853625">"Frånkopplad"</item>
     <item msgid="746097431216080650">"Misslyckades"</item>
+    <item msgid="6367044185730295334">"Blockerat"</item>
+    <item msgid="503942654197908005">"Undviker just nu dålig anslutning"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Kopplar ifrån <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Frånkopplad"</item>
     <item msgid="8578370891960825148">"Misslyckades"</item>
+    <item msgid="5660739516542454527">"Blockerat"</item>
+    <item msgid="1805837518286731242">"Undviker just nu dålig anslutning"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Tryckknapp"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Inga"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN från åtkomstpunkten"</item>
-    <item msgid="7364462169350112617">"PIN-kod från enheten"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statisk"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Flyttbart SD-kort"</item>
     <item msgid="4498124044785815005">"Låt systemet bestämma"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Inaktiverat"</item>
-    <item msgid="4804571292609523335">"Vibrera"</item>
-    <item msgid="595707141547423573">"Ljud av"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Mellan"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animering i skala 5x"</item>
     <item msgid="6660750935954853365">"Animering i skala 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animering avstängd"</item>
+    <item msgid="1138649021950863198">"Animering i skala 0,5x"</item>
+    <item msgid="4394388961370833040">"Animering i skala 1x"</item>
+    <item msgid="8125427921655194973">"Animering i skala 1,5x"</item>
+    <item msgid="3334024790739189573">"Animering i skala 2x"</item>
+    <item msgid="3170120558236848008">"Animering i skala 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 968f5bb..cc053c5 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nej"</string>
+    <string name="create" msgid="3578857613172647409">"Skapa"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Förhindra att bluetooth-uppringningsfunktionen används när skärmen är låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheter"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Enhetens namn"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Enhetsinställningar"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profilinställningar"</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_rename_device" product="tablet" msgid="787970073150631155">"Byt namn på pekdator"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Parkoppling…"</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="5655704645616731277">"Tryck om du vill koppla"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"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="1931617700075106801">"Tryck om du vill koppla till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Tryck om du vill koppla till <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="device_picker" msgid="8398232791303186677">"Bluetooth-enhetsväljare"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Begäran om Bluetooth-behörighet"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"En app vill aktivera Bluetooth. Vill du tillåta detta?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på pekdatorn vill göra pekdatorn synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Tryck om du vill 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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Värdnamnet som du har angett är inte giltigt."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"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_port" msgid="5539106187558215246">"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="2671425042711054494">"Porten som du har angett är inte giltig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyn används av webbläsaren men får inte användas av de andra apparna."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Ställ in"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Misslyckades"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Lyckades"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Ändringarna börjar gälla när USB-kabeln har anslutits igen"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Ändringarna börjar gälla när USB-kabeln har anslutits igen."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Aktivera USB-masslagring"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Totalt antal bytes:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-enheten ej demonterad"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Inget SD-kort"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Ingen USB-enhet är monterad."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Inget SD-kort."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Tillgängliga bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-lagringsenhetet används som masslagringsenhet"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD-kort används som enhet för masslagring"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Säkert att ta bort USB-enheten"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Det är nu säkert att ta bort SD-kortet"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB används för masslagring."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD-kort används som masslagringsenhet."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Säkert att ta bort USB-enhet."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Det är nu säkert att ta bort SD-kortet."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-enheten togs borts fast den användes!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD-kortet togs bort medan det användes!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes som har använts:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Söker efter media på USB-enhet..."</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Skrivskydd. USB-enhet monterad"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Språk"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Anslut till datatjänster vid roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Du förlorade dataanslutningen eftersom du lämnade ditt hemnätverk utan att aktivera roaming."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Aktivera"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Tillåta roaming? Observera att detta kan leda till höga kostnader!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Obs!"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"När du tillåter roaming kan det tillkomma vissa avgifter!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Vill du tillåta roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Val av operatör"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Välj en nätverksoperatör"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum och tid"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Ange tid"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Välj tidszon"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Ange datum"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Välj datumformat"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"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="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Förbättra ansiktsmatchningen"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Liveness-kontroll"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Kräv ögonblinkning"</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>
@@ -306,26 +310,27 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ange PIN-kod eller lösenord för att dekryptera pekdatorn varje gång du slår på den"</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 du slår på den"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"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 du startar enheten för att den ska dekrypteras. Pekdatorn kan inte dekrypteras 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="3504519024884099702">"Du kan kryptera konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du har krypterat mobilen måste du ange en PIN-kod eller ett lösenord varje gång du startar enheten för att den ska dekrypteras. Mobilen kan inte dekrypteras 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="tablet" msgid="3839235202103924154">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar pekdatorn måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data."\n\n"Krypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar mobilen måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data."\n\n"Krypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina 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="2029407131227814893">"Ladda batteriet och försök igen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"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_dialog_need_password_message" msgid="4071395977297369642">"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="5100339496381875522">"Vill du kryptera?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det 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="5682944380460921880">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas mobilen om flera gånger."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Krypterar"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Vänta medan pekdatorn krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vänta medan mobilen 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="2223340178473871064">"Ange ditt lösenord"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krypteringen misslyckades"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Krypteringen avbröts och kan inte slutföras. Data på pekdatorn är därför inte tillgängliga längre. "\n\n" Om du vill fortsätta använda pekdatorn måste du återställa standardinställningarna. När du konfigurerar pekdatorn efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Krypteringen avbröts och kan inte slutföras. Data på mobiltelefonen är därför inte tillgängliga längre. "\n\n"Om du vill fortsätta använda mobilen måste du återställa standardinställningarna. När du konfigurerar telefonen efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Välj skärmlås"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen avbröts och kan inte slutföras. Data på pekdatorn är därför inte tillgängliga längre."\n\n" Om du vill fortsätta använda pekdatorn måste du återställa standardinställningarna. När du konfigurerar pekdatorn efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen avbröts och kan inte slutföras. Data på mobilen är därför inte tillgängliga längre."\n\n"Om du vill fortsätta använda mobilen måste du återställa standardinställningarna. När du konfigurerar enheten efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Växla inmatningsmetod"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Välj skärmlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Välj lås för säkerhetskopiering"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Ansiktslås"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Grafiskt lösenord"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kod"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden måste innehålla minst %d tecken"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Lösenordet får inte innehålla mer än  <xliff:g id="NUMBER">%d</xliff:g> tecken."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN-koden får inte innehålla mer än <xliff:g id="NUMBER">%d</xliff:g> siffror."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN-koden får bara innehålla siffrorna 0 till 9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Enhetsadministratören tillåter inte att en PIN-kod som använts nyligen används igen."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Lösenordet innehåller ett ogiltigt tecken."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Lösenord måste innehålla minst en bokstav."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Lösenord måste innehålla minst en siffra."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Lösenord måste innehålla minst en bokstav."</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Lösenordet måste innehålla minst en liten bokstav."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Lösenord måste innehålla minst en stor bokstav."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Lösenord måste innehålla minst en siffra."</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Lösenord måste innehålla minst en specialsymbol."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Lösenordet måste innehålla minst ett tecken som inte är en bokstav."</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"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="lock_setup" msgid="1759001157415978959">"Konfigurationen är klar"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Installationen är klar."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhetsadministration"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Koppla till:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Ange den obligatoriska nyckeln för enheten:"</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_enter_pin_other_device" msgid="4637977124526813470">"Du kan också behöva ange PIN-koden på den andra enheten."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"Koppla till:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Skriv:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> och tryck sedan på Retur."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Det gick inte att koppla till <xliff:g id="DEVICE_NAME">%1$s</xliff:g> på grund av en felaktig PIN-kod eller nyckel."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Det går inte att kommunicera med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Tillåt datautbyte när mobilen vidrör en annan enhet"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillåt datautbyte när pekdatorn vidrör en annan enhet"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillåt datautbyte när mobilen vidrör en annan enhet"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Redo att överföra appinnehåll via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Av"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Inte tillgängligt eftersom NFC är inaktiverat"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"När den här funktionen är aktiverad kan du överföra appinnehåll till en annan NFC-kompatibel enhet genom att hålla enheterna mot varandra. Du kan t.ex. överföra webbläsarsidor, YouTube-videoklipp, kontakter med mera."\n\n"Håll bara enheterna mot varandra (oftast baksida mot baksida) och tryck sedan på skärmen. Appen avgör vad som överförs."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Hitta nätverkstjänst"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Tillåt att appar på andra enheter hittar appar på den här enheten"</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="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_setup_wizard_title" msgid="70277346338812325">"Välj Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Det går inte att söka efter nätverk"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Nätverksmeddelande"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Meddela mig när ett öppet nätverk är tillgängligt"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Undvik dåliga anslutningar"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Använd inte ett Wi-Fi-nätverk såvida det inte har en bra Internetanslutning"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undvik dåliga anslutningar"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Använd inte Wi-Fi-nätverk som inte har en bra Internetanslutning"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Behåll Wi-Fi i viloläge"</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_wps_pbc" msgid="2668564692207863017">"WPS-tryckknapp"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi direkt"</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_empty_list_wifi_on" msgid="3354911729026237372">"Söker efter Wi-Fi-nätverk …"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Annat nätverk …"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Mer"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk installation (WPS)"</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="8242979682530043184">"Ange PIN från åtkomstpunkten"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS-konfiguration"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Ange PIN-koden <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_wps_setup_title" msgid="6034518116333042484">"Skyddad Wi-Fi-konfiguration"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Startar WPS ..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Tryck på knappen Wi-Fi Protected Setup på routern. Den kan kallas WPS eller vara märkt med denna symbol:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Ange pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router. Det kan ta upp till två minuter att slutföra installationen."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS slutfördes. Ansluter till nätverket ..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Ansluten till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS pågår redan och kan ta upp till två minuter att slutföra"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS misslyckades. Försök igen om några minuter."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Säkerhetsinställningen för den trådlösa routern (WEP) stöds inte"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Säkerhetsinställningen för den trådlösa routern (TKIP) stöds inte"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentiseringsfel. Försök igen."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En annan WPS-session upptäcktes. Försök igen om några minuter."</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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Sparat"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inaktiverad"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Undvek dålig Internetanslutning"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Nätverket undveks på grund av dålig anslutning. Inaktivera funktionen från skärmen Inställningar &gt; Wi-Fi på menyn Avancerat."</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_wps_available_first_item" msgid="3538912605343585226">"Skyddat nätverk är tillgängligt"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (skyddat nätverk är tillgängligt)"</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_failed_connect_message" msgid="8491902558970292871">"Det gick inte att ansluta till nätverket."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glöm"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Det gick inte att glömma nätverket"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Spara"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Det gick inte att spara närverket"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"En annan Wi-Fi-skyddad 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Nätverksprefixets längd"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi direkt"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Konfigurera peer-till-peer-anslutning"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi direkt"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Enhetsinformation"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Skyddad Wi-Fi-konfiguration"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"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_remove_group" msgid="4844634506540667517">"Ta bort grupp"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Avancerat"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Tillgängliga enheter"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Sök efter enheter"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Söker …"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Byt namn på enheten"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Anslutna enheter"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Det gick inte att ansluta."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Det gick inte att byta namn på enheten."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Vill du koppla från?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Om du kopplar från avbryts din anslutning till <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Om du kopplar från avbryts din anslutning till <xliff:g id="PEER_NAME">%1$s</xliff:g> och <xliff:g id="PEER_COUNT">%2$s</xliff:g> andra enheter."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Avvisa inbjudan?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vill du avvisa inbjudan att ansluta till <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"Konfigurera Wi-Fi-surfpunkt"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Konfigurera trådlös surfzon via 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> mobil Wi-Fi-surfpunkt"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Tyst läge"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volymer"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringvolym"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrera vid tyst"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Vibrera och ring"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"Standardmeddelande"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulserande ljusavisering"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringsignal"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Stäng av ljudet från ringsignaler och meddelanden"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Stäng av ljudet från musik och andra medier"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Stäng av ljudet från meddelanden"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Stäng av ljudet från alarm"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Enheten vibrerar vid samtal"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Du måste docka pekdatorn innan du konfigurerar ljudet för dockning."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Du måste docka mobilen innan du konfigurerar ljudet för dockning."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Du måste docka pekdatorn innan du konfigurerar ljudet för dockning."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Du måste docka mobilen innan du konfigurerar ljudet för dockning."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Ljud för placering i docka"</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="account_settings" msgid="6403589284618783461">"Konton"</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="7965901687241669598">"Visning"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vill du radera all personlig information och alla hämtade appar? Åtgärden kan inte ångras."</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="2234954758550554549">"Du måste rita ditt grafiska lösenord om du vill återställa pekdatorns standardinställningar."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Du måste rita ditt grafiska lösenord om du vill återställa standardinställningarna."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Återställningen utfördes inte eftersom tjänsten för systemrensning inte är tillgänglig."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vill du återställa?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Radera USB-lagring"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Vill du radera SD-kortet och alla filer på kortet? Åtgärden kan inte ångras."</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Radera allt"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Rita ditt grafiska lösenord"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Du måste rita ditt grafiska lösenord om du vill bekräfta formateringen av USB-lagringsenheten."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Du måste bekräfta att du vill rensa USB-lagringsenheten genom att rita ditt grafiska lösenord."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Du måste bekräfta att du vill rensa SD-kortet genom att rita ditt grafiska lösenord."</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="6688416425801386511">"Internetdelning via USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobila nätverk"</string>
     <string name="location_title" msgid="1029961368397484576">"Min plats"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Googles platstjänst"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Tillåt att appar använder data från källor som Wi-Fi-nätverk och nätverk för mobilenheter för att avgöra din ungefärliga position"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Tillåt att anonyma platsdata skickas till Google. Tillåt även att appar med tillstånd använder data från källor som Wi-Fi-nätverk och nätverk för mobilenheter 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryck på Menu om du vill ha hjälp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Lyft fingret när du är klar."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Anslut minst <xliff:g id="NUMBER">%d</xliff:g> punkter. Försök igen:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Det grafiska lösenordet har registrerats!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Det grafiska lösenordet har registrerats."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Rita ditt grafiska lösenord igen för att bekräfta:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Ditt nya grafiska lösenord:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bekräfta"</string>
@@ -927,7 +955,7 @@
     <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="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_enable_power_button_instantly_locks" msgid="5735444062633666327">"Strömbrytaren låses direkt"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Avstängningsknappen låses direkt"</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>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Nästa"</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="1075370160667458122">"Skydda pekdatorn från obehörig användning genom att skapa ett personligt grafiskt lösenord. Anslut punkterna 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="tablet" msgid="8616353869251700776">"Skydda pekdatorn från obehörig användning genom att skapa ett personligt grafiskt lösenord. Anslut punkterna 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="8393155371327584659">"Skydda mobilen 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"Tryck på Nästa när du är redo att sätta igång."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hantera appar"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hantera och ta bort installerade appar"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Hantera appar, ställ in genvägar för snabbstart"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Appinställningar"</string>
     <string name="install_applications" msgid="4872012136210802181">"Okända källor"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Tillåt installation av appar som inte finns i Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Tillåt installation av appar från okända källor"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Pekdatorn och dina personliga data är mer sårbara för angrepp av appar från okända källor. Du godkänner att du ensam är ansvarig för eventuella skador på pekdatorn eller förlust av data som kan uppstå när du använder dessa appar."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Mobilen och dina personuppgifter är sårbara för angrepp av appar från okända källor. Du godkänner att du ensam är ansvarig för eventuella skador på mobilen eller förlust av data som orsakats av att du använt dessa appar."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avancerade inställningar"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Info om appen"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Starta som standard"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Standardvärden"</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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Rensa data"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Avinstallera uppdateringar"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Du har valt att starta appen som standard för vissa åtgärder."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Du har valt att tillåta att den här appen skapar widgetar och får åtkomst till apparnas data."</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="1616155457673106022">"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>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sortera efter storlek"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Visa tjänster som körs"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Visa cachade processer"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Återställ inställningarna"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vill du återställa?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Detta återställer alla inställningar för:"\n\n" "<li>"inaktiverade appar"</li>\n" "<li>"meddelanden om inaktiverade appar"</li>\n" "<li>"standardappar för olika åtgärder"</li>\n" "<li>"begränsningar för bakgrundsdata i appar."</li>\n\n" Inga appdata går förlorade."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Återställ appar"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Hantera utrymme"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrera"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Välj filteralternativ"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Appen har åtkomst till följande på pekdatorn:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Appen har åtkomst till följande på mobilen:"</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="invalid_size_value" msgid="7563537715280712285">"Det gick inte att beräkna paketstorleken."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Du har inte installerat några appar 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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Ändra önskad installationsplats för nya appar."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Inaktivera den inbyggda appen?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Om du inaktiverar en inbyggd app kanske andra appar inte fungerar som de ska."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Inaktivera meddelanden?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Om du inaktiverar meddelanden för den här appen kanske du missar viktiga meddelanden och uppdateringar."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Använt utrymme"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Visa lagring som används av appar"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktiva tjänster"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Den här inmatningsmetoden kan samla all text som du skriver, inklusive personliga uppgifter som lösenord och kreditkortsnummer. Den kommer från appen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vill du använda inmatningsmetoden?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Stavningskontrollen kan samla in all text du skriver, inklusive personliga uppgifter som lösenord och kreditkortsuppgifter. Den kommer från appen <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vill du använda stavningskontrollen?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Inställningar"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Språk"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Det gick inte att öppna inställningarna för <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mus/styrplatta"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Markörens hastighet"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Spelkontroller"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Använda vibration"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Använd vibrationsfunktionen för spelkontroller när sådana är anslutna."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Välj en tangentbordslayout"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Ställ in tangentbordslayouter"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Växla genom att trycka på Ctrl-Mellanslag"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tangentbordslayouter"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Användarens ordlista"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Egen ordlista"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Egna ordlistor"</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_add_screen_title" msgid="742580720124344291">"Fras"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Fler alternativ"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Färre alternativ"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Ord:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Genväg:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Språk:"</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="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"För alla språk"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Fler språk ..."</string>
     <string name="testing" msgid="6584352735303604146">"Testa"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Information om pekdatorn"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformation"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Ange alternativ för apputveckling"</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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Utvecklings-ID för enheten"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Enhetsinformationen är inte tillgänglig"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Håll aktiverad"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skärmen vilar aldrig när laddning pågår"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ska USB-felsökning tillåtas?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-felsökning ska endast användas i utvecklingssyfte. Använd den för att kopiera data mellan datorn och enheten, installera appar på enheten utan meddelanden och läsa loggdata."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Tillåt utvecklarinställningar?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Inställningarna är endast avsedda att användas för utvecklingsändamål. De kan orsaka problem med enheten eller apparna som finns installerade på den."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Skydda USB-lagringsenheten"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apparmåste få tillstånd för att kunna läsa USB-enheten"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vill du skydda USB-enheten?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"När USB-lagringsenheten är skyddad måste apparna begära tillstånd för att kunna läsa data som lagras externt."\n\n"En del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Skydda SD-kortet"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Appar måste få tillstånd för att kunna läsa SD-kortet"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vill du skydda SD-kortet?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"När SD-kortet är skyddat måste apparna begära tillstånd för att kunna läsa data som lagras externt."\n\n"En del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Välj gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Välj widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Skapa widget och tillåta åtkomst?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"När du har skapat widgeten kan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> komma åt alla data som visas."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Tillåt alltid att <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> skapar widgetar och får åtkomst till deras data"</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>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Läs upp lösenord"</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="3264723681038625967">"Installera webbskript"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Gör webben mer tillgänglig"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Inga tjänster är installerade"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Behöver du en skärmläsare?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ger talad feedback till användare som är blinda eller har nedsatt syn. Vill du installera den gratis från Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Vill du installera webbskript?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vill du att appar ska installera skript från Google som gör innehållet mer tillgängligt?"</string>
-    <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="1072730037861494125">"Ingen beskrivning har angetts."</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_not_available" msgid="3214000535532434353">"Batteriinfo ej tillgänglig."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"Det gick inte att köra den valda motorn."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurera"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Välj en annan motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Talsyntesmotorn kan samla in all text som ska talas, inklusive personlig information som lösenord och kreditkortsnummer. Den kommer från <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-motorn. Vill du använda den här talsyntesmotorn?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Kvinna"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Aktivera 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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Rita ditt grafiska lösenord"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du måste rita ditt grafiska lösenord för att bekräfta uppgifterna."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ange lösenordet för uppgiftslagring."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuvarande lösenord:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Uppgiftslagringen raderades."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Uppgiftslagringen kunde inte raderas."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Uppgiftslagring är aktiverat."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Du måste ange en PIN-kod eller ett lösenord för skärmlås för att kunna använda uppgiftslagring."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset för att kunna använda uppgiftslagring."</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="5446972770562918934">"Säkerhetskopiering och återställning"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk återställning"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"När du installerar om en app återställs säkerhetskopierade inställningar och 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="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"De fullständiga säkerhetskopiorna av datorn är för närvarande inte skyddade"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tryck 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="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vill du sluta säkerhetskopiera Wi-Fi-lösenord, bokmärken, andra inställningar och appdata samt ta bort alla kopior på Googles servrar?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Inställningar för enhetsadministration"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Den här administratören är aktiv och tillåter att appen <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_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="6047518536574673606">"System"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ringsignal och vibration"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Ansluter till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g> ..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Det gick inte att synkronisera"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Synkronisering är aktiverad"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Synkronisera"</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="background_data" msgid="5779592891375473817">"Bakgrundsdata"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Synkroniserades senast <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Synkroniserar nu …"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Välkommen till Google Synk!"</font>\n"En funktion i Google som du kan använda om du vill synkronisera så att du kommer åt dina kontakter, din kalender osv var du än befinner dig."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Synkroniseringsinställningar för app"</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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Det här kontot krävs för vissa appar. Du kan bara ta bort det genom att återställa pekdatorn till fabriksinställningarna (alla dina personliga data tas bort) i Inställningar &gt; Säkerhetskopiera och återställ."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Det här kontot krävs för vissa appar. Du kan bara ta bort det genom att återställa pekdatorn till fabriksinställningarna (alla dina personliga data tas bort) i Inställningar &gt; Säkerhetskopiera och återställ."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Det går inte att synkronisera manuellt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"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="wimax_settings" msgid="1574837328738396794">"4G-inställningar"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G Mac-adress"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ange lösenord om du vill dekryptera lagringen"</string>
     <string name="try_again" msgid="4272075051293936921">"Försök igen."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Tjänsten är inte tillgänglig för närvarande. Försök igen."</string>
     <string name="delete" msgid="4219243412325163003">"Ta bort"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Felsökning"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Välj app att felsöka"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Du har inte angett vilken app som ska felsökas"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Felsöker appen: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Välj app"</string>
+    <string name="no_application" msgid="2813387563129153880">"Ingen"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Vänta på felsökningen"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Felsökaren måste ansluta till appen först"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Indata"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Ritning"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Övervakning"</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_screen_updates" msgid="5470814345876056420">"Visa ytuppdateringar"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Hela fönstret blinkar vid uppdatering"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Visa GPU-visningsuppdateringar"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Visningar blinkar i fönster vid GPU-ritningar"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Inaktivera HW-överlagringar"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Använd alltid GPU för skärmsammansättning"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Aktivera spår"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Välj aktiverade spår"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Inga spår är aktiverade för närvarande"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> spår är aktiverade för närvarande"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alla spår är aktiverade för närvarande"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Visa layoutgränser"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Visa gränser för videoklipp, marginaler m.m."</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="force_hw_ui" msgid="6426383462520888732">"Framtvinga GPU-rendering"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Använd maskinvaruacceleration i 2D i appar"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Tvingad användning av GPU för 2D-ritning"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profilens GPU-rendering"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mät tid för rendering i adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Längdskala för Animator"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobila trådlösa surfzoner"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Automatisk datasynkronisering"</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="8621855507876539282">"Inga data användes 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_disclaimer" product="tablet" msgid="2591250607795265503">"Mätningen utfördes med hjälp av din pekdator. Resultatet kan skilja sig från de data som operatören redovisar."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Mätningen utfördes med hjälp av din mobil. Resultatet kan skilja sig från de data som operatören redovisar."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"begränsad"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Vill du inaktivera mobildata?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Ange gräns för mobildata"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Ange gräns för data via 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobila"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Inget"</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="8430240158135453271">"Visa appinställningar"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Begränsa bakgrundsdata"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Inaktivera bara bakgrundsdata i mobildatanät. Wi-Fi används om det finns."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Inaktivera bakgrundsdata i mobildatanät. Fasta nätverksuppkopplingar används om sådana finns."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Om du vill begränsa bakgrundsdata för appen måste du först ange en gräns för mobildata."</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="5651588785118290771">"Den här funktionen kan leda till att en app som är beroende av bakgrundsdata slutar fungera när Wi-Fi inte är tillgängligt."\n\n"Andra kontroller för dataanvändning finns i inställningarna i appen."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Den här funktionen kan medföra att en app som använder bakgrundsdata slutar fungera när endast mobila nätverk är tillgängliga."\n\n"Du kan hitta fler alternativ för dataanvändning i inställningarna i appen."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Det går bara att begränsa bakgrundsdata när du har angett en gräns för mobildata."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Aktivera automatisk datasynk.?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alla kontoändringar som görs på webben kopieras automatiskt till pekdatorn."\n\n"För vissa konton kopieras även alla ändringar som görs på pekdatorn automatiskt till webben. Google-konton fungerar på det sättet."\n\n"Du kan ange vilken typ av information som ska synkroniseras för varje konto under Inställningar &gt; Konton."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Alla kontoändringar som görs på webben kopieras automatiskt till mobilen."\n\n"För vissa konton kopieras även alla ändringar som görs på mobilen automatiskt till webben. Google-konton fungerar på det sättet."\n\n"Du kan ställa in vilken typ av information som ska synkroniseras för varje konto under Inställningar &gt; Konton."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Inaktivera automatisk datasynk.?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Detta minskar dataanvändningen och sparar batteri, men varje konto måste synkroniseras manuellt varje gång du vill samla in aktuell information. Du får inte heller några meddelanden om uppdateringar."</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_warning_editor_title" msgid="3704136912240060339">"Ange varning för dataanvändning"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ange gräns för dataanvändning"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begränsa dataanvändningen"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Dataanslutningen till <xliff:g id="NETWORKS">%1$s</xliff:g> inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av pekdatorn, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Dataanslutningen till <xliff:g id="NETWORKS">%1$s</xliff:g> inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av mobilen, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobildataanslutningen inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av pekdatorn, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobildataanslutningen inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av mobilen, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vill du begränsa bakgrundsdata?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Om du begränsar mobildata i bakgrunden kanske vissa appar och tjänster inte fungerar såvida du inte är ansluten till ett Wi-Fi-nätverk."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: ca <xliff:g id="TOTAL">%1$s</xliff:g> har använts"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ca <xliff:g id="TOTAL">%1$s</xliff:g> har använts."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ca <xliff:g id="TOTAL">%1$s</xliff:g> har använts enligt pekdatorns mätning.  Resultatet kan skilja sig från operatörens beräkning av dataanvändningen."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ca <xliff:g id="TOTAL">%1$s</xliff:g> har använts enligt mobilens mätning. Resultatet kan skilja sig från operatörens beräkning av dataanvändningen."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobila trådlösa surfzoner"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Välj Wi-Fi-nätverk som är mobila hotspots. Appar kan hindras från att använda dessa nätverk när de körs i bakgrunden. Det kan även visas en varning i apparna innan du använder dessa nätverk för stora hämtningar."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobila nätverk"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-nätverk"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Aktivera Wi-Fi om du vill välja trådlösa surfzoner för mobilen."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Redigera VPN-profil"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Anslut till <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Lägg till VPN-profil"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Redigera profil"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Ta bort profil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Det finns ingen nätverksanslutning. Försök igen senare."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Det saknas ett certifikat. Redigera profilen."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"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="3973201880357468747">"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="8764686624055084454">"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="3055831259260848004">"Du har slutfört kursen. Om du vill avsluta letar du reda på knappen <xliff:g id="FINISH">%s</xliff:g> och trycker på den."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Stavningskorrigering"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Stavningskontroll"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Ange det aktuella lösenordet för den fullständiga säkerhetskopian här"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Ange ett nytt lösenord för fullständiga säkerhetskopior här"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Skriv in det nya fullständiga reservlösenordet här"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Avbryt"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g> %%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ytterligare systemuppdateringar"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Användare &amp; begränsningar"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Användare"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Lägg till användare"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Redigera informationen"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Användarinformation"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Namn"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Innehållsbegränsningar"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Kräver PIN-kod"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Innehållsklassificering"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Systemappar"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installerade appar"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Stäng"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Ta bort användare"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Busunge"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Ta bort användaren?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Är du säker på att du vill ta bort användaren och alla användarens data från enheten?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Visa meddelanden"</string>
+    <string name="help_label" msgid="1107174367904110532">"Hjälp"</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 33f3899..04623b3 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Inakatisha muunganisho..."</item>
     <item msgid="1634960474403853625">"Muunganisho Umekatika"</item>
     <item msgid="746097431216080650">"Haijafanikiwa"</item>
+    <item msgid="6367044185730295334">"Imezuiwa"</item>
+    <item msgid="503942654197908005">"Inaepuka kwa muda muunganisho mbovu"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <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>
+    <item msgid="5660739516542454527">"Imezuiwa"</item>
+    <item msgid="1805837518286731242">"Inaepuka kwa muda muunganisho mbovu"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Kichupo cha kusukuma"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Hamna"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN kutoka sehemu ya ufikivu"</item>
-    <item msgid="7364462169350112617">"PIN kutoka kwa kifaa hiki"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Haibadiliki"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Kadi ya SD inayoondolewa"</item>
     <item msgid="4498124044785815005">"Wacha mfumo uamue"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Zima"</item>
-    <item msgid="4804571292609523335">"Mtetemo"</item>
-    <item msgid="595707141547423573">"Nyamazisha"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Fupi"</item>
     <item msgid="2560532955514699713">"Wastani"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Skeli 5x ya haiwani"</item>
     <item msgid="6660750935954853365">"Skeli ya 10x ya uhuishaji"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Uhuishaji umezimwa"</item>
+    <item msgid="1138649021950863198">"Mizani .5x ya uhuishaji"</item>
+    <item msgid="4394388961370833040">"Mizani 1x ya uhuishaji"</item>
+    <item msgid="8125427921655194973">"Mizani 1.5x ya uhuishaji"</item>
+    <item msgid="3334024790739189573">"Mizani 2x ya uhuishaji"</item>
+    <item msgid="3170120558236848008">"Mizani 5x ya uhuishaji"</item>
+    <item msgid="1069584980746680398">"Mizani 10x ya uhuishaji"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Kiwango cha wastani"</item>
     <item msgid="4071574792028999443">"Hakuna mchakato wa mandari nyuma"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a592b82..4b4cb75 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Ndiyo"</string>
     <string name="no" msgid="6731231425810196216">"Hapana"</string>
+    <string name="create" msgid="3578857613172647409">"Unda"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Haijulikani"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"MITANDAO NA MITANDAO-HEWA"</string>
     <string name="header_category_device" msgid="5781174212691167553">"KIFAA"</string>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zuia matumizi yakibonyezi cha bluetooth wakati skrini imefungwa"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Vifaa vya Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Jina la kifaa"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Mipangilio ya kifaa"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Mipangilio ya maelezo mafupi"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Hakuna jina lililowekwa, inatumia jina la akaunti"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Chuja kupata vifaa"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Ipe jina jipya kompyuta ndoto"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Inaoanisha..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Kifaa cha Bluetooth kisicho na jina"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Inatafuta"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Gusa ili kulinganisha"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Hakuna vifaa vya Bluetooth vilivyopatikana karibu."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Ombi la kuoanisha Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Ombi la ulinganishaji"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"Gusa ili kulinganisha na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Gusa ili kuoanisha na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Onyesha faili zilizopokewa"</string>
-    <string name="device_picker" msgid="8721012448931226323">"Kitwaa kifaa cha Bluetooth"</string>
+    <string name="device_picker" msgid="8398232791303186677">"Kichagua kifaa cha Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Ombi la kibali cha Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Prog inataka kuwasha Bluetooth. Kubali?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Prog katika kompyuta yako ndogo inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Kubali?"</string>
@@ -155,7 +157,9 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Gusa ili kuunganisha kwa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Unataka kuunganishwa kwa\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Ombi la kitabu cha simu"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s angependa kufikia anwani zako na historia ya simu. Toa kibali cha ufikiaji kwa %2$s?"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for bluetooth_pb_acceptance_dialog_text (6555508756987053866) -->
+    <skip />
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Usiniulize tena"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Mipangilio ya tarehe na saa"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 mchana"</string>
@@ -184,7 +188,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Sawa"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Jina la mpangaji uliloandika si sahihi."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Orodha ya kuepusha uliyoichapisha haijaumbizwa vizuri. Andika orodha iliyotenganishwa-kituo cha vikoa vilivyoepuliwa."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Lazima ujaze sehemu ya mlango."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Unahitaji kujaza uga wa kituo."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Sehemu ya mlango sharti iwe wazi iwapo sehemu ya mpangishaji haina chochote"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Lango uliloandika si halali."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi ya HTTP inayotumiwa na kivinjari lakini haiwezi kutumika na programu zingine."</string>
@@ -224,23 +228,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Weka"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Haijafanikiwa"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Imefanikiwa"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Mabadiliko yanatokea wakati kebo ya USB inaunganishwa upya"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Mabadiliko hutekelezwa wakati kebo ya USB imeunganishwa tena."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Wezesha hifadhi kubwa ya USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Jumla ya baiti:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Hifadhi ya USB haijawekwa"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Hakuna kadi ya SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Hifadhi ya USB haijapachikwa."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Hakuna kadi ya SD"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Baiti zinazopatikana:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Hifadhi ya USB inatumiwa kama kifaa cha kuhifadhi vitu vingi"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Hifadhi ya USB inatumiwa kama kifaa cha kuhifadhita nyingi"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Sasa ni salama kuondoa hifadhi ya USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Ni salama sasa kuondoa kadi ya SD"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Hifadhi ya USB inatumiwa kama kifaa cha kuhifadhi vitu vingi."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Kadi ya SD inatumiwa kama kifaa cha kuhifadhi vitu vingi."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Ni salama sasa kuondoa hifadhi ya USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Ni salama sasa kuondoa kadi ya SD."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Hifadhi ya USB iliondolewa wakati bado yatumiwa!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Kadi ya SD iliondolewa ikiwa ingali inatumika!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Baiti zilizotumika:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Inachanganua hifadhi ya USB ya media..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Inakagua ikiwa kadi ya SD ina midia..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Hifadhi ya USB imeweka soma-tu"</string>
-    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Kadi ya SD iliyowekwa inaweza kusomwa tu"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Hifadhi ya USB imepachikwa kusoma-tu."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Hifadhi ya SD imepachikwa kusoma-tu."</string>
     <string name="skip_label" msgid="47510779345218297">"Ruka"</string>
     <string name="next_label" msgid="4693520878012668114">"Ifuatayo"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Lugha"</string>
@@ -266,8 +270,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Unganisha huduma ya data wakati wa urandaji"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Umepoteza muunganisho wa data kwa sababu uliacha mtandao wako wa nyumbani wa urandaji ukiwa umezimwa."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Iwashe"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Je, unataka kuruhusuji wa data? Huenda ukagharamia ada za urandaji!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Zingatia"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Ukiruhusu data kupitia mitandao mingine, unaweza kupata gharama kubwa ya kupitia mitandao mingine!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Ruhusu data kupitia mitandao mingine?"</string>
     <string name="networks" msgid="6333316876545927039">"Uchaguzi wa mtoa huduma"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Chagua mtoa huduma ya mtandao"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tarehe na saa"</string>
@@ -283,12 +287,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Weka muda"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Chagua ukanda wa saa"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Weka tarehe"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Chaguo muundo wa tarehe"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Chagua mpangilio ya tarehe"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Boresha ulinganishaji sura"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Ukaguzi wa moja kwa moja"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Inahitaji kupepesa jicho"</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>
@@ -306,26 +312,27 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Inahitaji nenosiri au nywila ya nambari ili kutoa ufiche wa kompyuta kila unapoiwasha"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Inahitaji nenosiri au nywila ya nambari ili kutoa ufiche wa kompyuta kila unapoiwasha"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Usimbaji fiche"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Unaweza kuficha akaunti zako, mipangilio, programu zilizopakuliwa na data zakem midia na faili nyingine. Unapoficha simu yako hauwezi kuifichua isipokuwa unapokuwa ukiweka upya data ya kiwanda "\n\n". Ufichaji huchukua hadi saa moja. Lazima uanze na betri yenye chaji na uendelee kuchaji mpaka umalize. Ukihitilafiana na ufichaji unaweza kupoteza baadhi ya data ama yote."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Unaweza kusimba akaunti zako, mipangilio, prog zilizopakuliwa na data zao, media, na faili zingine. Punde unaposimba simu yako, unapaswa kuingiza PIN ya nambari au nenosiri kuisimbua kila wakati unapoiwasha: hauwezi kuisimbua simu yako isipokuwa kwa kuseti upya data kiwanda, kufuta data zako zote. "\n\n"Kusimba inachukua saa moja auzaidi. Unapaswa kuanza na betri iliyochajiwa na weka simu yako kama imechomekwa hadi usimbajifiche imekamilika. Ukikatiza utaratibu wa usimbaji fiche, utapoteza baadhi au data zako zote"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data yazo, vyombo vya habari na faili zingine. Ukisha simba kwenye kompyuta yako kibao, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua kompyuta yako kibao isipokuwa kwa kurejesha mipangilio ya kiwandani, na kufuta data yako yote."\n\n"Usimbaji fiche unachukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke kompyuta yako kibao kwenye chaji mpaka usimbaji fiche ukamilike. Ukiingilia mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakiwa na data yao, vyombo vya habari na faili zingine. Ukisha simba kwenye simu yako, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua simu yako isipokuwa kwa kurejesha mipangilio ya kiwandani,na kufuta data yako yote"\n\n"Usimbaji fiche huchukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke simu yako kwenye chaji mpaka usimbaji fiche ukamilike. Ukiingilia mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Usimbaji fiche wa kompyuta ndogo"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Simba fiche simu"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Tafadhali chaji betri yako kisha ujaribu tena."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Tafadhali ingiza chaja yako kisha ujaribu tena."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Hakuna nenosiri ama nywila ya kufunga skrini"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Lazima uweke PIN au nenosiri ya kufunga skrini kabla ya kuanza kuficha."</string>
-    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Thibitisha usimbaji fiche"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Simba kompyuta ndogo? Hatua hii haiwezi kutenduliwa na ukiikatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo kompyuta ndogo itajiwasha tena."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Simba simu? Uendeshaji huu hauridi nyuma na ikiwa utahitilafiana nao, utapoteza data. Usimbaji huchukua saa moja au zaidi, wakati huo simu itajiwasha upya mara nyingi. Unaweza kupoteza baadhi ya data ukitatiza mchakato wa kuficha."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Unahitaji kuweka PIN ya kifungio kwa skrini au nenosiri kabla kuanza usimbaji fiche."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Simba?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo kompyuta kibao itajiwasha mara kadhaa."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo simu itajiwasha mara kadhaa."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Inasimba fiche"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Tafadhali subiri wakati huku kompyuta yako inasimba.Asilimia <xliff:g id="PERCENT">^1</xliff:g> imekamilika."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Tafadhali subiri wakati simu yako inasimba. Asilimia <xliff:g id="PERCENT">^1</xliff:g> imekamilika."</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Jaribu tena baada ya sekunde <xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Andika nenosiri yako"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Usimbaji fiche haujafanikiwa"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Fiche imekatishwa na haiwezi kukamilika. Matokeo yake, taarifa kwenye kibao chako haziwezi kuonekana. "\n" "\n" Ili uendelee kutumia kibao chako, lazima useti upya kama ilivyotoka kiwandani. Utakapo seti kibao chako baada ya kuseti upya, utakuwa na fursa kurejesha taarifa zozote zilizotunzwa kwenye Akaunti yako ya Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Fiche imekatishwa na haiwezi kukamilika. Matokeo yake, taarifa kwenye simu yako haziwezi kuonekana. "\n" "\n" Ili uendelee kutumia simu yako, lazima useti upya simu yako kama ilivyotoka kiwandani. Utakapo seti simu yako baada ya kuseti upya, utakuwa na fursa kurejesha taarifa zozote zilizotunzwa kwenye Akaunti yako ya Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Chagua kifungio cha skrini"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Usimbaji fiche umekatishwa na hauwezi kukamilika. Kutokana na hayo, data kwenye kompyuta yako kibao haiwezi kupatikana. "\n\n" Ili kuendelee kutumia kompyuta yako kibao, unahitaji kurejesha mipangilio ya kiwandani. Ukisha washa kompyuta yako kibao baada ya kurejesha, utakuwa na fursa ya kurejesha data yoyote iliyokuwa imechelezwa kwenye Akaunti yako ya Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Usimbaji fiche umekatishwa na hauwezi kukamilika. Kutokana na hayo, data kwenye simu yako haziwezi kuonekana. "\n\n" Ili kuendelea kutumia simu yako, utahitaji urejesha mipangilio ya kiwandani. Utakapowasha simu yako baada ya kurejesha, utakuwa na fursa ya kurejesha data zozote ulizocheleza kwenye Akaunti yako ya Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Badili mbinu ingizo"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Chagua kifungio cha skrini"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chagua kifungio cha hifadhi"</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>
@@ -348,9 +355,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Fungua Sura"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Ruwaza"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +369,32 @@
     <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>
-    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Nenosiri sharti liwe na herufi chini ya <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"Nenosiri sharti liwe chini ya nambari <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <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_password_too_long" msgid="7016906583950201704">"Nenosiri lazima liwe na vibambo chini ya <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Nenosiri lazima liwe chini ya tarakimu <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN lazima iwe na tarakimu 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Msimamizi wa kifaa haruhusu kutumia PIN ya hivi karibuni."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Nenosiri lina kibambo haramu."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Nenosiri lazima liwe na angalau herufi moja."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Nenosiri lazima liwe na angalau tarakimu moja."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Nenosiri lazima liwe na angalau alama moja."</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_letters:other (8186027808415585970) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_lowercase:other (2693910942679679225) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_uppercase:other (3030801209112209245) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_numeric:other (4703982391407595924) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_symbols:other (1221290525051187757) -->
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_password_requires_nonletter:other (3952508584649046404) -->
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Msimamizi wa kifaa haruhusu kutumia nenosiri la hivi karibuni."</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="lock_setup" msgid="1759001157415978959">"Usanidi umekamilika"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Usanidi umekamilika."</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>
@@ -413,8 +408,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Kulinganisha na: <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g> <xliff:g id="DEVICE_NAME">%1$s</xliff:g> <xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Andika ya msimbo wa kifaa inayohitajika:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN inajumlisha herufi au ishara"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Kwa kawaida 0000 au 1234"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Unaweza pia kutaka kuingiza PIN hii kwenye kifaa kingine."</string>
-    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Unaweza pia kutaka kuingiza nenosiri hili kwenye kifaa kingine."</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Unawezahitaji pia kucharaza PIN hii kwenye kifaa kingine."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Unaweza pia kuhitaji kucharaza nenosiri hili kwenye kifaa kingine."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Ili kuoanisha na :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;hakikisha inaonyesha nenosiri hili:&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;Llinganisha na kifaa hiki?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Kulinganisha na: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g> <xliff:g id="DEVICE_NAME">%1$s</xliff:g> <xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Andika: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g> <xliff:g id="PASSKEY">%2$s</xliff:g> <xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kisha bonyeza Rejea au Ingiza."</string>
@@ -425,7 +420,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Haikuweza kulingana na <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kwa sababu ya PIN isiyo sahihi au msimbo ya kuingia."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"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_connecting_error_message" msgid="229861986106185022">"Haikuweza kuunganisha kwa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Chunguza vifaa"</string>
     <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Tafuta vifaa"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Inatafuta…"</string>
@@ -478,19 +473,23 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Kwa muziki na midia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="5237208142892767592">"Ruhusu ubadilishanaji wa data wakati simu inagusa kifaa kingine"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Ruhusu ubadilishanaji wa data wakati kompyuta kibao inagusa kifaa kingine"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Ruhusu ubadilishanaji wa data wakati simu inagusa kifaa kingine"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Prog iko tayari kusambaza maudhui ya prog kupitia NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Imezimwa"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hazipatikani kwa sababu NFC imezimwa"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Wakati kipengele hiki ni kimewashwa, unaweza boriti maudhui ya programu kwa kifaa kingine cha NFC chenye uwezo kwa kusikilia vifaa karibu pamoja. Kwa mfano, unaweza boriti  kurasa za Kivinjari, videos za YouTube, wasiliani wa Watu, na zaidi. "\n" "\n" Leta tu vifaa pamoja (kawaida nyuma kwa nyuma) na kisha gusa kioo chako. Prog huamua nini inapata mwale."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Ugunduzi wa huduma ya mtandao"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Ruhusu programu kwenye vifaa vingine kugundua programu kwenye kifaa hiki"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Mtandao-hewa"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Washa Wi-Fi"</string>
     <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Mipangilio ya mitandao-hewa"</string>
     <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Weka na udhibiti vituo vya kufikia mitandao-hewa"</string>
+    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Teua Wi-Fi"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"inawasha Mtandao hewa..."</string>
     <string name="wifi_stopping" msgid="244864762599017659">"Inazima Mtandao hewa..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Hitilafu"</string>
@@ -498,25 +497,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Haiwezi kutambaza mitandao"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Arifa ya mtandao"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Nijulishe wakati kuna mtandao huru"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Epuka miunganiko hafifu"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Usitumie mtandao wa Wi-Fi kama hauna muunganisho mzuri wa mtandao"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Epuka miunganisho mibovu"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Usitumie mtandao wa Wi-Fi isipokuwa uwe na muunganisho mzuri wa Mtandao"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wacha Wi-Fi wazi wakati wa kulala"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kulikuwa na hitilafu wakati wa kubadilisha mipangilio"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ongeza mtandao"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Mitandao-hewa"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Kitufe cha kusukuma cha WSP"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Kiingilio cha Pin ya WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Moja kwa moja"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tafuta"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Mahiri"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Unganisha kwa mtandao"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Sahau mtandao"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Mtandao umerekebishwa"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ili kutazama mitandao inayopatikana, washa Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Inatafuta mitandao ya Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Mitandao mingine..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Zaidi"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi otomatiki (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Onyesha chaguo za kindani"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"Andika PIN kutoka kwa kituo cha ufikivu"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Sanidi WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Ingiza PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> kwenye kituo cha ufikivu"</string>
-    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"Tayari WPS inaendelea na inaweza kuchukua makumi kadhaa ya dakika kuisha"</string>
-    <string name="wifi_wps_failed" msgid="1648418410092969300">"Haikuweza kuanza WPS, jaribu tena."</string>
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Usanidi Uliolindwa na Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Inaanzisha WPS ..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Bonyeza kitufe Kilicholindwa cha Usanidi cha Wi-Fi kwenye ruta yako. Kinaweza kujulikana kama \"WPS\" au kuwa na nembo hii:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Ingiza pin <xliff:g id="NUMBER">%1$s</xliff:g> kwenye kipanga njia chako cha Wi-Fi. Usanidi unaweza kuchukua hadi dakika mbili ili kukamilika."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS imefanikiwa. Inaunganisha kwenye mtandao..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Umeunganishwa kwa mtandao wa Wi-Fi wa <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS tayari inaendelea na inaweza kuchukua hadi dakika mbili kukamilika"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS imeshindwa. Tafadhali jaribu tena baada ya dakika chache."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Mpangilio wa usalama wa kipanga njia pasiwaya (WEP) hauauniwi."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Mpangilio wa usalama wa kipanga njia pasiwaya (TKIP) hauauniwi."</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Imeshindwa kuthibitisha. Tafadhali jaribu tena."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Kipindi kingine cha WPS kimegunduliwa. Tafadhali jaribu tena baada ya dakika chache."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Mtandao wa SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Usalama"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Nguvu za mawimbi"</string>
@@ -537,20 +549,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Imehifadhiwa"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Imelemazwa"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Kuepukwa muunganisho mbaya wa Tovuti"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"mtandao uliepukwa kutokana na muunganisho hafifu. Zima mtindo huu kutoka kwa mipangilio &amp; scrini ya wifi, kipengee cha menyu ya Juu."</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tatizo la uthibitishaji"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko karibu"</string>
-    <string name="wifi_wps_available_first_item" msgid="3538912605343585226">"Mtandao uliolindwa unapatikana"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (mtandao uliolindwa unapatikana)"</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">"Imelindwa na <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", imelindwa 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_failed_connect_message" msgid="8491902558970292871">"Imeshindwa kuunganisha kwa mtandao"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Sahau"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Imeshindwa kusahau mtandao"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Hifadhi"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Imeshindwa kuhifadhi mtandao"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Ghairi"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Kipindi kingine kinacholindwa na Wi-Fi kimefutwa. Jaribu tena baada ya dakika chache."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Mtandao hewa 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>
@@ -568,33 +580,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Lango"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Urefu wa kiambishi awali cha mtandao"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Moja kwa moja"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Sanidi muunganisho wa rika-hadi-rika"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Mtandao hewa Moja kwa moja"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Taarifa ya kifaa"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Usanidi unaolindwa na Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Andika PIN"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Kumbuka muunganisho huu"</string>
-    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Tafuta"</string>
-    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Unda kikundi"</string>
-    <string name="wifi_p2p_menu_remove_group" msgid="4844634506540667517">"Ondoa kundi"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Mahiri"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Vifaa vinavyopatikana"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Tafuta vifaa"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Inatafuta…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Pea kifaa jina jipya"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vifaa shiriki"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Haikuweza kuunganisha."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Imeshindwa kubadili jina la kifaa."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Tenganisha?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Ukitenganisha, muunganisho wako na <xliff:g id="PEER_NAME">%1$s</xliff:g> utakoma."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ukitenganisha, muunganisho wako na <xliff:g id="PEER_NAME">%1$s</xliff:g> na vifaa vingine <xliff:g id="PEER_COUNT">%2$s</xliff:g> utakoma."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ghairi mwaliko?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Je, unataka kughairi mwaliko wa kuungana na <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Ubebezi wa Mipangilo ya ubebezi wa eneo maalum la Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot bebezi<xliff:g id="NETWORK_SSID">%1$s</xliff:g> amilifu"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Wi-Fi hotspot bebezi ina hitilafu"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Sanidi Wi-Fi hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Sanidi mtandao-hewa wa 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> ubebezi wa Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Onyesho"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Muundo wa kimya"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Mlio wa simu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Sauti"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Athari za muziki"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Sauti ya Mlio"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Tetema wakati imenyamaza"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Tetema na ita"</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>
@@ -614,6 +627,11 @@
     <string name="volume_ring_description" msgid="5936851631698298989">"Mlio wa simu na taarifa"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Arifa"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Kengele"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Nyamazisha toni mlio &amp; arifa"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Nyamazisha muziki &amp; midia nyingine"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Nyamazisha arifa"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Nyamazisha kengele"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Tetema wakati wa kutoa mlio"</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>
@@ -623,14 +641,15 @@
     <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="9015625921245904495">"azima uunganishe simu yako kabla ya kusanidi unganisho la sauti."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Lazima uunganishe simu yako kabla ya kusanidi unganisho la sauti."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Unahitaji kutia kituo kwa simu kabla ya kuanzisha kituo cha sauti."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Unahitaji kutia kituo kwa simu kabla ya kuanzisha kituo cha sauti."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"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 na usawazishaji"</string>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <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">"Onyesho"</string>
@@ -702,7 +721,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Nambari yangu ya simu"</string>
     <string name="status_min_number" msgid="3519504522179420597">"NDOGO"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Toleo la PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"Toleo la 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">"Aina ya mtandao wa simu ya mkononi"</string>
@@ -823,7 +842,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Futa taarifa zako zote za kibinafsi na zilizopakuliwa? Hauwei kutengua hatua hii!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Futa kila kitu"</string>
     <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>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Unahitaji kuchora mchoro wa kufungua ili kuthibitisha kurejesha mipangilio ya kiwandani."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Hakuna mpangilio mpya uliofanywa kwa sababu huduma ya Mfumo wa Kufuta haipatikani."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Seti upya?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Futa hifadhi ya USB"</string>
@@ -838,8 +857,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Futa kadi ya SD, inafuta faili zote zilizohifadhiwa huko? Hauwezi kutengua hatua hii!"</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>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Unahitaji kuchora mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta hifadhi ya USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Unahitaji kuchora mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta kadi ya SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Mipangilio ya simu"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Weka mipangilio ya ujumbe wa sauti, kupitisha simu, kusubiri simu, kitambulisho cha mteja"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Inazuia USB"</string>
@@ -870,7 +889,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mitandao ya simu"</string>
     <string name="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Eneo la huduma ya Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Wacha programu itumie data kutoka kwa vyanzo kama zile za Wi-Fi na mitandao ya simu ili kuamua kadirio la eneo lako"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Ruhusu data ya eneo lisilo na jina kutumwa kwa Google. Ruhusu pia programu zilizoruhusiwa kutumia data kutoka vyanzo kama vile Wi-Fi na mitandao ya vifaa vya mkononi ili kubainisha eneo lako la karibu."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Mahali pame tathminiwa na Mtandao hewa"</string>
     <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>
@@ -915,7 +934,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Bonyeza menyu upate usaidizi"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ukimaliza achilia kidole"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Unganisha angalau vitone <xliff:g id="NUMBER">%d</xliff:g>. Jaribu tena:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Mchoro imerekodiwa!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Mchoro umerekodiwa."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Chora mchoro tena ili kuthibitisha:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Mchoro wako mpya wa kufungua"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Thibitisha"</string>
@@ -937,7 +956,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Ifuatayo"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Kulinda kompyuta yako ndogo"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Kulinda simu yako"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Linda kompyuta yako ndogo dhidi ya matumizi yasiyoidhinishwa kwa kuunda kiolezo wa kibinafsi ya kufungua. Tumia kidole chako ili kuunganisha vitone katika mpangilio wowote kwenye skrini ifuatayo. Lazima uunganishe angalau vitonne vinne. "\n\n" Uko tayari kuanza? Gusa Ifuatayo."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Linda kompyuta yako kibao dhidi ya matumizi ambayo hayajaidhinishwa kwa kuunda skrini ya kibinafsi ya mchoro wa kufungua. Sogeza kidole chako ili kuunganisha madoa katika mpangilio wowote kwenye skrini ifuatayo. Lazima uunganishe angalau madoa manne. "\n\n"Uko tayari kuanza? Gusa Ifuatayo."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Linda simu yako na matumizi yasiyoidhinishwa kwa kuunda umbizo la kufungua skrini ya kibinafsi. Tumia kidole chako kuunganisha angalau doti nne kwa mpangilio wowote kwenye skrini ifuatayo "\n\n"Tayari kuanza? Gusa “Ifuatayo”."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Dhibiti prog"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Dhibiti na ondoa prog zilizosakinishwa"</string>
@@ -945,7 +964,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Dhibiti programu, sanidi njia za mkato za kuzindua haraka"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Mipangilio ya prog"</string>
     <string name="install_applications" msgid="4872012136210802181">"Vyanzo visivyojulikana"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Ruhusu usakinishaji wa programu zisizo za Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Ruhusu usakinishaji wa programu kutoka kwenye vyanzo visivyojulikana"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Kompyuta yako ndogo na data ya kibinafsi iko hatarini kushambuliwa na prog kutoka kwa vyanzo visivyojulikana. Unakubali kuwa unawajibika mwenyewe kwa uharibifu wowote kwa kompyuta yako ndogo au kupoteza data ambayo inaweza kutokana kwa kutumia prog hizi."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Simu yako na data ya kibinafsi inaweza kushambuliwa na prog kutoka kwa vyanzo visivyojulikana. Unakubali kuwa unawajibika mwenyewe kwa uharibifu wowote kwa simu yako au kupoteza data ambayo inaweza kusababishwa kutokana na kutumiwa na prog hizi."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Mipangilio mahiri"</string>
@@ -953,6 +972,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Maelezo ya programu"</string>
     <string name="storage_label" msgid="8700867073480107253">"Hifadhi"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Zindua kwa chaguo-msingi"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Chaguo-msingi"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Utangamanifu wa skrini"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Idhini"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"kache"</string>
@@ -972,6 +992,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Futa data"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Sanidua visasisho"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Umechagua kuzindua prog hii kwa mbadala kwa baadhi ya vitendo."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Umechagua kuruhusu programu hii kuunda wijeti na kufikia data yao."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Hakuna chaguo-misingi zilizowekwa."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Futa chaguo-msingi"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Programu hii haiwezi kuundwa kwa skrini yako: Unaweza kudhibiti jinsi inavyojirekebidhwa kwa skrini yako hapa."</string>
@@ -982,6 +1003,10 @@
     <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>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Weka upya mapendeleo ya programu"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Uweke upya mapendeleo ya programu?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hii itaweka upya mapendeleo yote ya:"\n\n" "<li>"Programu zilizolemazwa"</li>\n" "<li>"Arifa za programu iliyolemazwa"</li>\n" "<li>"Programu chaguo-msingi za vitendo"</li>\n" "<li>"Uzuiaji wa data ya usuli ya programu"</li>\n\n" Hutapoteza data yoyote ya programu."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Weka upya programu"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Dhibiti nafasi"</string>
     <string name="filter" msgid="2018011724373033887">"Kichujio"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Chagua chaguzi za vichujio"</string>
@@ -1010,7 +1035,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Programu hii haiwezi kufikia inayofuata kwa kompyuta yako ndogo:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"Haikuweza kuhesabu ukubwa wa furushi."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Hauna programu 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>
@@ -1032,6 +1057,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Badilisha usakinishaji wa eneo unalopenda ya programu mpya"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Lemaza programu zilizoundwa-ndani?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ukilemaza prog iliyoundwa-ndani, prog zingine huenda zisifanye kazi."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Zima arifa?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ikiwa utazima arifa za programu hii, unaweza kukosa tahadhari na sasishi muhimu."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Matumizi ya hifadhi"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Tazama hifadhi iliyotumika na prog"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Huduma zinazoendeshwa"</string>
@@ -1084,19 +1111,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Mbinu hii ya ingizo huenda ikaweza kukusanya maandishi yote unayoandika, pamoja na data ya kibinafsi kama vile nenosiri na nambari za kadi ya mkopo. Inatoka kwa programu <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Tumia mbinu hii ya ingizo?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Kisasishaji hiki kinaweza kukusanya maandishi yote wakati unaangika, pamoja na data za kibinafsi kama nenosiri na namari za kadi ya mkopo. Inatoka kwa prog <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Tumia kisasishaji hiki?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Mipangilio"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Lugha"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Imeshindwa kufungua mipangilio ya <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Panya/padi"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kasi ya pointa"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Kidhibiti cha Mchezo"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Tumia kitetemeshaji"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Elekeza upya kitetemeshaji kwa kidhibiti cha mchezo wakati umeunganishwa."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Chagua mpangilio wa kibodi"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"sanidi mipangilio ya kibodi"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Kubadili, vbonyesha Dhibiti-Kiweka nafasi"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Chaguo-msingi"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mpangilio wa kibodi"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamusi ya mtumiaji"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamusi binafsi"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"kamusi binafsi"</string>
     <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_add_screen_title" msgid="742580720124344291">"Fungu la maneno"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Chaguo zaidi"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Chaguo chache"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"SAWA"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Neno:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Njia mkato:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Lugha:"</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>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"Hauna maneno yoyote katika kamusi ya mtumiaji. Unaweza kuongeza neno kupitia menyu."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Lugha zote"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Ya lugha zote"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Lugha zaidi..."</string>
     <string name="testing" msgid="6584352735303604146">"Majaribio"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Maelezo ya kompyuta ndogo"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Maelezo ya simu"</string>
@@ -1133,16 +1179,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Weka chaguo kwa ajili ya maendeleo ya prog"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Utatuzi wa USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Muundo wa kurekebisha wakati USB imeunganishwa"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Maendeleo ya utambulisho wa kifaa"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Taarifa ya kifaa haipatikani"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Kaa ange"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrini haitawahi kuzima wakati unachaji"</string>
     <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="7316799925425402244">"Ueuaji wa USB umekusudiwa kwa malengo ya utengenezaji tu. Itumi kunakili data kati ya kompyuta yako na kifaa chako, kusanidi programu kwa kifaa chako bila arifa, na kusoma data ya rajisi."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Ruhusu mipangilio ya usanidi?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Mipangilio hii imekusudiwa kwa matumizi ya usanidi tu. Inaweza kusababisha kifaa chako na programu zilizoko kuvunjika au kutofanya kazi vizuri."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Linda hifadhi ya USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Sharti programu iombe ruhusa ili kusoma hifadhi ya USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Linda hifadhi ya USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wakati hifadhi ya USB imelindwa, sharti programu ziombe ruhusa ya kusoma data kutoka kwenye hifadhi ya nje."\n\n"Baadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Linda kadi ya SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Sharti programu iombe ruhusa ili kusoma kadi ya SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Linda kadi ya SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wakati kadi ya SD imelindwa, sharti programu ziombe ruhusa ya kusoma data kutoka kwenye hifadhi ya nje."\n\n"Baadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Chagua kidude"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Chagua wijeti"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Unda wijeti na uruhusu ufikiaji?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Baada ya kuunda wijeti, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> inaweza kufikia data yote inayoonyeshwa."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Daima ruhusu <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> kuunda wijeti na kufikia data yao"</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>
@@ -1160,12 +1217,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Maandishi makubwa"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"kitufe cha nguvu kinamaliza upigaji simu"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Zungumza manenosiri"</string>
-    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Gundua kwa mguzo"</string>
-    <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>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Gusa &amp; shikilia kuchelewa"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Sakinisha hati za wavuti"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Boresha ufikiaji wavuti"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Mipangilio"</string>
-    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Mafunzo"</string>
     <string name="accessibility_service_state_on" msgid="8791337599927106344">"Washa"</string>
     <string name="accessibility_service_state_off" msgid="2458594460762620776">"Zima"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Imeruhusiwa"</string>
@@ -1180,14 +1234,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hakuna huduma zilizosanidiwa"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Unahitaji msomaji wa skrini?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack hutoa majibu yaliyosemwa ili kuwasaidia watumiaji vipofu na wenye-kuona kidogo. Je, unataka kuisanidi bure kutoka kwa Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Sakinisha hati za wavuti?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Je, unataka prog kusakinisha hati kutoka kwa Google ambazo zinafanya maudhui ya wavuti yao ipatikane?"</string>
-    <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="1072730037861494125">"Hakuna maelezo yaliyotolewa."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mipangilio"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Betri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ni nini kimekuwa kikitumia betri"</string>
-    <string name="power_usage_not_available" msgid="3583407442633768046">"Data ya utumizi wa betri haipatikani"</string>
+    <string name="power_usage_not_available" msgid="3214000535532434353">"Data ya matumizi ya betri haipatikani."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utumizi wa betri tangu kuchopolewa"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utumiaji wa betri tangu iliposetiwa upya"</string>
@@ -1285,7 +1337,7 @@
     <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" msgid="3305141107104670703">"Injini uliyochagua haiwezi kuendeshwa."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Sanidi"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"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>
@@ -1301,7 +1353,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"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>
@@ -1318,6 +1370,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ondoa vyeti vyote"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Stakabadhi aminifu"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Onyesha vyeti vyako amilifu vya CA"</string>
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Chora mchoro wako wa kufungua"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Unahitaji kuchora mchoro wako wa kufungua ili kuthibitisha usakinishaji wa hati tambulishi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ingiza nenosiri ya hifadhi ya stakabadhi"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nenosiri la sasa:"</string>
@@ -1329,7 +1383,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Hifadhi ya stakabadhi imefutwa"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Hifadhi ya stakabadhi haikuweza kufutwa."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Hifadhi ya hati-tambulishi imewezeshwa."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Lazima uweke PIN au nenosiri ya kufunga skrini kabla utumie hifadhi ya stakabadhi."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Unahitaji kuweka PIN ya kifungio kwa skrini au nenosiri kabla ya kutumia hifadhi ya hati."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Mlio wa dharura"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Weka tabia wakati simu ya dharura imepigwa"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Kuweka nakala na kuweka mipangilio upya"</string>
@@ -1343,8 +1397,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wakati kusanidi upya prog, rejeza mipangilio iliyohifadhiwa na data"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la chelezo ya eneo kazi"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Chelezo kamili za eneo kazi hazijalindwa kwa sasa"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Gusa ili kubadilisha au kuondoa nenosiri la chelezo kamili za eneo kazi"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Wacha kucheleza manenosiri, vialamisho, mipangilio mingine na data ya programu ya Wi-Fi, na ufute kumbukumbu zote katika seva ya Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Mipangilio za usimamizi wa kifaa"</string>
@@ -1359,9 +1413,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Msimamizi huyu ni amilifu na anaruhusu programu <xliff:g id="APP_NAME">%1$s</xliff:g> kutenda uendeshi ifuatayo:"</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">"Mlio wa simu 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="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Mlio na mtetemo wa simu"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"Mfumo"</string>
     <string name="wifi_setup_title" msgid="661074868726906436">"Usanidi wa mtandao-hewa"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Unganisha kwenye mtandao wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Inaunganisha kwa mtandao wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1447,10 @@
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Hitilafu ya usawazishaji."</string>
-    <string name="account_sync_settings_title" msgid="4578227872921044660">"Mipangilio ya usawazishaji"</string>
+    <string name="sync_failed" msgid="1696499856374109647">"Utangamano umeshindikana"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Utangamano amilifu"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <string name="sync_is_failing" msgid="1591561768344128377">"Kwa sasa usawazishaji una shida. Utarudi baada ya muda mfupi."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Ongeza akaunti"</string>
     <string name="background_data" msgid="5779592891375473817">"Data ya maandhari nyuma"</string>
@@ -1404,6 +1461,10 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Kusawazishwa Kumewezeshwa"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sawazisha Kumezimwa"</string>
     <string name="sync_error" msgid="5060969083117872149">"Hitilafu ya usawazishaji"</string>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <string name="settings_backup" msgid="2274732978260797031">"Mipangilio ya chelezo"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Cheleza mipangilio yangu"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sawazisha sasa"</string>
@@ -1413,7 +1474,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalenda"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Anwani"</string>
-    <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Karibu kwa ulandanishi wa Google!"</font>" "\n"Njia ya Google ya kulandanisha data ili kuruhusu ufikiaji wa anwani zako, miadi, na zaidi kutoka mahali popote ulipo."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Mipangilio ya kulandanisha programu"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Usawazishaji data"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Badilisha nenosiri"</string>
@@ -1427,7 +1488,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Akaunti hii inahitajika na baadhi ya prog. Unaweza tu kuiondoa kwa kuseti upya kompyuta ndogo kwa mbadala ya kiwanda (ambayo itafuta data zako zote za kibinafsi) katika Mipangilio &gt; Hifadhi &amp;amp, seti upya."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Akaunti hii inahitajika na baadhi ya prog. Unaweza tu kuiondoa kwa kuseti upya simu kwa mbadala ya kiwanda (ambayo itafuta data zako zote za kibinafsi) katika Mipangilio &gt; Hifadhi &amp;amp, seti upya."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Haiwezi kulandanisha kwa mikono"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ulandanishaji wa kipengee hiki imelemazwa kwa sasa. Kubadilisha mpangilio huu, kw muda mfupi washa data ya usuli na kulandanisha otomatiki."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Mipangilio ya 4G"</string>
@@ -1435,7 +1497,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Anwani ya 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ingiza nenosiri ili kusimbua hifadhi"</string>
     <string name="try_again" msgid="4272075051293936921">"Jaribu tena."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Huduma ina shughuli. Jaribu tena."</string>
     <string name="delete" msgid="4219243412325163003">"Futa"</string>
     <string name="misc_files" msgid="6720680815969643497">"Faili Nyinginezo"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"Imechaguliwa <xliff:g id="NUMBER">%1$d</xliff:g> juu ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1443,21 +1504,46 @@
     <string name="select_all" msgid="1562774643280376715">"Chagua zote"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Inakagua HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Weka HDCP ya kukagua tabia"</string>
-    <string name="debug_ui_category" msgid="9023948280291055349">"Kiolesura cha mtumiaji"</string>
+    <string name="debug_debugging_category" msgid="6781250159513471316">"Utatuaji"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Chagua programu ya utatuaji"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Hakuna programu ya utatuaji iliyowekwa"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Programu ya utatuaji: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Chagua programu"</string>
+    <string name="no_application" msgid="2813387563129153880">"Hakuna chochote"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Subiri kitatuaji"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Programu ya utatuaji husubiri kitatuaji ili kuambatisha kabla ya kutekeleza"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Ingizo"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Uchoraji"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Ufuatiliaji"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modi makinifu imewezeshwa"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Mulika skrini wakati programu zinafanya uendeshaji mrefu kwenye mnyororo mkuu"</string>
     <string name="pointer_location" msgid="6084434787496938001">"Mahali pa pointa"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Kuegeshwa kwa skrini ikionyesha data ya mguso ya sasa"</string>
     <string name="show_touches" msgid="1356420386500834339">"Onyesha miguso"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Onyesha mwitikio wa kuonekana wa miguso"</string>
-    <string name="show_screen_updates" msgid="8282711794220426931">"Onyesha sasisho za skrini"</string>
-    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Mulika maeneo ya skrini wakati yanasasisha"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Onyesha sasishi za sehemu"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Angaza dirisha lote zitakaposasisha"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Onyesha sasisho za mtazamo wa GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Kiwango cha maoni ndani ya madirisha wakati yanatolewa na GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Lemaza miekeleo ya HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Daima tumia GPU kwa mchanganyiko wa skrini"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Wezesha ufuatiliaji"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Teua ufuatiliaji uliowezeshwa"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Hakuna ufuatiliaji uliowezeshwa kwa sasa"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Ufuatiliaji <xliff:g id="NUM">%1$d</xliff:g> umewezeshwa kwa sasa"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Ufuatiliaji wote ambao umewezeshwa kwa sasa"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Onyesha mipaka ya mpangilio"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Onyesha matumizi ya CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Kuegeshwa kwa skrini ikionyesha matumizi ya sasa ya CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Lazimisha kutungiliza  GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Tumia maunzi ya kasi ya 2P katika programu"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Lazimisha matumizi ya GPU kwa uchoraji wa 2d"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Utungilizaji wa GPU ya maelezo mafupi"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Pima muda wa kutungiliza katika adp shell dumpys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Kipimo cha uhiani wa Window"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Mageuzi ya kipimo cha huiani"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Mizani ya muda wa uhuishaji"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Prog"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Usihifadhi shughuli"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Haribu kila shughuli pindi tu mtumiaji anapoondoka"</string>
@@ -1471,13 +1557,15 @@
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Matumizitenganifu ya 4G"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Onyesha matumizi ya Mtandao hewa"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Onyesha matumizi ya Etherneti"</string>
+    <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mitandao-hewa ya simu"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"badilisha mzunguko..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Siku ya mwezi ya kuweka upya msururu wa matumizi ya data:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"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>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Imepimwa na kompyuta yako ndogo. Matumizi ya hesabu ya data yako ya mchukuzi inaweza kutofautiana."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Imepimwa na simu yako. Matumizi ya hesabu ya data yako ya mchukuzi inaweza kutofautiana."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"Imedhibitiwa"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Dhoofisha taarifa za simu?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Weka kikomo cha data ya simu ya mkononi"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Weka kikomo cha data ya 4G"</string>
@@ -1488,33 +1576,50 @@
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Simu ya mkononi"</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">"simu ya mkononi"</string>
-    <string name="data_usage_list_none" msgid="2899530183512542206">"hamna"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Simu ya mkononi"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Hakuna"</string>
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Data ya simu"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Data ya 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Data ya 4G"</string>
     <string name="data_usage_app_settings" msgid="8430240158135453271">"Tazama mipangilio ya prog"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Zuia data ya mandharinyuma"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Lemaza data ya usuli kwenye data ya mtandao wa simu ya mkono. Wi-Fi itatumiwa kama itapatikana."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Lemaza data ya usuli kwenye mitandao ya simu. Mitandao isiyo ya simu itatumika kama inapatikana."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Kuzuia data ya usuli kwa prog hii, kwanza weka kikomo cha data ya simu ya mkono."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Zuia data ya mandhari nyuma?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Kipengele hiki kinaweza kusababisha programu ambayo inategemea data ya usuli kuacha kufanya kazi wakati Wi-Fi haipatikani. "\n" "\n" Unaweza kupata data sahihi zaidi katika mipangilio inayopatikana ndani ya programu."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Mandhari haya yanaweza kusababisha programu inayotegemea data ya usuli kuacha kufanya kazi wakati mitandao ya simu tu inapatikana."\n\n"Unaweza kupata vidhibiti vya matumizi ya data katika mipangilio inayopatikana ndani ya programu."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Kuzuia data za usuli inawezekana tu wakati umeweka kikomo cha data ya simu ya mkono."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tarehe iliyowekwa upya ya msururu wa matumizi"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Tarehe ya kila mwezi:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Weka"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Weka onyo kwa matumizi ya data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Weka kikomo cha matumizi ya data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"inapunguza matumizi ya data"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Muunganisho wako <xliff:g id="NETWORKS">%1$s</xliff:g> wa data italemazwa wakati kiwango fulani kitafikiwa. "\n\n" Kwa kuwa matumizi ya data inapimwa na kmpyuta yako ndogo, na mchukuzi wako anaweza kuwajibika kwa matumizi tofauti, dhukuru kutumia kiwango cha kutunza."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Muunganisho wako <xliff:g id="NETWORKS">%1$s</xliff:g> wa data italemazwa wakati kiwango fulani kitafikiwa. "\n\n" Kwa kuwa matumizi y a data inapimwa na simu yako, na mchukuzi wako anaweza kuwajibika kwa matumizi tofauti, dhukuru kutumia kiwango cha kutunza."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Muunganisho wako wa data ya simu utalemazwa wakati kiwango fulani kitafikiwa. "\n\n" Kwa kuwa matumizi ya data yanapimwa na kompyuta kibao yako, na mtoa huduma wako anaweza kuhesabu matumizi kwa njia tofauti, zingatia kutumia kiwango cha kutunza."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Muunganisho wako wa data ya simu utalemazwa wakati kiwango kilichobainishwa kitafikiwa. "\n\n" Kwa kuwa matumizi ya data yanapimwa na simu yako, na mtoa huduma wako anaweza kuhesabu matumizi kwa njia tofauti, zingatia kutumia kiwango cha kutunza."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Zuia data ya mandhari nyuma?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ukizuia data ya usuli ya rununu, baadhi ya programu na huduma hazitafanya kazi mpaka uunganishe mtandao wa Wi-Fi."</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">"onyo"</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">"kiwango"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Programu zilizoondolewa"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g>ilipokewa, <xliff:g id="SENT">%2$s</xliff:g>ilitumwa"</string>
-    <string name="data_usage_total_during_range" msgid="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g> : kuhusu <xliff:g id="TOTAL">%1$s</xliff:g> imetumika"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: karibu <xliff:g id="TOTAL">%1$s</xliff:g> zimetumika."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: karibu <xliff:g id="TOTAL">%1$s</xliff:g> zimetumika, kama ilivyopimwa na kompyuta kibao yako. Hesabu ya matumizi ya data ya mtoa huduma wako inaweza kutofautiana."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: karibu <xliff:g id="TOTAL">%1$s</xliff:g> zimetumika, kama ilivyopimwa na simu yako. Hesabu ya matumizi ya data ya mtoa huduma wako inaweza kutofautiana."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mitandao-hewa ya simu"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Chagua mitandao ya Wi-Fi ambayo ni mitandao-hewa ya simu. Programu zinaweza kuzuiliwa kutumia mitandao hii wakati ziko kwenye usuli. Pia programu zinaweza kutoa ilani kabla ya kutumia mitandao hii kwa upakuaji mkubwa."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mitandao ya simu"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Mitandao ya Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Ili kuchagua mitandao-hewa ya simu, wezesha Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Simu ya dharura"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Rudi kwa kupiga simu"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Jina"</string>
@@ -1540,12 +1645,14 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Ghairi"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Hifadhi"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Unganisha"</string>
-    <string name="vpn_edit" msgid="1111459297288136079">"Hariri mtandao wa VPN"</string>
-    <string name="vpn_connect_to" msgid="7328758950427515753">"Unganisha kwa <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Hariri maelezo mafupi ya VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Unganisha kwa <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <string name="vpn_create" msgid="8966010925994175306">"Ongeza mtandao wa VPN"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Hariri mtandao"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Futa mtandao"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Ongeza maelezo mafupi ya  VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Hariri maelezo mafupi"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Futa maelezo mafupi"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Hakuna muunganisho wa mtandao. Tafadhali jaribu tena baadaye."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Cheti fulani hakipo. Tafadhali hariri maelezo mafupi."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Mfumo"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Mtumiaji"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Lemaza"</string>
@@ -1554,25 +1661,7 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Wezesha mfumo wa cheti cha CA?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Lemaza mfumo wa cheti cha CA?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Ondoa cheti cha CA cha  mtumiaji kabisa?"</string>
-    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"mafunzo yanayopatikana"</string>
-    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Ifuatayo"</string>
-    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Nyuma"</string>
-    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Maliza"</string>
-    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Ruka mafunzo"</string>
-    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Somo la 1: kuzindua skrini"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"Baada ya kurejea kwenye Vumbua na GusaTouch, unaweza kugusa skrini ili kujifunza kile kilichoko chini ya kidole chako. Kwa mfano, skrini ya sasa ina aikoni za prog. Tafuta moja yao kwa kugusa skrini na kuteleza kidole chako kote."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Nzuri. Endelea kuslaidi kidole chako kwenye skrini hadi upate angalau ikoni moja."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Ili kuamilisha kitu ambacho unakigusa, kigonge. Telezesha kidole hadi upate ikoni ya <xliff:g id="APP_NAME">%s</xliff:g>. Kisha gonga ikoni mara moja ili kuiamilisha."</string>
-    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Kidole chako kinagusa ikoni ya <xliff:g id="APP_NAME">%s</xliff:g>. Gonga mara moja ili kuamilisha ikoni."</string>
-    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Kidole chako kimesonga kwa ikoni<xliff:g id="APP_NAME">%s</xliff:g>, na kisha kikasonga mbali. Telezesha kidole chako pole pole kwenye skrini hadi upate ikoni ya Kivinjari tena."</string>
-    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Safi. Ili kusonga mbele kwa somo linalofuata, pata na uamilishe kitufe <xliff:g id="NEXT">%s</xliff:g>, kiweke karibu na kona ya chini kulia ya skrini."</string>
-    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Somo la: Kuvingirisha kwa kutumia vidole viwili"</string>
-    <string name="accessibility_tutorial_lesson_2_text_1" msgid="8764686624055084454">"Ili kuvingirisha kwenye orodha, unaweza kutelezesha vidole viwili kwenye skrini. Kwa mfano, skrini ya sasa inajumlisha orodha ya majina ya programu ambayo yanaweza kuvingirisha juu au chini. Kwanza, jaribu kutambua vipengee vichache kwenye orodha kwa kutelezesha kidole kimoja hapo."</string>
-    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Nzuri. Endelea kuslaidi kidole ili  upate angalau ikoni moja zaidi."</string>
-    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Sasa weka vidole vyako kwenye kipengee katika orodha na slaidisha vidole vyote juu.  Ikiwa utafika juu ya skrini, inua vidole vyako, viweke chini ya orodha, na endelea kuslaidisha juu."</string>
-    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Nzuri. Endelea kuslaidi vidole vyako juu ili kuvingirisha vingine zaidi."</string>
-    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3055831259260848004">"Umemaliza mafunzo. Kuondoka, tafuta na gusa kitufe cha <xliff:g id="FINISH">%s</xliff:g>."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Marekebisho ya sarufi"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Kikagua tahajia"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Andika nenosiri lako kamili la sasa la chelezo hapa"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Andika nenosiri mpya kwa chelezo zote kamili"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Andika upya nenosiri yako kamili ya kuhifadhi hapa"</string>
@@ -1580,4 +1669,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ghairi"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"sasisho za ziada za mfumo"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Watumiaji na vizuizi"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Watumiaji"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Ongeza mtumiaji"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Hariri maelezo"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Maelezo ya mtumiaji"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Jina"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Vizuizi vya maudhui"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Inahitaji PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Ukadiriaji maudhui"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Programu za mfumo"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Programu zilizosakinishwa"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Tupa"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Ondoa mtumiaji"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Mtoto anayekera"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Je, mtumiaji aondolewe?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Je, una uhakika unataka kuondoa mtumiaji na data zote zinazohusika kutoka kwenye kifaa?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Onyesha arifa"</string>
+    <string name="help_label" msgid="1107174367904110532">"Msaada"</string>
 </resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 1fb7e59..cf7ac6b 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -21,8 +21,15 @@
     <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>
+    <dimen name="setup_title_size">60sp</dimen>
+    <item type="dimen" name="setup_title_height">20%</item>
+    <item type="dimen" name="setup_border_width">10%</item>
+    <dimen name="setup_margin_bottom">0dip</dimen>
+    <dimen name="setup_button_size">48dip</dimen>
+    <dimen name="setup_item_margin">32dip</dimen>
+    <dimen name="appwidget_min_width">325dip</dimen>
+    <dimen name="appwidget_min_height">50dip</dimen>
 </resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 3403f3e..2b01d7f 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -21,11 +21,11 @@
     </style>
 
     <style name="wifi_item">
-        <item name="android:layout_width">560dip</item>
+        <item name="android:layout_width">match_parent</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:layout_marginLeft">16dip</item>
+        <item name="android:layout_marginRight">16dip</item>
         <item name="android:orientation">horizontal</item>
         <item name="android:gravity">center_vertical</item>
     </style>
@@ -57,23 +57,4 @@
         <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-th/arrays.xml b/res/values-th/arrays.xml
index e98df21..6efdda2 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"กำลังตัดการเชื่อมต่อ..."</item>
     <item msgid="1634960474403853625">"ตัดการเชื่อมต่อ"</item>
     <item msgid="746097431216080650">"ไม่สำเร็จ"</item>
+    <item msgid="6367044185730295334">"ถูกบล็อก"</item>
+    <item msgid="503942654197908005">"หลีกเลี่ยงการเชื่อมต่อกับสัญญาณที่ไม่แรงพอชั่วคราว"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"กำลังตัดการเชื่อมต่อจาก <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
     <item msgid="197508606402264311">"ตัดการเชื่อมต่อ"</item>
     <item msgid="8578370891960825148">"ไม่สำเร็จ"</item>
+    <item msgid="5660739516542454527">"ถูกบล็อก"</item>
+    <item msgid="1805837518286731242">"หลีกเลี่ยงการเชื่อมต่อกับสัญญาณที่ไม่แรงพอชั่วคราว"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ปุ่มกด"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"ไม่มี"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN จากจุดเข้าใช้งาน"</item>
-    <item msgid="7364462169350112617">"PIN จากอุปกรณ์นี้"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"คงที่"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"การ์ด SD แบบนำออกได้"</item>
     <item msgid="4498124044785815005">"ให้ระบบเลือก"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"ปิด"</item>
-    <item msgid="4804571292609523335">"สั่น"</item>
-    <item msgid="595707141547423573">"ปิดเสียง"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"สั้น"</item>
     <item msgid="2560532955514699713">"ปานกลาง"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"ภาพเคลื่อนไหวขนาด 5 เท่า"</item>
     <item msgid="6660750935954853365">"ภาพเคลื่อนไหวขนาด 10 เท่า"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"ปิดภาพเคลื่อนไหว"</item>
+    <item msgid="1138649021950863198">"ความเร็วภาพเคลื่อนไหว .5 เท่า"</item>
+    <item msgid="4394388961370833040">"ความเร็วภาพเคลื่อนไหว 1 เท่า"</item>
+    <item msgid="8125427921655194973">"ความเร็วภาพเคลื่อนไหว 1.5 เท่า"</item>
+    <item msgid="3334024790739189573">"ความเร็วภาพเคลื่อนไหว 2 เท่า"</item>
+    <item msgid="3170120558236848008">"ความเร็วภาพเคลื่อนไหว 5 เท่า"</item>
+    <item msgid="1069584980746680398">"ความเร็วภาพเคลื่อนไหว 10 เท่า"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"ขีดจำกัดมาตรฐาน"</item>
     <item msgid="4071574792028999443">"ไม่มีกระบวนการพื้นหลัง"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8b03cb9..f63063a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"ใช่"</string>
     <string name="no" msgid="6731231425810196216">"ไม่"</string>
+    <string name="create" msgid="3578857613172647409">"สร้าง"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ป้องกันการใช้โปรแกรมโทรออกผ่านบลูทูธเมื่อล็อกหน้าจอไว้"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"อุปกรณ์บลูทูธ"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"ชื่ออุปกรณ์"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"การตั้งค่าอุปกรณ์"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"การตั้งค่าโปรไฟล์"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"ไม่ได้ตั้งชื่อ ใช้ชื่อบัญชี"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"สแกนหาอุปกรณ์"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"เปลี่ยนชื่อแท็บเล็ต"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"กำลังกำหนดค่าอุปกรณ์ให้ตรงกัน..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"อุปกรณ์บลูทูธที่ไม่มีชื่อ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"กำลังค้นหา"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"แตะเพื่อจับคู่"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ไม่พบอุปกรณ์บลูทูธในบริเวณใกล้เคียง"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกันทางบลูทูธ"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"แตะเพื่อจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"แตะเพื่อจับคู่กับ <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="device_picker" msgid="8398232791303186677">"ตัวเลือกอุปกรณ์บลูทูธ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"คำขออนุญาตใช้บลูทูธ"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"แอปพลิเคชันต้องการเปิดบลูทูธ อนุญาตหรือไม่"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"แอปพลิเคชันบนแท็บเล็ตของคุณต้องการทำให้อุปกรณ์บลูทูธอื่นค้นพบแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณจะอนุญาตหรือไม่"</string>
@@ -148,14 +150,14 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"แอปพลิเคชันบนโทรศัพท์ของคุณต้องการเปิดบลูทูธ และทำให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณจะอนุญาตหรือไม่"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"แอปพลิเคชันบนแท็บเล็ตของคุณต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นค้นพบแท็บเล็ตของคุณได้ คุณจะอนุญาตหรือไม่"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"แอปพลิเคชันบนโทรศัพท์ของคุณต้องการเปิดบลูทูธ และทำให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้ คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"เปิดบลูทูธ…"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"กำลังเปิดบลูทูธ..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"กำลังปิดบลูทูธ…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"เชื่อมต่ออัตโนมัติ"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ขอการเชื่อมต่อบลูทูธ"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"แตะเพื่อเชื่อมต่อ \"<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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ตกลง"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"ชื่อโฮสต์ที่คุณพิมพ์ไม่ถูกต้อง"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"รายการยกเว้นที่คุณพิมพ์มีรูปแบบไม่ถูกต้อง พิมพ์รายการโดเมนที่ยกเว้นโดยคั่นด้วยเครื่องหมายจุลภาค"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"คุณต้องกรอกข้อมูลฟิลด์พอร์ต"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"คุณต้องกรอกข้อมูลในฟิลด์พอร์ต"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ฟิลด์พอร์ตจะต้องว่างถ้าไม่ได้ใส่ข้อมูลฟิลด์โฮสต์"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"พอร์ตที่คุณพิมพ์ไม่ถูกต้อง"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"พร็อกซี HTTP มีการใช้งานโดยเบราว์เซอร์ แต่อาจไม่มีการใช้งานโดยแอปพลิเคชันอื่น"</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"การเปลี่ยนแปลงจะมีผลเมื่อต่อสาย USB อีกครั้ง"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"การเปลี่ยนแปลงจะมีผลเมื่อต่อสาย 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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"ไม่ได้ต่อที่เก็บข้อมูล USB"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"ไม่มีการ์ด 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="6691584887397909775">"นำที่เก็บข้อมูล USB ออกได้แล้ว"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"ขณะนี้คุณนำการ์ด SD ออกได้อย่างปลอดภัยแล้ว"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"กำลังใช้ USB เป็นที่เก็บข้อมูล"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"กำลังใช้การ์ด SD เป็นอุปกรณ์จัดเก็บข้อมูลจำนวนมาก"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"นำที่เก็บข้อมูล USB ออกได้แล้ว"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"ขณะนี้คุณนำการ์ด 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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB ต่อเชื่อมแบบอ่านอย่างเดียว"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"การ์ด SD ต่อเชื่อมแบบอ่านอย่างเดียว"</string>
     <string name="skip_label" msgid="47510779345218297">"ข้าม"</string>
     <string name="next_label" msgid="4693520878012668114">"ถัดไป"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"ภาษา"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"การอนุญาตการโรมมิ่งข้อมูล อาจทำให้คุณเสียค่าใช้จ่ายมาก!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"อนุญาตการโรมมิ่งข้อมูลหรือไม่"</string>
     <string name="networks" msgid="6333316876545927039">"การเลือกผู้ให้บริการ"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"เลือกผู้ให้บริการเครือข่าย"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"เวลาและวันที่"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"เลือกรูปแบบวันที่"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"ปรับปรุงการจับคู่ใบหน้า"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"การตรวจสอบความมีชีวิตชีวา"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"ต้องกะพริบตา"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ได้ เมื่อคุณเข้ารหัสแท็บเล็ต คุณต้องป้อน PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสทุกครั้งที่คุณเปิดเครื่อง โดยคุณจะไม่สามารถยกเลิกการเข้ารหัสได้ยกเว้นด้วยการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมดในแท็บเล็ตของคุณ"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณจะต้องเริ่มดำเนินการโดยใช้แบตเตอรี่ที่ชาร์จจนเต็มและเสียบปลั๊กแท็บเล็ตของคุณไว้จนกว่าการเข้ารหัสจะเสร็จสิ้น หากขั้นตอนการเข้ารหัสหยุดชะงัก ข้อมูลบางส่วนหรือทั้งหมดของคุณจะสูญหาย"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมา ตลอดจนข้อมูลในแอปพลิเคชัน สื่อ และไฟล์อื่นๆ ได้ เมื่อคุณเข้ารหัสโทรศัพท์ของคุณ คุณต้องป้อน PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสทุกครั้งที่คุณเปิดเครื่อง โดยคุณจะไม่สามารถยกเลิกการเข้ารหัสโทรศัพท์ได้ยกเว้นด้วยการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมดของคุณ"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณจะต้องเริ่มดำเนินการโดยใช้แบตเตอรี่ที่ชาร์จจนเต็มและเสียบปลั๊กโทรศัพท์ของคุณไว้จนกว่าการเข้ารหัสจะเสร็จสิ้น หากขั้นตอนการเข้ารหัสหยุดชะงัก ข้อมูลบางส่วนหรือทั้งหมดของคุณจะสูญหาย"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสแท็บเล็ตแล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถถอดรหัสแท็บเล็ตได้เว้นแต่จะทำการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กแท็บเล็ตไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสโทรศัพท์แล้ว คุณจะต้องพิมพ์รหัส 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="2029407131227814893">"ชาร์จแบตเตอรี่และลองอีกครั้ง"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"เสียบที่ชาร์จของคุณ แล้วลองอีกครั้ง"</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_dialog_need_password_message" msgid="4071395977297369642">"คุณต้องตั้งค่า PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอก่อนจึงจะเริ่มการเข้ารหัสได้"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"เข้ารหัสหรือไม่"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"การเข้ารหัสนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น แท็บเล็ตจะรีสตาร์ทหลายครั้ง"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"การเข้ารหัสนี้ไม่สามารถย้อนกลับได้และข้อมูลจะสูญหายหากการดำเนินการหยุดชะงัก การเข้ารหัสจะใช้เวลาอย่างน้อยหนึ่งชั่วโมง โดยในระหว่างนั้น โทรศัพท์จะรีสตาร์ทหลายครั้ง"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"กำลังเข้ารหัส"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"รอสักครู่ขณะกำลังเข้ารหัสแท็บเล็ตของคุณ เสร็จสมบูรณ์ <xliff:g id="PERCENT">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"รอสักครู่ขณะกำลังเข้ารหัสโทรศัพท์ของคุณ เสร็จสมบูรณ์ <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="2223340178473871064">"พิมพ์รหัสผ่านของคุณ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"การเข้ารหัสไม่สำเร็จ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น ส่งผลให้คุณไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป"\n\n"ในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตให้เป็นค่าเริ่มต้นจากโรงงาน เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น ส่งผลให้คุณไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป"\n\n"ในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตให้เป็นค่าเริ่มต้นจากโรงงาน เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"เลือกการล็อกหน้าจอ"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป"\n\n"ในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป"\n\n"ในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"สลับวิธีการป้อนข้อมูล"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"เลือกการล็อกหน้าจอ"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"เลือกการล็อกข้อมูลสำรอง"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ล็อกหน้าจอ"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"เปลี่ยนหน้าจอล็อก"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"รูปแบบ"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"รหัสผ่าน"</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>
@@ -362,44 +367,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"รหัสผ่านต้องยาวไม่เกิน <xliff:g id="NUMBER">%d</xliff:g> อักขระ"</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN ต้องยาวไม่เกิน <xliff:g id="NUMBER">%d</xliff:g> หลัก"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN จะต้องเป็นเลข 0-9 เท่านั้น"</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"ผู้ดูแลอุปกรณ์ไม่อนุญาตให้ใช้ PIN ที่เพิ่งใช้ไป"</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"รหัสผ่านมีอักขระที่ไม่ถูกต้อง"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"รหัสผ่านจะต้องมีตัวอักษรอย่างน้อยหนึ่งตัว"</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"รหัสผ่านจะต้องมีตัวเลขอย่างน้อยหนึ่งหลัก"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"รหัสผ่านจะต้องมีสัญลักษณ์อย่างน้อยหนึ่งอย่าง"</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"รหัสผ่านต้องมีตัวอักษรอย่างน้อย 1 ตัว"</item>
-    <item quantity="other" msgid="7278096339907683541">"รหัสผ่านต้องมีตัวอักษรอย่างน้อย %d ตัว"</item>
+    <item quantity="one" msgid="3063853802158131458">"รหัสผ่านต้องมีตัวอักษรอย่างน้อย 1 ตัว"</item>
+    <item quantity="other" msgid="8186027808415585970">"รหัสผ่านต้องมีตัวอักษรอย่างน้อย %d ตัว"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"รหัสผ่านต้องมีอักษรตัวพิมพ์เล็กอย่างน้อย 1 ตัว"</item>
-    <item quantity="other" msgid="588499075580432178">"รหัสผ่านต้องมีอักษรตัวพิมพ์เล็กอย่างน้อย %d ตัว"</item>
+    <item quantity="one" msgid="5583986519662091001">"รหัสผ่านต้องมีอักษรตัวพิมพ์เล็กอย่างน้อย 1 ตัว"</item>
+    <item quantity="other" msgid="2693910942679679225">"รหัสผ่านต้องมีอักษรตัวพิมพ์เล็กอย่างน้อย %d ตัว"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"รหัสผ่านต้องมีอักษรตัวพิมพ์ใหญ่อย่างน้อย 1 ตัว"</item>
-    <item quantity="other" msgid="2183090598541826806">"รหัสผ่านต้องมีอักษรตัวพิมพ์ใหญ่อย่างน้อย %d ตัว"</item>
+    <item quantity="one" msgid="2611909966725502768">"รหัสผ่านต้องมีอักษรตัวพิมพ์ใหญ่อย่างน้อย 1 ตัว"</item>
+    <item quantity="other" msgid="3030801209112209245">"รหัสผ่านต้องมีอักษรตัวพิมพ์ใหญ่อย่างน้อย %d ตัว"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"รหัสผ่านต้องมีตัวเลขอย่างน้อย 1 ตำแหน่ง"</item>
-    <item quantity="other" msgid="995673409754935278">"รหัสผ่านต้องมีตัวเลขอย่างน้อย %d ตำแหน่ง"</item>
+    <item quantity="one" msgid="3820355568839621231">"รหัสผ่านต้องมีตัวเลขอย่างน้อย 1 ตำแหน่ง"</item>
+    <item quantity="other" msgid="4703982391407595924">"รหัสผ่านต้องมีตัวเลขอย่างน้อย %d ตำแหน่ง"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"รหัสผ่านต้องมีสัญลักษณ์พิเศษอย่างน้อย 1 ตัว"</item>
-    <item quantity="other" msgid="3047460862484105274">"รหัสผ่านต้องมีสัญลักษณ์พิเศษอย่างน้อย %d ตัว"</item>
+    <item quantity="one" msgid="8456579939292408631">"รหัสผ่านต้องมีสัญลักษณ์พิเศษอย่างน้อย 1 ตัว"</item>
+    <item quantity="other" msgid="1221290525051187757">"รหัสผ่านต้องมีสัญลักษณ์พิเศษอย่างน้อย %d ตัว"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"รหัสผ่านต้องมีอักขระที่ไม่ใช่ตัวอักษรอย่างน้อย 1 ตัว"</item>
-    <item quantity="other" msgid="5574191164708145973">"รหัสผ่านต้องมีอักขระที่ไม่ใช่ตัวอักษรอย่างน้อย %d ตัว"</item>
+    <item quantity="one" msgid="4594051152085925921">"รหัสผ่านต้องมีอักขระที่ไม่ใช่ตัวอักษรอย่างน้อย 1 ตัว"</item>
+    <item quantity="other" msgid="3952508584649046404">"รหัสผ่านต้องมีอักขระที่ไม่ใช่ตัวอักษรอย่างน้อย %d ตัว"</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"โปรแกรมควบคุมอุปกรณ์ไม่อนุญาตให้ใช้รหัสผ่านล่าสุด"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"ผู้ดูแลอุปกรณ์ไม่อนุญาตให้ใช้รหัสผ่านที่เพิ่งใช้ไป"</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="lock_setup" msgid="1759001157415978959">"การตั้งค่าเสร็จสมบูรณ์"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"การตั้งค่าเสร็จสมบูรณ์"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"ในการจับคู่กับ: <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ให้พิมพ์รหัสผ่านที่อุปกรณ์ต้องการ:"</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_enter_pin_other_device" msgid="4637977124526813470">"คุณอาจจำเป็นต้องพิมพ์รหัส PIN นี้ลงในอุปกรณ์อีกเครื่องหนึ่งด้วยเช่นกัน"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"คุณอาจจำเป็นต้องพิมพ์รหัสผ่านนี้ลงในอุปกรณ์อีกเครื่องหนึ่งด้วยเช่นกัน"</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="2796550001376088433">"ในการจับคู่กับ: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ให้พิมพ์: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> แล้วกด Return หรือ Enter"</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ไม่สามารถจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ได้เพราะ PIN หรือรหัสผ่านไม่ถูกต้อง"</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ไม่สามารถเชื่อมต่อกับ <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_connecting_error_message" msgid="229861986106185022">"ไม่สามารถเชื่อมต่อกับ <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะโทรศัพท์กับอุปกรณ์อื่น"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะแท็บเล็ตกับอุปกรณ์อื่น"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะโทรศัพท์กับอุปกรณ์อื่น"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"พร้อมที่จะส่งเนื้อหาแอปพลิเคชันผ่านทาง NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ปิด"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"ใช้งานไม่ได้เนื่องจากปิด NFC อยู่"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"เมื่อคุณลักษณะนี้เปิดอยู่ คุณสามารถส่งคลื่นสัญญาณของเนื้อหาของแอปพลิเคชันไปยังอุปกรณ์ที่สามารถใช้ NFC อีกอุปกรณ์หนึ่งได้โดยถืออุปกรณ์ไว้ใกล้กัน ตัวอย่างเช่น คุณสามารถส่งคลื่นสัญญาณของหน้าเบราว์เซอร์, วิดีโอ YouTube, ที่อยู่ติดต่อใน People และอื่นๆ"\n\n"เพียงแค่นำอุปกรณ์มาไว้ใกล้กัน (โดยปกติจะให้ด้านหลังชนกัน) จากนั้นแตะที่หน้าจอ แอปพลิเคชันจะตัดสินใจว่าจะรับคลื่นสัญญาณสำหรับสิ่งใด"</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"การค้นหาบริการเครือข่าย"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"อนุญาตให้แอปพลิเคชันบนอุปกรณ์อื่นๆ สามารถค้นหาแอปพลิเคชันบนอุปกรณ์นี้ได้"</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="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_setup_wizard_title" msgid="70277346338812325">"เลือก WiFi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ไม่สามารถสแกนหาเครือข่าย"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"การแจ้งเตือนของเครือข่าย"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"แจ้งฉันเมื่อมีเครือข่ายเปิดให้ใช้งานได้"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"หลีกเลี่ยงการเชื่อมต่อที่สัญญาณไม่แรงพอ"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"อย่าใช้เครือข่าย WiFi หากไม่มีการเชื่อมต่ออินเทอร์เน็ตที่ดีเพียงพอ"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"หลีกเลี่ยงการเชื่อมต่อที่สัญญาณไม่แรงพอ"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"อย่าใช้เครือข่าย WiFi หากไม่มีการเชื่อมต่ออินเทอร์เน็ตที่ดีเพียงพอ"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"เปิด WiFi ระหว่างที่อยู่ในโหมดสลีป"</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_wps_pbc" msgid="2668564692207863017">"ปุ่มกด WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"ข้อมูล Pin WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"WiFi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"กำลังค้นหาเครือข่าย WiFi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"เครือข่ายอื่น…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"เพิ่มเติม"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"การตั้งค่าอัตโนมัติ (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"แสดงตัวเลือกขั้นสูง"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"พิมพ์ PIN จากจุดเข้าใช้งาน"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"ตั้งค่า WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"พิมพ์ 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_wps_setup_title" msgid="6034518116333042484">"การตั้งค่าการป้องกัน WiFi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"กำลังเริ่มต้น WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"กดปุ่ม \"การตั้งค่า WiFi แบบปลอดภัย\" บนเราเตอร์ของคุณ ปุ่มนี้อาจถูกเรียกว่า \"WPS\" หรือมีสัญลักษณ์นี้อยู่ด้วย:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"ป้อน PIN <xliff:g id="NUMBER">%1$s</xliff:g> บนเราเตอร์ WiFi ของคุณ การตั้งค่าอาจใช้เวลานานถึงสองนาทีจึงจะเสร็จสิ้น"</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS สำเร็จแล้ว กำลังเชื่อมต่อกับเครือข่าย…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"เชื่อมต่อกับเครือข่าย WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g> แล้ว"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS กำลังดำเนินการอยู่และอาจใช้เวลานานถึงสองนาทีจึงจะเสร็จสิ้น"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ล้มเหลว โปรดลองอีกครั้งหลังจากนี้สักครู่"</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"ไม่สนับสนุนการตั้งค่าความปลอดภัยของเราเตอร์ไร้สาย (WEP)"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"ไม่สนับสนุนการตั้งค่าความปลอดภัยของเราเตอร์ไร้สาย (TKIP)"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"การตรวจสอบสิทธิ์ล้มเหลว โปรดลองอีกครั้ง"</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"พบเซสชัน WPS อีกหนึ่งเซสชัน โปรดลองอีกครั้งในอีกสักครู่"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID เครือข่าย"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ความปลอดภัย"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"ความแรงสัญญาณ"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"บันทึกแล้ว"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"ปิดใช้งานแล้ว"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"หลีกเลี่ยงการเชื่อมต่ออินเทอร์เน็ตที่สัญญาณไม่แรงพอ"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"เครือข่ายถูกหลีกเลี่ยงเนื่องจากมีการเชื่อมต่อที่ไม่ดีพอ ปิดคุณลักษณะนี้ได้ในการตั้งค่า &gt; หน้าจอ WiFi ที่รายการเมนูขั้นสูง"</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="3538912605343585226">"เครือข่ายที่ได้รับการป้องกันพร้อมใช้งาน"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (เครือข่ายที่ได้รับการป้องกันพร้อมใช้งาน)"</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_failed_connect_message" msgid="8491902558970292871">"ไม่สามารถเชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ไม่จำ"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ไม่สามารถเลิกการจดจำเครือข่าย"</string>
     <string name="wifi_save" msgid="3331121567988522826">"บันทึก"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"ไม่สามารถบันทึกเครือข่าย"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ยกเลิก"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"พบอีกหนึ่งเซสชัน WiFi ที่ได้รับการป้องกัน โปรดลองอีกครั้งในอีกสักครู่"</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"เกตเวย์"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ความยาวของหมายเลขเครือข่าย"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"WiFi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"ตั้งค่าการเชื่อมต่อแบบจุดต่อจุด"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"ข้อมูลอุปกรณ์"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"ตั้งค่าการป้องกัน WiFi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"พิมพ์ 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_remove_group" msgid="4844634506540667517">"นำกลุ่มออก"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"ขั้นสูง"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"อุปกรณ์ที่มี"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ค้นหาอุปกรณ์"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"กำลังค้นหา…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"เปลี่ยนชื่ออุปกรณ์"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"อุปกรณ์สำหรับ Peer"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"ไม่สามารถเชื่อมต่อ"</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"ไม่สามารถเปลี่ยนชื่ออุปกรณ์"</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"ตัดการเชื่อมต่อหรือไม่"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"หากคุณตัดการเชื่อมต่อ จะเป็นการสิ้นสุดการเชื่อมต่อของคุณกับ <xliff:g id="PEER_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"หากคุณตัดการเชื่อมต่อ จะเป็นการสิ้นสุดการเชื่อมต่อของคุณกับ <xliff:g id="PEER_NAME">%1$s</xliff:g> และอุปกรณ์อื่นอีก <xliff:g id="PEER_COUNT">%2$s</xliff:g> รายการ"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ยกเลิกข้อความเชิญหรือไม่"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"คุณต้องการยกเลิกข้อความเชิญเพื่อเชื่อมต่อกับ <xliff:g id="PEER_NAME">%1$s</xliff:g> หรือไม่"</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_ap_text" msgid="61237027772641155">"ตั้งค่า WiFi ฮอตสปอต"</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="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
     <string name="sound_settings" msgid="5534671337768745343">"เสียง"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"โหมดปิดเสียง"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"เสียงเรียกเข้า"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"ระดับเสียง"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"เอฟเฟ็กต์เพลง"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"ระดับความดังเสียงเรียกเข้า"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"สั่นเตือนเมื่อปิดเสียง"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"สั่นและส่งเสียง"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"ปิดเสียงเรียกเข้าและการแจ้งเตือน"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"ปิดเสียงเพลงและสื่ออื่นๆ"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"ปิดเสียงการแจ้งเตือน"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"ปิดเสียงนาฬิกาปลุก"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"สั่นเมื่อมีสายเข้า"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"คุณต้องวางแท็บเล็ตบนแท่นชาร์จก่อนที่จะตั้งค่าเสียงสำหรับใช้บนแท่นชาร์จ"</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"คุณต้องวางโทรศัพท์บนแท่นชาร์จก่อนที่จะตั้งค่าเสียงสำหรับใช้บนแท่นชาร์จ"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"คุณต้องวางแท็บเล็ตบนแท่นชาร์จก่อนที่จะตั้งค่าเสียงสำหรับใช้บนแท่นชาร์จ"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"คุณต้องวางโทรศัพท์บนแท่นชาร์จก่อนที่จะตั้งค่าเสียงสำหรับใช้บนแท่นชาร์จ"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"เสียงเมื่อเสียบแท่นชาร์จ"</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="account_settings" msgid="6403589284618783461">"บัญชี"</string>
     <string name="search_settings" msgid="1910951467596035063">"ค้นหา"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"จัดการการตั้งค่าและประวัติการค้นหา"</string>
     <string name="display_settings" msgid="7965901687241669598">"การแสดงผล"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"รุ่น 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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"ลบข้อมูลส่วนบุคคลและแอปพลิเคชันที่ดาวน์โหลดของคุณทั้งหมดหรือไม่ คุณไม่สามารถย้อนกลับการทำงานนี้ได้!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ลบทุกอย่าง"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"วาดรูปแบบการปลดล็อก"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"คุณต้องวาดรูปแบบการปดล็อกเพื่อยืนยันการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"ไม่มีการรีเซ็ตเนื่องจากบริการล้างข้อมูลระบบไม่พร้อมใช้งาน"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"รีเซ็ตหรือไม่"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"ลบที่เก็บข้อมูล USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"ต้องการลบการ์ด 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="nosdcard" msgid="2192044794228379224">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบที่จัดเก็บข้อมูล USB"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันว่าคุณต้องการลบการด์ 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="6688416425801386511">"ปล่อยสัญญาณผ่าน USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"เครือข่ายมือถือ"</string>
     <string name="location_title" msgid="1029961368397484576">"ตำแหน่งของฉัน"</string>
     <string name="location_network_based" msgid="5569673665032992664">"บริการแสดงตำแหน่งของ Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"อนุญาตให้แอปพลิเคชันใช้ข้อมูลจากแหล่งต่างๆ เช่น Wi-Fi และเครือข่ายมือถือในการระบุตำแหน่งโดยประมาณของคุณ"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"อนุญาตให้ส่งข้อมูลตำแหน่งโดยไม่ระบุตัวตนไปที่ Google, ให้แอปที่ได้รับอนุญาตใช้ข้อมูลจากแหล่งต่างๆ เช่น WiFi หรือเครือข่ายมือถือกำหนดตำแหน่งโดยประมาณ"</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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"กด เมนู เพื่อขอความช่วยเหลือ"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"ปล่อยนิ้วเมื่อเสร็จแล้ว"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"โยงอย่างน้อย <xliff:g id="NUMBER">%d</xliff:g> จุด ลองใหม่อีกครั้ง:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"บันทึกรูปแบบแล้ว!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"บันทึกรูปแบบแล้ว"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"วาดรูปแบบอีกครั้งเพื่อยืนยัน:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"รูปแบบการปลดล็อกใหม่ของคุณ:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"ยืนยัน"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"ถัดไป"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"การรักษาความปลอดภัยแท็บเล็ตของคุณ"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"การป้องกันโทรศัพท์ของคุณ"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"ปกป้องแท็บเล็ตของคุณจากการใช้งานที่ไม่ได้รับอนุญาตด้วยการสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล เลื่อนนิ้วของคุณเพื่อเชื่อมต่อจุดต่างๆ ในลำดับใดก็ได้บนหน้าจอถัดไป คุณต้องเชื่อมต่อจุดอย่างน้อยสี่จุด"\n\n"เมื่อพร้อมที่จะเริ่มแล้ว ให้แตะ \"ถัดไป\""</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"ปกป้องแท็บเล็ตของคุณจากการใช้งานที่ไม่ได้รับอนุญาตด้วยการสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล เลื่อนนิ้วเพื่อเชื่อมต่อจุดต่างๆ ในลำดับใดก็ได้บนหน้าจอถัดไป คุณต้องเชื่อมต่อจุดอย่างน้อยสี่จุด"\n\n"เมื่อพร้อมที่จะเริ่มแล้ว ให้แตะ \"ถัดไป\""</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"ปกป้องโทรศัพท์ของคุณจากการใช้งานที่ไม่ได้รับอนุญาต โดยสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล เลื่อนนิ้วของคุณเพื่อเชื่อมต่อจุดอย่างน้อยสี่จุดในลำดับใดก็ได้ในหน้าจอถัดไป"\n\n"เมื่อพร้อมที่จะเริ่มแล้ว ให้แตะ \"ถัดไป\""</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"จัดการแอปพลิเคชัน"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"จัดการและนำแอปพลิเคชันที่ติดตั้งไว้ออก"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"จัดการแอปพลิเคชัน ตั้งค่าทางลัดสำหรับเริ่มใช้งานด่วน"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"การตั้งค่าแอปพลิเคชัน"</string>
     <string name="install_applications" msgid="4872012136210802181">"ไม่รู้จักที่มา"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"อนุญาตให้ติดตั้งแอปพลิเคชันที่ไม่ได้มาจาก Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"อนุญาตให้ติดตั้งแอปพลิเคชันจากแหล่งที่ไม่รู้จัก"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"แท็บเล็ตและข้อมูลส่วนบุคคลของคุณมีความเสี่ยงสูงยิ่งขึ้นที่จะถูกโจมตีโดยแอปพลิเคชันที่มาจากแหล่งที่ไม่รู้จัก คุณยอมรับว่าคุณเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายของแท็บเล็ตหรือการสูญหายของข้อมูลที่อาจเป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"โทรศัพท์และข้อมูลส่วนบุคคลของคุณมีความเสี่ยงยิ่งขึ้นที่จะถูกโจมตีจากแอปพลิเคชันที่ไม่รู้จักแหล่งที่มา คุณยอมรับว่าคุณจะเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายใดๆ ที่เกิดกับโทรศัพท์หรือหรือการสูญเสียข้อมูลที่เป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"การตั้งค่าขั้นสูง"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"ข้อมูลแอปพลิเคชัน"</string>
     <string name="storage_label" msgid="8700867073480107253">"พื้นที่เก็บข้อมูล"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"เริ่มใช้งานตามค่าเริ่มต้น"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"ค่าเริ่มต้น"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"ความเข้ากันได้ของหน้าจอ"</string>
     <string name="permissions_label" msgid="2605296874922726203">"การอนุญาต"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"แคช"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"ล้างข้อมูล"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"ถอนการติดตั้งการอัปเดต"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"คุณเลือกให้เปิดแอปพลิเคชันนี้เป็นค่าเริ่มต้นสำหรับการทำงานบางอย่าง"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"คุณได้เลือกอนุญาตให้แอปพลิเคชันนี้สร้างวิดเจ็ตและเข้าถึงข้อมูลวิดเจ็ตได้"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"ไม่ได้ตั้งค่าเริ่มต้น"</string>
     <string name="clear_activities" msgid="7408923511535174430">"ล้างค่าเริ่มต้น"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"แอปพลิเคชันนี้อาจไม่ได้รับการออกแบบมาสำหรับหน้าจอของคุณ คุณสามารถควบคุมวิธีที่แอปพลิเคชันถูกปรับให้เข้ากับหน้าจอของคุณได้ที่นี่"</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"จัดเรียงตามขนาด"</string>
     <string name="show_running_services" msgid="5736278767975544570">"แสดงบริการที่ใช้งานอยู่"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"แสดงกระบวนการที่เก็บแคชไว้"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"รีเซ็ตค่ากำหนดแอปพลิเคชัน"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"รีเซ็ตค่ากำหนดแอปหรือไม่"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"คำสั่งนี้จะรีเซ็ตค่ากำหนดทั้งหมดของ:"\n\n<li>"แอปพลิเคชันที่ปิดใช้งาน"</li>\n<li>"การแจ้งเตือนของแอปพลิเคชันที่ปิดใช้งาน"</li>\n<li>"แอปพลิเคชันเริ่มต้นที่จะใช้งาน"</li>\n<li>"ข้อจำกัดของข้อมูลแบ็กกราวด์เกี่ยวกับการใช้แอปพลิเคชัน"</li>\n\n"ข้อมูลแอปพลิเคชันทั้งหมดของคุณจะยังคงอยู่เหมือนเดิม"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"รีเซ็ตแอปพลิเคชัน"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"จัดการพื้นที่"</string>
     <string name="filter" msgid="2018011724373033887">"ตัวกรอง"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"เลือกตัวเลือกตัวกรอง"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"แอปพลิเคชันนี้สามารถเข้าถึงสิ่งต่อไปนี้บนแท็บเล็ตของคุณ:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"แอปพลิเคชันนี้สามารถเข้าถึงสิ่งต่อไปนี้บนโทรศัพท์ของคุณ:"</string>
     <string name="computing_size" msgid="1599186977475211186">"กำลังคำนวณ..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"คำนวณขนาดแพคเกจไม่ได้"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"คำนวณขนาดแพคเกจไม่ได้"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"คุณไม่ได้ติดตั้งแอปพลิเคชันของบุคคลที่สามไว้เลย"</string>
     <string name="version_text" msgid="9189073826278676425">"เวอร์ชันของ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"ย้าย"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"เปลี่ยนตำแหน่งติดตั้งที่ต้องการสำหรับแอปพลิเคชันใหม่"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"ปิดแอปพลิเคชันในตัวหรือไม่"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"หากคุณปิดใช้งานแอปพลิเคชันในตัว แอปพลิเคชันอื่นๆ อาจทำงานผิดปกติได้"</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ปิดการแจ้งเตือนหรือไม่"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"หากคุณปิดการแจ้งเตือนสำหรับแอปพลิเคชันนี้ คุณอาจพลาดการแจ้งเตือนและการอัปเดตที่สำคัญ"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"การใช้ที่เก็บข้อมูล"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"ดูที่จัดเก็บข้อมูลที่แอปพลิเคชันใช้"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"บริการที่ทำงานอยู่"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"วิธีการป้อนข้อมูลนี้อาจเก็บข้อความทั้งหมดที่คุณพิมพ์ รวมถึงข้อมูลส่วนบุคคล เช่น รหัสผ่านและหมายเลขบัตรเครดิต โดยมาจากแอปพลิเคชัน <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> ใช้วิธีการป้อนข้อมูลนี้หรือไม่"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"เครื่องตวรจตัวสะกดซึ่งมาจากแอปพลิเคชัน <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> นี้อาจเก็บข้อความทั้งหมดที่คุณพิมพ์ รวมถึงข้อมูลส่วนบุคคล เช่น รหัสผ่านและหมายเลขบัตรเครดิต ต้องการใช้เครื่องตวรจตัวสะกดนี้หรือไม่"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"การตั้งค่า"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"ภาษา"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"ไม่สามารถเปิดการตั้งค่าสำหรับ <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"เมาส์/แทร็กแพด"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ความเร็วของตัวชี้"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"อุปกรณ์ควบคุมเกม"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"ใช้การสั่นเตือน"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"เปลี่ยนการสั่นเตือนไปที่อุปกรณ์ควบคุมเกมเมื่อมีการเชื่อมต่อ"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"เลือกรูปแบบแป้นพิมพ์"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"ตั้งค่ารูปแบบแป้นพิมพ์"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"หากต้องการสลับ กด Control-Spacebar"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ค่าเริ่มต้น"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"รูปแบบแป้นพิมพ์"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"พจนานุกรมของผู้ใช้"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"พจนานุกรมส่วนบุคคล"</string>
     <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_add_screen_title" msgid="742580720124344291">"วลี"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"เพิ่มตัวเลือก"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"ลดตัวเลือก"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"ตกลง"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"คำ:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"ทางลัด:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ภาษา:"</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="8165273379942105271">"คุณไม่มีคำในพจนานุกรมผู้ใช้เลย เพิ่มคำโดยแตะปุ่มเพิ่ม (+)"</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"ทุกภาษา"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"สำหรับทุกภาษา"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"ภาษาเพิ่มเติม..."</string>
     <string name="testing" msgid="6584352735303604146">"กำลังทดสอบ"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ข้อมูลแท็บเล็ต"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ข้อมูลโทรศัพท์"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"ตั้งค่าตัวเลือกสำหรับการพัฒนาแอปพลิเคชัน"</string>
     <string name="enable_adb" msgid="7982306934419797485">"การแก้ไขข้อบกพร่อง USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"โหมดแก้ไขข้อบกพร่องเมื่อเชื่อมต่อ USB"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID ของอุปกรณ์ในการพัฒนา"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"ข้อมูลอุปกรณ์ไม่พร้อมใช้งาน"</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="7316799925425402244">"การแก้ไขข้อบกพร่อง USB มีไว้เพื่อการพัฒนาเท่านั้น ให้ใช้การแก้ไขนี้เพื่อคัดลอกข้อมูลระหว่างคอมพิวเตอร์และอุปกรณ์ ติดตั้งแอปพลิเคชันบนอุปกรณ์โดยไม่มีการแจ้งเตือน และอ่านข้อมูลบันทึก"</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"อนุญาตการตั้งค่าสำหรับการพัฒนาหรือไม่"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"การตั้งค่าเหล่านี้มีไว้สำหรับการพัฒนาเท่านั้น ซึ่งอาจทำให้อุปกรณ์และแอปพลิเคชันที่มีอยู่เสียหายหรือทำงานผิดพลาดได้"</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"ปกป้องที่จัดเก็บข้อมูล USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"แอปพลิเคชันต้องขออนุญาตในการอ่านที่จัดเก็บข้อมูล USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"ปกป้อง USB หรือไม่"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"เมื่อที่จัดเก็บข้อมูล USB ได้รับการปกป้อง แอปพลิเคชันจะต้องขออนุญาตในการอ่านข้อมูลจากที่จัดเก็บข้อมูลภายนอก"\n\n"แอปพลิเคชันบางรายการอาจไม่ทำงานจนกว่าจะได้รับการอัปเดตโดยนักพัฒนาซอฟต์แวร์ของแอปพลิเคชันนั้นๆ"</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"ปกป้องการ์ด SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"แอปพลิเคชันต้องขออนุญาตในการอ่านการ์ด SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"ปกป้องการ์ด SD หรือไม่"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"เมื่อการ์ด SD ได้รับการปกป้อง แอปพลิเคชันจะต้องขออนุญาตในการอ่านข้อมูลจากที่จัดเก็บข้อมูลภายนอก"\n\n"แอปพลิเคชันบางรายการอาจไม่ทำงานจนกว่าจะได้รับการอัปเดตโดยนักพัฒนาซอฟต์แวร์ของแอปพลิเคชันนั้นๆ"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"เลือกแกดเจ็ต"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"เลือกวิดเจ็ต"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"สร้างวิดเจ็ตและอนุญาตการเข้าถึงหรือไม่"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"เมื่อสร้างวิดเจ็ตแล้ว <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> จะสามารถเข้าถึงข้อมูลทั้งหมดที่วิดเจ็ตแสดงได้"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"อนุญาตให้ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> สร้างวิดเจ็ตและเข้าถึงข้อมูลวิดเจ็ตได้เสมอ"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"ข้อความขนาดใหญ่"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"กดปุ่มเปิด/ปิดเพื่อวางสาย"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"พูดรหัสผ่าน"</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="3264723681038625967">"ติดตั้งเว็บสคริปต์"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"ปรับปรุงการเข้าถึงเว็บให้ดียิ่งขึ้น"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ไม่ได้ติดตั้งบริการใดไว้"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"ต้องใช้โปรแกรมอ่านหน้าจอหรือไม่"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack มีการตอบสนองด้วยเสียงเพื่อช่วยเหลือผู้พิการทางสายตาและผู้มีปัญหาทางสายตา คุณต้องการติดตั้งแอปพลิเคชันฟรีนี้จาก Android Market หรือไม่"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"ต้องการติดตั้งเว็บสคริปต์หรือไม่"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"คุณต้องการให้แอปพลิเคชันติดตั้งสคริปต์จาก Google เพื่อให้เข้าถึงเนื้อหาเว็บได้มากขึ้นหรือไม่"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"คุณลักษณะนี้จะเปลี่ยนวิธีการที่อุปกรณ์ของคุณตอบสนองต่อการแตะ ต้องการเปิดใช้งานหรือไม่"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ไม่มีคำอธิบาย"</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_not_available" msgid="3214000535532434353">"ไม่มีข้อมูลการใช้แบตเตอรี่"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"ไม่สามารถเรียกใช้เครื่องมือที่คุณเลือก"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"กำหนดค่า"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"เลือกเครื่องมืออื่น"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"โปรแกรมสังเคราะห์เสียงนี้อาจเก็บข้อความทั้งหมดที่ได้ยิน รวมถึงข้อมูลส่วนบุคคล เช่น รหัสผ่านและหมายเลขบัตรเครดิต โปรแกรมนี้มาจากโปรแกรม <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> คุณต้องการเปิดใช้งานโปรแกรมสังเคราะห์เสียงนี้หรือไม่"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"เปิดใช้เครื่องมือใหม่ก่อนใช้"</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"วาดรูปแบบการปลดล็อกของคุณ"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"คุณจำเป็นต้องวาดรูปแบบการปลดล็อกของคุณเพื่อยืนยันการติดตั้งข้อมูลรับรอง"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"พิมพ์รหัสผ่านสำหรับที่เก็บข้อมูลรับรอง"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"รหัสผ่านปัจจุบัน:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"ที่จัดเก็บข้อมูลรับรองถูกลบ"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"ไม่สามารถลบที่เก็บข้อมูลรับรอง"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"เปิดการใช้งานที่จัดเก็บข้อมูลรับรองไว้"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"คุณต้องตั้ง PIN หรือรหัสผ่านสำหรับล็อกหน้าจอก่อน จึงจะสามารถใช้ที่เก็บข้อมูลรับรองได้"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"คุณต้องตั้ง PIN หรือรหัสผ่านสำหรับการล็อกหน้าจอก่อนจึงจะสามารถใช้ที่เก็บข้อมูลรับรองได้"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"โทนเสียงฉุกเฉิน"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ตั้งค่าการทำงานเมื่อมีการโทรหาหมายเลขฉุกเฉิน"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"การสำรองข้อมูลและการรีเซ็ต"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"คืนค่าอัตโนมัติ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"เมื่อติดตั้งแอปพลิเคชันใหม่อีกครั้ง ให้คืนค่าการตั้งค่าและข้อมูลที่สำรองไว้"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"รหัสผ่านการสำรองข้อมูลในเดสก์ท็อป"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"การสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อปไม่ได้รับการป้องกันในขณะนี้"</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"เลือกเพื่อเปลี่ยนหรือลบรหัสผ่านสำหรับการสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"การสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อปไม่ได้รับการป้องกันในขณะนี้"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"แตะเพื่อเปลี่ยนหรือลบรหัสผ่านสำหรับการสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"หยุดการสำรองข้อมูลรหัสผ่าน WiFi บุ๊กมาร์ก การตั้งค่าอื่นๆ และข้อมูลแอปพลิเคชัน รวมทั้งลบสำเนาทั้งหมดบนเซิร์ฟเวอร์ของ Google หรือไม่"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"การตั้งค่าการควบคุมอุปกรณ์"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"โปรแกรมควบคุมนี้ทำงานอยู่และอนุญาตให้แอปพลิเคชัน <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">"เสียงเรียกเข้าและการแจ้งเตือน"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"การแจ้งเตือน"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"ระบบ"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"มีเสียงเรียกเข้าและสั่น"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"ระบบ"</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="3747859666621319757">"กำลังเชื่อมต่อกับเครือข่าย WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"การซิงค์ล้มเหลว"</string>
+    <string name="sync_active" msgid="8476943765960863040">"เปิดใช้งานการซิงค์"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"ซิงค์"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"การซิงค์กำลังประสบปัญหา อีกสักครู่จะกลับมาอีกครั้ง"</string>
     <string name="add_account_label" msgid="7811707265834013767">"เพิ่มบัญชี"</string>
     <string name="background_data" msgid="5779592891375473817">"ข้อมูลพื้นหลัง"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"เปิดใช้การซิงค์"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"ปิดการซิงค์"</string>
     <string name="sync_error" msgid="5060969083117872149">"ข้อผิดพลาดในการซิงค์"</string>
+    <string name="last_synced" msgid="4242919465367022234">"ซิงค์ล่าสุดเมื่อ <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"กำลังซิงค์อยู่ในขณะนี้…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"ยินดีต้อนรับสู่ Google Sync!"</font>\n"วิธีการของ Google ในการซิงค์ข้อมูลเพื่อให้คุณเข้าถึงสมุดติดต่อ นัดหมาย และข้อมูลอื่นๆ ของคุณได้จากทุกที่"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"การตั้งค่าการซิงค์แอปพลิเคชัน"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"ข้อมูลและการซิงค์"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"เปลี่ยนรหัสผ่าน"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"แอปพลิเคชันบางอย่างต้องใช้บัญชีนี้ คุณสามารถนำบัญชีออกได้ด้วยการรีเซ็ตแท็บเล็ตให้เป็นค่าเริ่มต้นเท่านั้น (ซึ่งจะลบข้อมูลส่วนบุคคลของคุณทั้งหมด) โดยไปที่การตั้งค่า &gt; การสำรองข้อมูลและการรีเซ็ต"</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"แอปพลิเคชันบางอย่างต้องใช้บัญชีนี้ คุณสามารถนำบัญชีออกได้ด้วยการรีเซ็ตโทรศัพท์ให้เป็นค่าเริ่มต้นเท่านั้น (ซึ่งจะลบข้อมูลส่วนบุคคลของคุณทั้งหมด) โดยไปที่การตั้งค่า &gt; การสำรองข้อมูลและการรีเซ็ต"</string>
     <string name="provider_label" msgid="7724593781904508866">"การสมัครรับข้อมูลแบบ Push"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"ซิงค์ <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"ซิงค์ด้วยตนเองไม่ได้"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"รายการนี้ถูกปิดใช้งานการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดใช้งานข้อมูลแบ็กกราวด์และการซิงค์อัตโนมัติชั่วคราว"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"การตั้งค่า 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"ที่อยู่ MAC ใน 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"พิมพ์รหัสผ่านเพื่อถอดรหัสที่จัดเก็บข้อมูล"</string>
     <string name="try_again" msgid="4272075051293936921">"ลองอีกครั้ง"</string>
-    <string name="service_busy" msgid="2325014135156127705">"บริการยังไม่ว่าง ลองอีกครั้ง"</string>
     <string name="delete" msgid="4219243412325163003">"ลบ"</string>
     <string name="misc_files" msgid="6720680815969643497">"ไฟล์เบ็ดเตล็ด"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"เลือกทั้งหมด"</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="debug_debugging_category" msgid="6781250159513471316">"การแก้ไขข้อบกพร่อง"</string>
+    <string name="debug_app" msgid="8349591734751384446">"เลือกแอปพลิเคชันที่จะแก้ไขข้อบกพร่อง"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"ไม่มีชุดแอปพลิเคชันแก้ไขข้อบกพร่อง"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"แอปพลิเคชันแก้ไขข้อบกพร่อง: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"เลือกแอปพลิเคชัน"</string>
+    <string name="no_application" msgid="2813387563129153880">"ไม่มี"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"รอเครื่องมือแก้ไขข้อบกพร่อง"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"แอปฯ ที่ถูกแก้จะรอให้เครื่องซ่อมแซมเพิ่มก่อนทำงาน"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"อินพุต"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"การวาดภาพ"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"กำลังตรวจสอบ"</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_screen_updates" msgid="5470814345876056420">"แสดงการอัปเดตพื้นผิว"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"แฟลชพื้นผิวหน้าต่างทั้งหมดเมื่อมีการอัปเดต"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"แสดงการอัปเดตมุมมอง GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"แฟลชมุมมองภายในหน้าต่างเมื่อวาดด้วย GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"ปิดใช้งานการวางซ้อน HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"ใช้ GPU ในการจัดวางองค์ประกอบหน้าจอเสมอ"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"เปิดใช้งานร่องรอย"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"เลือกร่องรอยที่เปิดใช้งาน"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"ไม่มีร่องรอยที่เปิดใช้งานอยู่ในขณะนี้"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"เปิดใช้งานร่องรอย <xliff:g id="NUM">%1$d</xliff:g> รายการอยู่ในขณะนี้"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"ร่องรอยทั้งหมดที่เปิดใช้งานในขณะนี้"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"แสดงขอบของการจัดวาง"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"แสดงหน้าปกคลิป ขอบ ฯลฯ"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"แสดงการใช้ CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"การวางซ้อนหน้าจอที่แสดงการใช้ CPU ในปัจจุบัน"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"เร่งการแสดงผลของ GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"ใช้การเร่งฮาร์ดแวร์ 2 มิติในแอปพลิเคชัน"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"ต้องใช้ GPU สำหรับการวาดภาพ 2 มิติ"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"การแสดงผล GPU ตามโปรไฟล์"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"วัดเวลาที่ใช้แสดงผลใน adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"ขนาดหน้าต่างภาพเคลื่อนไหว"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"อัตราการสลับภาพเคลื่อนไหว"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"ความเร็วตามผู้สร้างกำหนด"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"แอปพลิเคชัน"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"ไม่เก็บกิจกรรม"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ล้างทุกกิจกรรมทันทีที่ผู้ใช้ออกไป"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"ฮอตสปอตเคลื่อนที่"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"ซิงค์ข้อมูลอัตโนมัติ"</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="8621855507876539282">"ไม่มีข้อมูลการใช้แอปพลิเคชันในช่วงเวลานี้"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"พื้นหน้า"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"พื้นหลัง"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"วัดโดยแท็บเล็ต การบันทึกการใช้ข้อมูลของผู้ให้บริการของคุณอาจแตกต่างออกไป"</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"วัดโดยโทรศัพท์ การบันทึกการใช้ข้อมูลของผู้ให้บริการของคุณอาจแตกต่างออกไป"</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"จำกัด"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"ปิดใช้งานข้อมูลมือถือหรือไม่"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"ตั้งค่าขีดจำกัดของข้อมูลมือถือ"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"ตั้งค่าขีดจำกัดข้อมูลของ 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"มือถือ"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"ไม่มี"</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="8430240158135453271">"ดูการตั้งค่าของแอปพลิเคชัน"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"จำกัดข้อมูลแบ็กกราวด์"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"ปิดใช้งานข้อมูลแบ็กกราวด์เฉพาะบนเครือข่ายข้อมูลมือถือ ใช้ Wi-Fi หากใช้ได้"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"ปิดใช้งานข้อมูลแบ็กกราวด์บนเครือข่ายมือถือ จะใช้เครือข่ายอื่นหากมี"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ในการจำกัดข้อมูลแบ็กกราวด์ในแอปฯ ให้ตั้งขีดจำกัดข้อมูลมือถือก่อน"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"คุณลักษณะนี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานได้เมื่อ WiFi ไม่พร้อมใช้งาน"\n\n"คุณอาจพบการควบคุมการใช้ข้อมูลที่เหมาะสมกว่านี้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชันนี้"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"คุณลักษณะนี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้"\n\n"คุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"การจำกัดข้อมูลแบ็กกราวด์ทำได้เมื่อคุณได้ตั้งค่าขีดจำกัดข้อมูลมือถือไว้เท่านั้น"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"เปิดซิงค์ข้อมูลอัตโนมัติหรือไม่"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะถูกคัดลอกไปยังแท็บเล็ตของคุณโดยอัตโนมัติ"\n\n"บางบัญชีอาจคัดลอกการเปลี่ยนแปลงทั้งหมดที่คุณดำเนินการบนแท็บเล็ตไปยังเว็บโดยอัตโนมัติ บัญชี Google ทำงานเช่นนี้"\n\n"หากต้องการเลือกว่าจะซิงค์ข้อมูลชนิดใดภายในแต่ละบัญชี ให้ไปที่การตั้งค่า &gt; บัญชี"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะถูกคัดลอกไปยังโทรศัพท์ของคุณโดยอัตโนมัติ"\n\n"บางบัญชีอาจคัดลอกการเปลี่ยนแปลงทั้งหมดที่คุณดำเนินการบนโทรศัพท์ไปยังเว็บโดยอัตโนมัติ บัญชี Google ทำงานเช่นนี้"\n\n"หากต้องการเลือกว่าจะซิงค์ข้อมูลชนิดใดภายในแต่ละบัญชี ให้ไปที่การตั้งค่า &gt; บัญชี"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ปิดซิงค์ข้อมูลอัตโนมัติหรือไม่"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"การกระทำดังกล่าวจะเป็นการประหยัดการใช้ข้อมูลและแบตเตอรี่ แต่คุณจะต้องซิงค์แต่ละบัญชีด้วยตนเองเพื่อรวบรวมข้อมูลล่าสุด และคุณจะไม่ได้รับการแจ้งเตือนเมื่อมีการอัปเดต"</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_warning_editor_title" msgid="3704136912240060339">"ตั้งค่าเตือนการใช้ข้อมูล"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ตั้งค่าขีดจำกัดการใช้ข้อมูล"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"การจำกัดการใช้ข้อมูล"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"การเชื่อมต่อข้อมูลของ <xliff:g id="NETWORKS">%1$s</xliff:g> ของคุณจะถูกปิดใช้งานเมื่อถึงขีดจำกัดที่ระบุไว้"\n\n"เนื่องจากการใช้ข้อมูลถูกวัดค่าโดยแท็บเล็ตของคุณ และผู้ให้บริการของคุณอาจมีการบันทึกการใช้ที่แตกต่างออกไป ดังนั้น โปรดกำหนดขีดจำกัดอย่างระมัดระวัง"</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"การเชื่อมต่อข้อมูลของ <xliff:g id="NETWORKS">%1$s</xliff:g> ของคุณจะถูกปิดใช้งานเมื่อถึงขีดจำกัดที่ระบุไว้"\n\n"เนื่องจากการใช้ข้อมูลถูกวัดค่าโดยโทรศัพท์ และผู้ให้บริการของคุณอาจมีการบันทึกการใช้ที่แตกต่างออกไป ดังนั้น โปรดกำหนดขีดจำกัดอย่างระมัดระวัง"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"การเชื่อมต่อข้อมูลผ่านมือถือของคุณจะถูกปิดใช้งานเมื่อครบจำนวนจำกัดที่ระบุไว้"\n\n"เนื่องจากการใช้งานข้อมูลถูกวัดปริมาณด้วยแท็บเล็ตของคุณ และผู้ให้บริการของคุณอาจมีการบันทึกปริมาณการใช้งานที่แตกต่างออกไป ดังนั้น โปรดเลือกวิธีที่ปลอดภัย"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"การเชื่อมต่อข้อมูลผ่านมือถือของคุณจะถูกปิดใช้งานเมื่อครบจำนวนจำกัดที่ระบุไว้"\n\n"เนื่องจากการใช้งานข้อมูลถูกวัดปริมาณด้วยโทรศัพท์ของคุณ และผู้ให้บริการของคุณอาจมีการบันทึกปริมาณการใช้งานที่แตกต่างออกไป ดังนั้น โปรดเลือกวิธีที่ปลอดภัย"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"หากคุณจำกัดข้อมูลแบ็กกราวด์บนมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานจนกว่าคุณจะเชื่อมต่อกับเครือข่าย WiFi"</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g> ตามที่แท็บเล็ตวัดได้ ผู้ให้บริการอาจมีรายละเอียดการใช้ต่างจากนี้"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g> ตามที่โทรศัพท์วัดได้ ผู้ให้บริการอาจมีรายละเอียดการใช้ต่างจากนี้"</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"ฮอตสปอตเคลื่อนที่"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"เลือกเครือข่าย WiFi ที่เป็นฮอตสปอตเคลื่อนที่ สามารถจำกัดแอปพลิเคชันจากการใช้เครือข่ายเหล่านี้ได้เมื่ออยู่ในพื้นหลัง นอกจากนี้ แอปพลิเคชันอาจแจ้งเตือนก่อนที่จะใช้เครือข่ายเหล่านี้ในการดาวน์โหลดไฟล์ขนาดใหญ่"</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"เครือข่ายมือถือ"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"เครือข่าย WiFi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"หากต้องการเลือกฮอตสปอตเคลื่อนที่ ให้เปิด WiFi"</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"แก้ไขโปรไฟล์ VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"เชื่อมต่อกับ <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"เพิ่มโปรไฟล์ VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"แก้ไขโปรไฟล์"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"ลบโปรไฟล์"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"ไม่มีการเชื่อมต่อเครือข่าย โปรดลองอีกครั้งในภายหลัง"</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"ไม่มีใบรับรอง โปรดแก้ไขโปรไฟล์"</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"หลังจากที่เปิดใช้งาน \"สำรวจโดยการแตะ\" คุณสามารถแตะหน้าจอเพื่อเรียนรู้สิ่งต่างๆ ที่อยู่ใต้นิ้วมือของคุณได้ ตัวอย่างเช่น หน้าจอปัจจุบันมีไอคอนของแอปพลิเคชันต่างๆ ลองมองหาสักหนึ่งไอคอนด้วยการแตะหน้าจอและเลื่อนนิ้วของคุณไปรอบๆ"</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"ดี ให้เลื่อนนิ้วของคุณไปเรื่อยๆ ทั่วหน้าจอจนกว่าคุณจะพบไอคอนอีกอย่างน้อยหนึ่งไอคอน"</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"หากต้องการเปิดใช้งานสิ่งที่คุณแตะอยู่ ให้แตะสิ่งนั้น เลื่อนนิ้วของคุณไปจนพบไอคอน <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="8764686624055084454">"หากต้องการเลื่อนดูรายการ คุณสามารถเลื่อนสองนิ้วบนหน้าจอ ตัวอย่างเช่น หน้าจอในตอนนี้มีรายการชื่อแอปพลิเคชันต่างๆ ที่สามารถเลื่อนขึ้นลงได้ ขั้นแรก ให้พยายามหาชื่อสองสามชื่อในรายการโดยใช้นิ้วหนึ่งนิ้วเลื่อนไปรอบๆ"</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="3055831259260848004">"คุณดูบทแนะนำจบแล้ว หากต้องการออก ให้แตะปุ่ม <xliff:g id="FINISH">%s</xliff:g>"</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"การแก้ไขตัวสะกด"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"เครื่องมือตรวจสอบการสะกด"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"ป้อนรหัสผ่านปัจจุบันสำหรับการสำรองข้อมูลเต็มรูปแบบที่นี่"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"พิมพ์รหัสผ่านใหม่สำหรับการสำรองข้อมูลเต็มรูปแบบที่นี่"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"พิมพ์รหัสผ่านใหม่สำหรับการสำรองข้อมูลแบบเต็มรูปแบบอีกครั้งที่นี่"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ยกเลิก"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"การอัปเดตระบบอื่นๆ"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"ผู้ใช้และข้อจำกัด"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"ผู้ใช้"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"เพิ่มผู้ใช้"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"แก้ไขรายละเอียด"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"ข้อมูลผู้ใช้"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"ชื่อ"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"การจำกัดเนื้อหา"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"ต้องใช้ PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"การให้คะแนนเนื้อหา"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"แอปพลิเคชันระบบ"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"แอปพลิเคชันที่ติดตั้ง"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"ยกเลิก"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"นำผู้ใช้ออก"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"เด็กงอแง"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"นำผู้ใช้ออกหรือไม่"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"คุณแน่ใจหรือไม่ว่าต้องการนำผู้ใช้นี้และข้อมูลทั้งหมดที่เกี่ยวข้องออกจากอุปกรณ์"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"แสดงการแจ้งเตือน"</string>
+    <string name="help_label" msgid="1107174367904110532">"ความช่วยเหลือ"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index cb3aa50..d305b78 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Nadidiskonekta…"</item>
     <item msgid="1634960474403853625">"Hindi nakakonekta"</item>
     <item msgid="746097431216080650">"Hindi tagumpay"</item>
+    <item msgid="6367044185730295334">"Naka-block"</item>
+    <item msgid="503942654197908005">"Pansamantalang iniiwasan ang mabagal na koneksyon"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Inaalis sa pagkakakonekta mula sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Hindi nakakonekta"</item>
     <item msgid="8578370891960825148">"Hindi tagumpay"</item>
+    <item msgid="5660739516542454527">"Naka-block"</item>
+    <item msgid="1805837518286731242">"Pansamantalang iniiwasan ang mabagal na koneksyon"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"button na Push"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Wala"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN mula sa access point"</item>
-    <item msgid="7364462169350112617">"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>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Naaalis na SD card"</item>
     <item msgid="4498124044785815005">"Hayaang magpasya ang system"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"I-off"</item>
-    <item msgid="4804571292609523335">"I-vibrate"</item>
-    <item msgid="595707141547423573">"I-mute"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Maikli"</item>
     <item msgid="2560532955514699713">"Katamtaman"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Scale ng animation 5x"</item>
     <item msgid="6660750935954853365">"Scale ng animation 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Naka-off ang animation"</item>
+    <item msgid="1138649021950863198">"Scale ng animation .5x"</item>
+    <item msgid="4394388961370833040">"Scale ng animation 1x"</item>
+    <item msgid="8125427921655194973">"Scale ng animation 1.5x"</item>
+    <item msgid="3334024790739189573">"Scale ng animation 2x"</item>
+    <item msgid="3170120558236848008">"Scale ng animation 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c5a0364..7fe3ee2 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Oo"</string>
     <string name="no" msgid="6731231425810196216">"Hindi"</string>
+    <string name="create" msgid="3578857613172647409">"Likhain"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Iwasan ang paggamit ng taga-dial ng bluetooth kapag naka-lock ang screen"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Mga device ng bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Pangalan ng device"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Mga setting ng device"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Mga setting ng profile"</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_rename_device" product="tablet" msgid="787970073150631155">"Palitan ang pangalan ng tablet"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Pinapares…"</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="5655704645616731277">"Pindutin para ipares"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Wala nakita Bluetooth device sa kalapit."</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="1931617700075106801">"Pindutin upang ipares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Pindutin 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="device_picker" msgid="8398232791303186677">"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="5279027758886569301">"Nais na i-on ng isang app ang Bluetooth. Payagan?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Nais ng isang app sa iyong tablet na gawing natutuklasan ng iba pang mga Bluetooth device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Payagan?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"Nais na 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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Hindi wasto ang nai-type mong hostname."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Hindi maayos na na-format ang listahan ng pagbubukod na iyong na-type. Mag-type 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_port" msgid="5539106187558215246">"Kailangan mong kumpletuhin 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="2671425042711054494">"Hindi wasto ang port na iyong na-type."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ang HTTP proxy ay ginagamit ng browser ngunit hindi maaaring gamitin ng iba pang apps."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Itakda"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Hindi tagumpay"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Matagumpay"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Nagaganap ang mga pagbabago kapag muling kinonekta ang USB cable"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Nagkakabisa ang mga pagbabago kapag muling ikinonekta ang USB cable."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Paganahin ang USB mass storage"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Kabuuang bytes:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Hindi na-mount ang USB storage"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Walang SD card"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Di na-mount ang USB storage."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Walang SD card."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Available na bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Gamit USB storage bilang  mass storage device"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Ginagamit ang SD card bilang device ng maramihang pag-iimbak"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Ligtas alisin ang USB storage"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Ligtas na ngayong alisin ang SD card"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Gmt USB strg na mss strg dvce."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Ginagamit ang SD card bilang isang mass storage device."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Ligtas na alisin USB storage."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Ligtas na ngayong alisin ang SD card."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Inalis USB storage na gamit!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Inalis ang SD card habang ginagamit pa!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Ginamit na bytes:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Ini-scan USB storage sa media…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB strage na-mount read-only."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Wika"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Nawala ang koneksyon ng data dahil iniwan mo ang iyong home network na naka-off ang roaming ng data."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"I-on ito"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Payagan ang roaming ng data? Maaari kang makakuha ng malaking pagsingil sa roaming!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Bigyang pansin"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Kapag pinayagan mo ang roaming ng data, maaari kang magkamit ng makabuluhang mga pagsingil sa roaming!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Payagan ang roaming ng data?"</string>
     <string name="networks" msgid="6333316876545927039">"Pagpipilian ng operator"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pumili ng isang tagapagpatakbo ng network"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Petsa &amp; oras"</string>
@@ -283,12 +285,14 @@
     <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>
     <string name="date_time_set_date" msgid="7021491668550232105">"Magtakda ng petsa"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Pumili ng format ng petsa"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"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="date_picker_title" msgid="1338210036394128512">"Petsa"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Oras"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Pahusayin ang pagtutugma ng mukha"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Pagsusuri sa liveness"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Hilingin ang pagkurap ng mata"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling i-encrypt mo ang iyong tablet, dapat kang maglagay ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito: hindi mo maaaring i-unencrypt ang iyong tablet maliban sa pamamagitan ng pagsasagawa ng pag-reset ng data ng factory, na binubura ang lahat ng iyong data."\n\n"Tumatagal ang pag-encrypt nang isang oras o higit pa. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong tablet hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan o lahat ng iyong data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling i-encrypt mo ang iyong telepono, dapat kang maglagay ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito: hindi mo maaaring i-unencrypt ang iyong telepono maliban sa pamamagitan ng pagsasagawa ng pag-reset ng data ng factory, na binubura ang lahat ng iyong data."\n\n"Tumatagal ang pag-encrypt nang isang oras o higit pa. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan o lahat ng iyong data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong tablet, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong tablet maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data."\n\n"Tumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong tablet hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan o lahat ng iyong data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong telepono, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong telepono maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data."\n\n"Tumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan sa 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="2029407131227814893">"I-charge ang iyong baterya at subukang muli."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"I-plug in 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_dialog_need_password_message" msgid="4071395977297369642">"Kailangan mong magtakda ng PIN o password ng lock screen bago ka makakapagsimula sa pag-encrypt."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"I-encrypt?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Hindi na mababawi ang pagpapatakbo ng pag-encrypt at kung aantalahin mo ito, maiwawala mo ang data. Tumatagal ang pag-encrypt nang isang oras o higit pa, kung kailan magre-restart ang tablet nang ilang beses."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Hindi na mababawi ang pagpapatakbo ng pag-encrypt at kung aantalahin mo ito, mawawalan ka ng data. Tumatagal ang pag-encrypt nang isang oras o higit pa, kung kailan 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="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"I-type 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="6891198717505120682">"Ang pag-encrypt ay naantala at hindi makumpleto. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong telepono, dapat kang magpaganap ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong magpanumbalik ng anumang data na na-back up sa iyong Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Ang pag-encrypt ay naantala at hindi makumpleto. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong telepono, dapat kang magpaganap ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaraoon ka ng pagkakataong magpanumbalik ng anumang data na na-back up sa iyong Google Account."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Pumili ng screen lock"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong tablet, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong tablet pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong telepono, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaraoon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Magpalit ng pamamaraan ng pag-input"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pumili ng screen lock"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pumili ng backup na lock"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Pattern"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"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>
@@ -362,44 +367,44 @@
     <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="122706614386757182">"Pindutin ang Magpatuloy kapag tapos na"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Magpatuloy"</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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Dapat mas kaunti sa <xliff:g id="NUMBER">%d</xliff:g> (na) character ang password."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Ang PIN ay dapat na mas kaunti sa <xliff:g id="NUMBER">%d</xliff:g> (na) digit."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Dapat lamang maglaman ng mga digit na 0-9 ang PIN."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Hindi pinapayagan ng administrator ng device ang paggamit ng kamakailang PIN."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Naglalaman ng ilegal na character ang password."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Dapat na maglaman ng hindi bababa sa isang titik ang password."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Dapat na maglaman ng hindi bababa sa isang digit ang password."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Dapat na maglaman ng hindi bababa sa isang simbolo ang password."</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>
+    <item quantity="one" msgid="3063853802158131458">"Dapat na maglaman ang password ng hindi bababa sa 1 titik."</item>
+    <item quantity="other" msgid="8186027808415585970">"Dapat na maglaman ng hindi bababa sa %d (na) titik ang password."</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>
+    <item quantity="one" msgid="5583986519662091001">"Dapat na maglaman ng hindi bababa sa 1 lowercase na titik ang password."</item>
+    <item quantity="other" msgid="2693910942679679225">"Dapat na maglaman ng hindi bababa sa %d (na) lowercase na titik ang password."</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>
+    <item quantity="one" msgid="2611909966725502768">"Dapat na maglaman ng hindi bababa sa 1 uppercase na titik ang password."</item>
+    <item quantity="other" msgid="3030801209112209245">"Dapat na maglaman ng hindi bababa sa %d (na) uppercase na titik ang password."</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>
+    <item quantity="one" msgid="3820355568839621231">"Dapat na maglaman ng hindi bababa sa 1 numerical na digit ang password."</item>
+    <item quantity="other" msgid="4703982391407595924">"Dapat na maglaman ng hindi bababa sa %d (na) numerical na digit ang password."</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>
+    <item quantity="one" msgid="8456579939292408631">"Dapat na maglaman ng hindi bababa sa 1 espesyal na simbolo ang password."</item>
+    <item quantity="other" msgid="1221290525051187757">"Dapat na maglaman ng hindi bababa sa %d (na) espesyal na simbolo ang password."</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>
+    <item quantity="one" msgid="4594051152085925921">"Dapat na maglaman ng hindi bababa sa 1 character na hindi titik ang password."</item>
+    <item quantity="other" msgid="3952508584649046404">"Dapat na maglaman ng hindi bababa sa %d (na) character na hindi titik ang password."</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_password_recently_used" msgid="6098087796784262081">"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="lock_setup" msgid="1759001157415978959">"Kumpleto na ang pag-setup"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Kumpleto na ang pag-setup."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Pamamahala 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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Upang ipares sa:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>I-type 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_enter_pin_other_device" msgid="4637977124526813470">"Maaari mo ring kailanganing i-type ang PIN na ito sa isa pang device."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Maaari mo ring kailanganing i-type ang passkey na ito sa iba pang 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="2796550001376088433">"Upang ipares sa:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Mag-type dito:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, pagkatapos ay pindutin ang Return o Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Hindi maipares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g> dahil sa maling PIN o passkey."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Hindi magawang makipag-ugnay sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Hindi makakonekta 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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Payagan ang pagpapalitan ng data kapag nadikit ang telepono sa isa pang device"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Payagan ang palitan ng data kapag dumikit ang tablet sa isa pang device"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Payagan ang pagpapalitan ng data kapag nadikit ang telepono sa isa pang device"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Handa nang maglipat ng nilalaman ng app sa pamamagitan ng NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"I-off"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hindi available dahil naka-off ang NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Kapag in-on ang tampok na ito, maaari mong i-beam ang nilalaman ng app sa isa pang device na may kakayahan sa NFC sa pamamagitan ng paghawak sa mga device nang magkalapit. Halimbawa, maaari mong i-beam ang mga pahina sa Browser, video sa YouTube, contact sa People, at higit pa."\n\n"Paglapitin lamang ang mga device (karaniwang magkatalikuran) at pagkatapos ay pindutin ang iyong screen. Tinutukoy ng app kung ano ang nabi-beam."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Pagtuklas sa serbisyo ng network"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Payagan ang apps sa iba pang mga device na tumuklas ng apps sa device na ito"</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="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_setup_wizard_title" msgid="70277346338812325">"Piliin ang Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Hindi makapag-scan ng mga network"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notification ng network"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"I-notify ako kapag available ang bukas na network"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Iwasan ang mahinang mga koneksyon"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Huwag gumamit ng Wi-Fi network maliban kung mayroon itong mahusay na koneksyon sa Internet"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Iwasan ang mahihinang koneksyon"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Huwag gumamit ng Wi-Fi network maliban kung mayroon itong mahusay na koneksyon sa Internet"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Panatilihing naka-on ang Wi-Fi habang naka-sleep"</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_wps_pbc" msgid="2668564692207863017">"Push Button ng WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entry ng Pin ng WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Direkta sa Wi-Fi"</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_empty_list_wifi_on" msgid="3354911729026237372">"Naghahanap ng mga Wi-Fi network..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Iba pang network..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Higit pa"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Awtomatikong setup (WPS)"</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="8242979682530043184">"I-type ang PIN mula sa access point"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Pag-setup ng WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"I-type 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_wps_setup_title" msgid="6034518116333042484">"Protektadong Setup ng Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Sinisimulan ang WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pindutin ang button ng Pinoprotektahang Setup ng Wi-Fi sa iyong router. Maaaring tinatawag itong \"WPS\" o naglalaman ng simbolong ito:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Ilagay ang pin na <xliff:g id="NUMBER">%1$s</xliff:g> ng iyong Wi-Fi router. Maaaring tumagal nang hanggang dalawang minuto ang pag-setup upang matapos."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"Nagtagumpay ang WPS. Kumokonekta sa network…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Nakakonekta sa Wi-Fi na network na <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Umuusad na ang WPS at maaaring tumagal nang dalawang minuto upang makumpleto"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Nabigo ang WPS. Pakisubukang muli sa loob ng ilang minuto."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Hindi sinusuportahan ang setting ng seguridad ng wireless na router (WEP)"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Hindi sinusuportahan ang setting ng seguridad ng wireless na router (TKIP)"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pagkabigo sa pagpapatotoo. Pakisubukang muli."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Natunton ang isa pang sesyon ng WPS. Pakisubukang muli sa loob ng ilang minuto."</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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Iniwasan ang mahinang koneksyon sa Internet"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Iniwasan ang network dahil sa mahinang koneksyon. I-off ang pag-uugaling ito mula sa Mga Setting &gt; screen na Wi-Fi, item ng menu na Advanced."</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_wps_available_first_item" msgid="3538912605343585226">"Available ang protektadong network"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (available ang pinoprotektahang network)"</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_failed_connect_message" msgid="8491902558970292871">"Nabigong kumonekta sa network."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Kalimutan"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Nabigong kalimutan ang network"</string>
     <string name="wifi_save" msgid="3331121567988522826">"I-save"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nabigong i-save ang network"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Kanselahin"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"May nakita pa protektado session ng Wi-Fi. Subok muli tapos ng ilan 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Haba ng prefix ng network"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Direktang Wi-Fi"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"I-setup ang pagkakakonekta ng peer-to-peer"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Impormasyon ng device"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Setup ng protektadong Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"I-type 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_remove_group" msgid="4844634506540667517">"Alisin ang pangkat"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Advanced"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Mga available na device"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Maghanap ng mga device"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Naghahanap…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Palitan ang pangalan ng device"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Mga device ng kaibigan"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Hindi makakonekta."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Nabigong palitan ang pangalan ng device."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Idiskonekta?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Kung magdiskonekta ka, magtatapos ang iyong koneksyon kay <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Kung magdiskonekta ka, magtatapos ang iyong koneksyon kay <xliff:g id="PEER_NAME">%1$s</xliff:g> at <xliff:g id="PEER_COUNT">%2$s</xliff:g> (na) iba pang mga device."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kanselahin ang imbitasyon?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Nais mo bang kanselahin ang imbitasyong kumonekta kay <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_configure_ap_text" msgid="3474995108398156258">"I-configure ang Wi-Fi hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"I-set up 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="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tunog"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Silent mode"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringtone ng telepono"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Mga Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Mga effect sa musika"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume ng ringer"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"I-vibrate kapag naka-silent"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"I-vibrate at i-ring"</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="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"I-mute ang ringtone at mga notification"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"I-mute ang musika at iba pang media"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"I-mute ang mga notification"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"I-mute ang mga alarm"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"I-vibrate kapag nagri-ring"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Dapat mong i-dock ang telepono bago i-set up ang dock audio."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Dapat mong i-dock ang telepono bago i-set up ang dock audio."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Kailangan mong i-dock ang tablet bago i-set up ang dock audio."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Kailangan mong i-dock ang telepono bago i-set up ang dock audio."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Tunog sa paglagay ng 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="account_settings" msgid="6403589284618783461">"Mga 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="7965901687241669598">"Pagpapakita"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Numero ng aking telepono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Bersyon ng PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL na bersyon"</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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Burahin ang lahat ng iyong personal na impormasyon at na-download na apps? Hindi mo mababawi 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="2234954758550554549">"Dapat mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-reset sa data ng factory."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Kailangan mong iguhit ang iyong pattern ng pag-unlock upang magkumpirma ng factory data reset."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Walang isinagawang pag-reset dahil hindi available ang serbisyong System Clear."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"I-reset?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Burahin imbakan na USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Burahin ang SD card, na tinatanggal ang lahat ng file na nakaimbak doon? Hindi mo mababawi ang pagkilos na ito!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Burahin ang lahat"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Kunin ang iyong naka-unlock na pattern"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Dapat mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin na gusto mong burahin ang imbakan na USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Dapat mong iguhit ang iyong pattern ng pag-unlock upang kumpirmahin na nais mong burahin ang USB storage."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kailangan mong iguhit ang iyong pattern ng pag-unlock upang kumpirmahin na nais 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="6688416425801386511">"Pag-tether sa USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mga mobile network"</string>
     <string name="location_title" msgid="1029961368397484576">"Aking Lokasyon"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Serbisyo sa lokasyon ng Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Hayaan ang apps na gumamit ng data mula sa mga pinagmulang tulad ng mga Wi-Fi at mobile na network upang tukuyin ang iyong tinatayang lokasyon"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Payagang maipadala sa Google ang hindi kilalang data ng lokasyon. Payagan din ang mga pinahihintulutang app na gamitin ang data mula sa mga pinagmulan gaya ng 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pindutin ang Menu para sa tulong."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Bitawan sa pagkakapindot kapag tapos na."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Pagdugtungin ang hindi bababa sa <xliff:g id="NUMBER">%d</xliff:g> (na) tuldok. Subukang muli:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Na-record ang pattern!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Na-record ang pattern."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Kumuha muli ng pattern upang makumpirma:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Ang iyong bagong naka-unlock na pattern:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Kumpirmahin"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Susunod"</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="1075370160667458122">"Protektahan ang iyong tablet mula sa hindi pinapahintulutang paggamit sa pamamagitan ng paglikha ng personal na pattern sa pag-unlock ng screen. I-slide ang iyong daliri upang ikonekta ang mga dot sa anumang pagkakaayos sa susunod na screen. Dapat kang magkonekta ng hindi bababa sa apat na dot. "\n\n"Handa na bang magsimula? Pindutin ang Susunod."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protektahan ang iyong tablet mula sa hindi pinapahintulutang paggamit sa pamamagitan ng paglikha ng personal na pattern ng pag-unlock ng screen. I-slide ang iyong daliri upang ikonekta ang mga dot sa anumang pagkakaayos sa susunod na screen. Kailangan mong magkonekta ng hindi bababa sa apat na dot. "\n\n"Handa nang magsimula? Pindutin ang Susunod."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protektahan ang iyong telepono mula sa hindi pinapahintulutang paggamit sa pamamagitan ng paglikha ng personal na pattern sa pag-unlock ng screen. I-slide ang iyong daliri upang magkonekta ng hindi bababa sa apat na dot sa anumang kaayusan sa susunod na screen. "\n\n"Handa na bang magsimula? Pindutin ang Susunod."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pamahalaan ang apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pamahalaan at alisin ang naka-install na apps"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Pamahalaan ang apps, mag-set up ng mga shortcut ng mabilisang paglunsad"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Mga setting ng app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Hindi kilalang pinagmumulan"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Payagan ang pag-install ng hindi apps ng Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Payagan ang pag-install ng apps mula sa hindi alam na mga pinagmulan"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Mas madaling mapinsala ang iyong tablet at personal na data ng atake ng apps mula sa hindi alam na mga pinagmulan. Sumasang-ayon ka na ikaw ang tanging mananagot para sa anumang pinsala sa iyong tablet o pagkawala ng data na maaaring magresulta mula sa paggamit ng apps na ito."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Mas madaling mapinsala ang iyong telepono at personal na data ng atake ng apps mula sa hindi alam na mga pinagmulan. Sumasang-ayon ka na ikaw ang tanging mananagot para sa anumang pinsala sa iyong telepono o pagkawala ng data na maaaring magresulta mula sa paggamit ng apps na ito."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Mga advanced na setting"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Impormasyon ng app"</string>
     <string name="storage_label" msgid="8700867073480107253">"Imbakan"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Paglunsad bilang default"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Mga 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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"I-clear ang data"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"I-uninstall ang mga pag-update"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Pinili mong ilunsad ang app na ito bilang default para sa ilang mga pagkilos."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Pinili mong payagan ang app na ito na lumikha ng mga widget at i-access ang data ng mga ito."</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="1616155457673106022">"Maaaring hindi nakadisenyo ang app na ito para sa iyong screen. Makokontrol mo dito kung paano ito umaakma sa iyong screen."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Pag-uri-uriin ayon sa laki"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Pakita tumatakbo serbisyo"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Ipakita na-cache proseso"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"I-reset kagustuhan sa app"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"I-reset ang gusto sa app?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ire-reset nito ang lahat ng kagustuhan para sa:"\n\n" "<li>"Hindi pinapaganang apps"</li>\n" "<li>"Mga notification ng hindi pinapaganang app"</li>\n" "<li>"Mga default na application para sa mga pagkilos"</li>\n" "<li>"Paghihigpit sa data sa background para sa apps"</li>\n\n" Hindi ka mawawalan ng anumang data ng app."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"I-reset ang apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Pamahalaan ang espasyo"</string>
     <string name="filter" msgid="2018011724373033887">"I-filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Pumili ng mga opsyon ng filter"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Maaaring i-access ng app na ito ang sumusunod sa iyong tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Maa-access ng app na ito ang sumusunod 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="invalid_size_value" msgid="7563537715280712285">"Hindi makalkula ang laki ng package."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Wala kang anumang naka-install na apps ng third-party."</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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Baguhin ang ninanais na lokasyon ng pag-install para sa bagong apps"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Huwag paganahin built-in app?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Kung hindi mo papaganahin ang isang built-in na app, maaaring hindi kumilos nang tama ang iba pang apps."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"I-off ang mga notification?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Kung i-o-off mo ang mga notification para sa app na ito, maaari mong makaligtaan ang mahahalagang alerto at update."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Paggamit ng imbakan"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Tingnan ang storage na ginagamit ng apps"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Mga tumatakbong serbisyo"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Maaaring magawa ng pamamaraan ng pag-input na ito na kolektahin ang lahat ng tekstong iyong tina-type, kabilang ang personal na data katulad ng mga password at mga numero ng credit card. Nagmumula ito sa app na <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Gamitin ang pamamaraan ng pag-input na ito?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Maaaring magawa ng spell checker na ito na makolekta ang lahat ng tektong iyong tina-type, kabilang ang personal na data katulad ng mga password at mga numero ng credit card. Nagmumula ito sa app na <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Gamitin ang spell checker na ito?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Mga Setting"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Wika"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Nabigong buksan ang mga setting para sa <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Bilis ng pointer"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Game Controller"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Gamitin ang vibrator"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"I-redirect ang vibrator sa game controller kapag nakakonekta."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Pumili ng layout ng keyboard"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"I-set up ang mga layout ng keyboard"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para palit, pindot Control-Spacebar"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mga layout ng keyboard"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diksyunaryo ng user"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personal na diksyunaryo"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personal na mga diksyunaryo"</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_add_screen_title" msgid="742580720124344291">"Parirala"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Higit pang mga pagpipilian"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Mas kaunting pagpipilian"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Salita:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Shortcut:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Wika:"</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="8165273379942105271">"Wala kang anumang mga salita sa diksyunaryo ng user. Magdagdag ng salita sa pamamagitan ng pagpindot sa button na Magdagdag (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Lahat ng mga wika"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Para sa lahat ng wika"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Higit pang mga wika..."</string>
     <string name="testing" msgid="6584352735303604146">"Pagsubok"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Impormasyon ng tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Impormasyon ng telepono"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Magtakda ng mga pagpipilian para sa pagbuo ng app"</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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"ID ng device sa pagpapahusay"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Hindi available ang impormasyon ng device"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Manatiling gumagana"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Hindi kailanman hihinto ang screen kapag kinakargahan"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Payagan ang pag-debug ng USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ang pag-debug ng USB ay nilalayon para sa mga layuning pagpapabuti lamang. Gamitin ito upang kumopya ng data sa pagitan ng iyong computer at iyong device, mag-install ng apps sa iyong device nang walang notification, at magbasa ng data ng log."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Payagan ang mga setting ng pag-develop?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Nilalayon ang mga setting na ito para sa paggamit sa pag-develop lamang. Maaaring magsanhi ang mga ito ng pagkasira o hindi paggana nang maayos ng iyong device at mga application na nandito."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protektahan ang USB storage"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Dapat humiling ng pahintulot ang apps na basahin ang USB storage"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protektahan ang USB storage?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kapag pinoprotektahan ang USB storage, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage."\n\n"Maaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protektahan ang SD card"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Dapat na humiling ng pahintulot ang apps na basahin ang SD card"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protektahan ang SD card?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kapag pinoprotektahan ang SD card, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage."\n\n"Maaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pumili ng gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pumili ng widget"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Likhain ang widget at payagan ang access?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Pagkatapos mong likhain ang widget, maa-access ng <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ang lahat ng data na ipinapakita nito."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Palaging payagan ang <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> na lumikha ng mga widget at i-access ang data ng mga ito"</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>
@@ -1160,12 +1226,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Sabihin ang mga password"</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="3264723681038625967">"I-install ang mga web script"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Pahusayin ang accessibility sa web"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Walang mga serbisyong naka-install"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Kailangan ng screen reader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Nagbibigay ang TalkBack ng pasalitang feedback upang matulungan ang mga user na bulag at may mahinang paningin. Nais mo ba itong i-install nang libre mula sa Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"I-install ang mga web script?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Nais mo bang mag-install ang apps ng mga script mula sa Google na ginagawang mas naa-access ang nilalaman sa web ng mga ito?"</string>
-    <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="1072730037861494125">"Walang ibinigay na paglalarawan."</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_not_available" msgid="3214000535532434353">"Di avail data ng gmit baterya."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"Hindi maaaring tumakbo ang engine na iyong pinili."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"I-configure"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pumili ng isa pang engine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Maaaring makolekta ng speech synthesis engine na ito ang lahat ng teksto na sasabihin, kabilang ang personal na data tulad ng mga password at mga numero ng credit card. Nanggagaling ito mula sa <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Paganahin ang paggamit ng speech synthesis engine na ito?"</string>
@@ -1301,7 +1362,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Babae"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Pgnahin bago engine bago gmit."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Iguhit ang iyong pattern sa pag-unlock"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-install ng kredensyal."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"I-type ang password para sa storage ng kredensyal."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kasalukuyang password:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Binura storage ng kredensyal."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Di mbura storage ng krednsyal."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pinagana ang imbakan ng kredensyal."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Dapat kang magtakda ng PIN o password ng lock screen bago mo magamit ang storage ng kredensyal."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kailangan mong magtakda ng PIN o password ng lock screen bago mo magamit ang storage ng kredensyal."</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="5446972770562918934">"I-backup &amp; i-reset"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Awtomatikong pagbalik"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Kapag muling ini-install ang isang app, ipanumbalik ang mga na-back up na setting at 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="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Kasalukuyang hindi pinoprotektahan ang mga buong pag-backup ng desktop"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Pindutin upang baguhin o alisin ang password para sa mga buong pag-backup ng desktop"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Huminto sa pag-back up ng iyong mga password sa Wi-Fi, bookmark, ibang setting, at data ng app, at burahin ang lahat ng kopya sa mga server ng Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Mga setting ng administration ng device"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Aktibo ang administrator na ito at pinapayagan ang app na <xliff:g id="APP_NAME">%1$s</xliff:g> upang isagawa ang sumusunod na mga 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_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="6047518536574673606">"System"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ringtone at pag-vibrate ng tawag"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Kumokonekta sa Wi-Fi network na <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Nabigo ang pag-sync"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Aktibo ang pag-sync"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"I-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="background_data" msgid="5779592891375473817">"Data sa background"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Huling na-sync noong <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Sini-sync ngayon…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Maligayang pagdating sa Google sync!"</font>" "\n"Isang paraan ng Google sa pag-sync ng data upang payagan ang access sa iyong mga contact, appointment, at higit pa nasaan ka man."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Mga setting ng pag-sync ng app"</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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Kinakailangan ng ilang apps ang account na ito. Maaari mo lamang itong alisin sa pamamagitan ng pag-reset ng tablet sa mga default ng factory (na tinatanggal ang lahat ng iyong personal na data) sa Mga Setting &gt; I-backup &amp; i-reset."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Kinakailangan ng ilang apps ang account na ito. Maaari mo lamang itong alisin sa pamamagitan ng pag-reset ng telepono sa mga default ng factory (na tinatanggal ang lahat ng iyong personal na data) sa Mga Setting &gt; I-backup &amp; i-reset."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Hindi makapag-sync nang manu-mano"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Kasalukuyang hindi pinagana ang pag-sync para sa item na ito. Upang baguhin ang setting na ito, pansamantalang i-on ang data ng background at awtomatikong pag-sync."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Mga setting na 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="4131758584074246224">"I-type ang password upang i-decrypt ang storage"</string>
     <string name="try_again" msgid="4272075051293936921">"Subukang muli."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Abala ang serbisyo. Subukang muli."</string>
     <string name="delete" msgid="4219243412325163003">"Tanggalin"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Pag-debug"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Pumili ng debug app"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Walang nakatakdang application sa pag-debug"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Application sa pag-debug: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Pumili ng application"</string>
+    <string name="no_application" msgid="2813387563129153880">"Wala"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Maghintay ng debugger"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Hinihintay ng na-debug na application na ma-attach ang debugger bago magsagawa"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Pagguhit"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Pagsubaybay"</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_screen_updates" msgid="5470814345876056420">"Ipakita update sa surface"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"I-flash ang buong window surface kapag nag-update"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Ipakita GPU view update"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"I-flash ang view sa windows kapag ginuhit sa GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Wag paganahin HW overlay"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Laging gamitin ang GPU para sa screen compositing"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Paganahin ang mga trace"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Piliin pinapaganang trace"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Walang mga trace na kasalukuyang pinapagana"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> (na) trace ang kasalukuyang pinapagana"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Kasalukuyang pinapagana ang lahat ng trace"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Ipakita mga layout bound"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Ipakita ang mga hangganan ng clip, margin, atbp."</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="force_hw_ui" msgid="6426383462520888732">"Ipilit ang pag-render ng GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Gumamit ng 2D hardware acceleration sa mga application"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Sapilitang paggamit sa GPU para sa 2d na pagguhit"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Pag-render GPU ng Profile"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Sukat oras pag-render sa adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"Scale tagal ng animator"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Mga mobile hotspot"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"I-auto-sync ang data"</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="8621855507876539282">"Walang apps 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_disclaimer" product="tablet" msgid="2591250607795265503">"Sinusukat ng iyong tablet. Maaaring mag-iba-iba ang pagkuwenta sa paggamit ng data ng iyong carrier."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Sinusukat ng iyong telepono. Maaaring mag-iba-iba ang pagkuwenta sa paggamit ng data ng iyong carrier."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"pinaghihigpitan"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Huwag paganahin ang data ng mobile?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Itakda ang limitasyon ng data ng mobile"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Itakda ang limitasyon ng 4G data"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobile"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Tingnan ang mga setting ng app"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Paghigpitan ang data ng background"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Huwag paganahin ang data ng background sa network ng mobile data lamang. Gagamitin ang Wi-Fi kung available."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Wg pgnhin bckgrnd data mble ntwrk. Ggmit non-mble ntwrk kng mrn."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Upang paghigpitan ang data ng background para sa app na ito, magtakda muna ng isang limitasyon sa mobile data."</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="5651588785118290771">"Ang tampok na ito ay maaaring magsanhi na tumigil sa paggana ang isang app na nakadepende sa background na data kapag walang available na Wi-Fi."\n\n"Makakakita ka ng higit na naaangkop na kontrol sa paggamit ng data sa mga setting na available sa loob ng app."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ang tampok na ito ay maaaring maging sanhi ng pagtigil ng app na nakadepende sa data ng background kapag mga mobile network lang ang available."\n\n"Maaari kang makahanap ng higit pang naaangkop na mga kontrol sa paggamit ng data sa mga setting na available sa loob ng app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Posible lamang ang paghihigpit sa data ng background kapag nagtakda ka ng isang limitasyon sa mobile data."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"I-on ang pag-auto-sync ng data?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Awtomatikong makokopya sa iyong tablet ang anumang pagbabagong ginawa mo sa iyong mga account sa web."\n\n"Awtomatiko ring kinokopya ng ilang account ang anumang pagbabagong ginawa mo sa tablet sa web. Gumagana sa ganitong paraan ang isang Google Account."\n\n"Upang piliin kung aling uri ng impormasyon ang isi-snyc sa loob ng bawat account, pumunta sa Mga Setting at Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Awtomatikong makokopya sa iyong telepono ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web."\n\n"Maaaring awtomatiko ring kopyahin ng ilang account ang anumang mga pagbabagong gagawin mo sa telepono sa web. Gumagana sa ganitong paraan ang isang Google Account."\n\n"Upang piliin kung aling mga uri ng impormasyon ang isi-snyc sa loob ng bawat account, pumunta sa Mga Setting at Account."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"I-off ang pag-auto-sync ng data?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Mababawasan nito ang paggamit ng data at baterya, ngunit kakailanganin mong manu-manong i-sync ang bawat account upang kumolekta ng kamakailang impormasyon. At hindi ka makakatanggap ng mga notification kapag naganap ang mga pag-update."</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_warning_editor_title" msgid="3704136912240060339">"Itakda ang babala sa paggamit ng data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Itakda ang limitasyon sa paggamit ng data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Pag-limit sa paggamit ng data"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Hindi pagaganahin ang koneksyong ng iyong data ng <xliff:g id="NETWORKS">%1$s</xliff:g> kapag naaabot na ang tinukoy na limitasyon."\n\n"Dahil sinusukat ng iyong tablet ang paggamit ng data, at ang iyong carrier ay maaaring magkuwenta para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Hindi pagaganahin ang koneksyong ng iyong data ng <xliff:g id="NETWORKS">%1$s</xliff:g> kapag naaabot na ang tinukoy na limitasyon."\n\n"Dahil sinusukat ng iyong telepono ang paggamit ng data, at ang iyong carrier ay maaaring magkuwenta para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Hindi pagaganahin ang koneksyon ng iyong data ng mobile kapag naabot na ang tinukoy na limitasyon."\n\n"Dahil sinusukat ng iyong tablet ang paggamit ng data, at maaaring kuwentahin ang iyong carrier para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Hindi pagaganahin ang koneksyon ng iyong data ng mobile kapag naabot na ang tinukoy na limitasyon."\n\n"Dahil sinusukat ng iyong telepono ang paggamit ng data, at maaaring kuwentahin ang iyong carrier para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Paghigpitan ang data ng background?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang app at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: mga <xliff:g id="TOTAL">%1$s</xliff:g> ang nagamit"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: mga <xliff:g id="TOTAL">%1$s</xliff:g> ang nagamit."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> gamit, sinukat ng tablet mo. Maaaring iba kwenta sa gamit ng data ng carrier."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> gamit, sinukat ng tel mo. Maaaring iba kwenta sa paggamit ng data ng carrier."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mga mobile hotspot"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Piliin ang mga network ng Wi-Fi na mga mobile hotspot. Maaaring paghigpitan ang apps mula sa paggamit sa mga network na ito kapag nasa background. Maaari ring magbabala ang apps bago gamitin ang mga network na ito para sa malalaking pag-download."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mga mobile network"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Mga Wi-Fi network"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Upang pumili ng mga mobile hotspot, i-on ang Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"I-edit ang profile sa VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Kumonekta sa <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Idagdag ang profile sa VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"I-edit ang profile"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Tanggalin ang profile"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Walang koneksyon sa network. Pakisubukang muli sa ibang pagkakataon."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"May nawawalang certificate. Paki-edit ang profile."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"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 app. 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="3973201880357468747">"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="8764686624055084454">"Upang mag-scroll sa isang listahan, maaari kang mag-slide ng dalawang daliri sa screen. Halimbawa, naglalaman ang kasalukuyang screen ng isang listahan ng mga pangalan ng app na maaaring i-scroll pataas o pababa. Una, subukang tumukoy ng ilang mga item sa listahan sa pamamagitan ng pag-slide ng isang daliri sa paligid."</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="3055831259260848004">"Nakumpleto mo na ang tutorial. Upang lumabas, hanapin at pindutin ang button na <xliff:g id="FINISH">%s</xliff:g>."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Pagwawasto ng spelling"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Pang-check ng pagbabaybay"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"I-type ang iyong kasalukuyang buong backup na password dito"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Mag-type ng bagong password dito para sa mga buong pag-backup"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Muling i-type ang iyong bagong buong backup na password dito"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Kanselahin"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mga karagdagang pag-update sa system"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Mga user at paghihigpit"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Mga User"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Idagdag ang user"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"I-edit ang mga detalye"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Impormasyon ng user"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Pangalan"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Mga paghihigpit sa nilalaman"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Humiling ng PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Rating ng nilalaman"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Apps ng system"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Mga naka-install na apps"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Itapon"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Alisin ang user"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Magulong bata"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Alisin ang user?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Sigurado ka bang nais mong alisin ang user at ang lahat ng nauugnay na data mula sa device?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Ipakita notification"</string>
+    <string name="help_label" msgid="1107174367904110532">"Tulong"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index b2f7a18..29978e7 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Bağlantı kesiliyor…"</item>
     <item msgid="1634960474403853625">"Bağlantı kesildi"</item>
     <item msgid="746097431216080650">"Başarısız"</item>
+    <item msgid="6367044185730295334">"Engellendi"</item>
+    <item msgid="503942654197908005">"Kötü bağlantıdan geçici olarak kaçınılıyor"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> bağlantısı kesiliyor…"</item>
     <item msgid="197508606402264311">"Bağlantı kesildi"</item>
     <item msgid="8578370891960825148">"Başarısız"</item>
+    <item msgid="5660739516542454527">"Engellendi"</item>
+    <item msgid="1805837518286731242">"Kötü bağlantıdan geçici olarak kaçınılıyor"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Düğme"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Yok"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Erişim noktası PIN\'i"</item>
-    <item msgid="7364462169350112617">"Bu cihazın PIN\'i"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Statik"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Çıkarılabilir SD kart"</item>
     <item msgid="4498124044785815005">"Sistem karar versin"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Kapalı"</item>
-    <item msgid="4804571292609523335">"Titreşim"</item>
-    <item msgid="595707141547423573">"Ses kapalı"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kısa"</item>
     <item msgid="2560532955514699713">"Orta"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Animasyon ölçeği 5x"</item>
     <item msgid="6660750935954853365">"Animasyon ölçeği 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Animasyon kapalı"</item>
+    <item msgid="1138649021950863198">"Animasyon ölçeği 0,5x"</item>
+    <item msgid="4394388961370833040">"Animasyon ölçeği 1x"</item>
+    <item msgid="8125427921655194973">"Animasyon ölçeği 1,5x"</item>
+    <item msgid="3334024790739189573">"Animasyon ölçeği 2x"</item>
+    <item msgid="3170120558236848008">"Animasyon ölçeği 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 2360d38..9db36a6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Evet"</string>
     <string name="no" msgid="6731231425810196216">"Hayır"</string>
+    <string name="create" msgid="3578857613172647409">"Oluştur"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ekran kilitliyken blutooth çeviricinin kullanımını engelle"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth cihazlar"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Cihaz adı"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Cihaz ayarları"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Profil ayarları"</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_rename_device" product="tablet" msgid="787970073150631155">"Tableti yeniden adlandır"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Eşleştiriliyor…"</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="5655704645616731277">"Eşleştirmek için dokunun"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Yakınlarda 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="1931617700075106801">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirmek için dokunun"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirmek için dokunun."</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="device_picker" msgid="8398232791303186677">"Bluetooth cihaz seçici"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth izin isteği"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak istiyor. İzin veriyor musunuz?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"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>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\"<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_acceptance_dialog_text" msgid="6555508756987053866">"%1$s, kişilerinize ve çağrı geçmişinize erişmek istiyor. %2$s uygulamasına erişim izni 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>
@@ -174,7 +176,7 @@
     <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="5655276502233453400">"Proxy bağlantı noktası"</string>
-    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Şunlar için proxy\'yi atla"</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="2957063145357903951">"Bitti"</string>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Tamam"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Yazdığınız ana makine adı geçersiz."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Yazdığınız dışlama listesi doğru biçimlendirilmemiş. Dışlanan alan adlarının virgülle ayrılmış listesini yazın."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Bağlantı noktası alanını tamamlamalısınız."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Bağlantı noktası alanını tamamlamanız gerekir."</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="2671425042711054494">"Yazdığınız bağlantı noktası geçerli değil."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy\'yi tarayıcı kullanıyor, ancak diğer uygulamalar tarafından kullanılamayabilir."</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Ayarla"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Başarısız"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Başarılı"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Değişiklikler USB kablosu bağlandığında devreye girer"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Değişiklikler USB kablosu tekrar bağlandığında devreye girer."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB yığın depolamasını etkinleştir"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Toplam bayt sayısı:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB deplm birimi bağlı değil"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"SD kart yok"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB depolama birimi eklenmedi."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"SD kart yok."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Kullanılabilir bayt:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB dep brmi, yığın dep cihazı olarak kullanılıyor"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"SD kart, yığın depolama cihazı olarak kullanılıyor"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"USB depolama birimi şimdi güvenle çıkarılabilir"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"SD kart şimdi güvenli olarak çıkarılabilir"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB depolama birimi, yığın depolama cihazı olarak kullanılıyor."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD kart, yığın depolama cihazı olarak kullanılıyor."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"USB depolama birimi şimdi güvenle çıkarılabilir."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"SD kart şimdi güvenli olarak çıkarılabilir."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB dep birimi kullanılırken çıkarıldı!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD kart kullanılırken çıkarıldı!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Kullanılan bayt miktarı:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB dep brdki medya taranyr..."</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB depolama birimi salt okunur olarak eklendi."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD kart salt okunur olarak eklendi."</string>
     <string name="skip_label" msgid="47510779345218297">"Atla"</string>
     <string name="next_label" msgid="4693520878012668114">"İleri"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Dil"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Dolaşırken veri hizmetlerine bağlan"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Veri dolaşımı kapalıyken ana ağınızdan ayrıldığınız için veri bağlantısını kaybettiniz."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Açın"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Veri dolaşımına izin verilsin mi? Kayda değer dolaşım ücretleri ödeyebilirsiniz!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Dikkat"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Veri dolaşımına izin verdiğinizde, yüksek miktarda dolaşım ücretleri ödeyebilirsiniz!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Veri dolaşımına izin verilsin mi?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatör seçimi"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Bir ağ operatörü seçin"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tarih ve saat"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Saati ayarla"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Saat dilimini seç"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Tarihi ayarla"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Tarih biçimini seç"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Tarih biçimi seçin"</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="date_picker_title" msgid="1338210036394128512">"Tarih"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Saat"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Yüz eşlemeyi iyileştir"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Canlılık denetimi"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Göz kırpma gerektir"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"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="3504519024884099702">"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_desc" product="tablet" msgid="3839235202103924154">"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 çözmek 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="7663118199519229502">"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 çözmek 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 telefonunuzu 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="2029407131227814893">"Pilinizi şarj edip tekrar deneyin."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Ş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_dialog_need_password_message" msgid="4071395977297369642">"Şifrelemeyi başlatabilmek için öncelikle ekran kilitleme PIN\'i veya şifresi ayarlamanız gerekir."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Şifrelensin mi?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Şifreleme işlemi geri döndürülemez ve şifreleme sırasında işlemi durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve tablet bu süre içinde birkaç kez yeniden başlatılır."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Şifreleme işlemi geri döndürülemez ve şifreleme sırasında işlemi durdurursanız veri kaybedersiniz. Şifreleme bir saat veya daha fazla sürebilir ve telefon bu süre içinde birkaç 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="6689952371032099350">"Tabletiniz şifrelenirken lütfen bekleyin. %<xliff:g id="PERCENT">^1</xliff:g> tamamlandı."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"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="2223340178473871064">"Şifrenizi yazın"</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="6891198717505120682">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle tabletinizdeki verilere artık erişilemiyor."\n\n"Tabletinizi kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmelisiniz. Sıfırlama işleminden sonra tabletinizin kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle telefonunuzdaki verilere artık erişilemiyor."\n\n"Telefonunuz kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmelisiniz. Sıfırlama işleminden sonra telefonunuzun kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Ekran kilidini seç"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle tabletinizdeki verilere artık erişilemiyor."\n\n"Tabletinizi kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra tabletinizin kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle telefonunuzdaki verilere artık erişilemiyor."\n\n"Telefonunuz kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra telefonunuzun kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Giriş yöntemini değiştir"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran kilidini seçin"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Yedek kilidi seçin"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Yüz Tanıma Kilidi"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Desen"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Şifre"</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>
@@ -362,44 +367,44 @@
     <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN, en az %d karakter olmalıdır"</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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Şifre <xliff:g id="NUMBER">%d</xliff:g> karakterden kısa olmalıdır."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN en çok <xliff:g id="NUMBER">%d</xliff:g> basamaklı olmalıdır."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN yalnızca 0-9 arasındaki rakamları içermelidir."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Cihaz yöneticisi yakın zamanda kullanılan bir PIN\'e izin vermiyor."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Şifre geçersiz bir karakter içeriyor."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Şifre en az bir harf içermelidir."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Şifre en az bir rakam içermelidir."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Ş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>
+    <item quantity="one" msgid="3063853802158131458">"Şifre en az 1 harf içermelidir."</item>
+    <item quantity="other" msgid="8186027808415585970">"Ş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>
+    <item quantity="one" msgid="5583986519662091001">"Şifre en az 1 küçük harf içermelidir."</item>
+    <item quantity="other" msgid="2693910942679679225">"Ş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>
+    <item quantity="one" msgid="2611909966725502768">"Şifre en az 1 büyük harf içermelidir."</item>
+    <item quantity="other" msgid="3030801209112209245">"Ş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>
+    <item quantity="one" msgid="3820355568839621231">"Şifre en az 1 rakam içermelidir."</item>
+    <item quantity="other" msgid="4703982391407595924">"Ş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>
+    <item quantity="one" msgid="8456579939292408631">"Şifre en az 1 özel sembol içermelidir."</item>
+    <item quantity="other" msgid="1221290525051187757">"Ş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>
+    <item quantity="one" msgid="4594051152085925921">"Şifre, harf olmayan en az 1 karakter içermelidir."</item>
+    <item quantity="other" msgid="3952508584649046404">"Ş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_password_recently_used" msgid="6098087796784262081">"Cihaz yöneticisi yakın zamanda kullanılan bir ş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="lock_setup" msgid="1759001157415978959">"Kurulum tamamlandı"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Kurulum tamamlandı."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Cihaz yönetimi"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşleştirmek için cihazın istenen passkey kodunu yazın:"</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_enter_pin_other_device" msgid="4637977124526813470">"Bu PIN\'i diğer cihazda da yazmanız gerekebilir."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"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="2796550001376088433">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşleştirmek için cihaz üzerinde <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> yazarak Return veya Enter tuşuna basın."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN veya Passkey kodu yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirilemedi"</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile iletişim kurulamıyor."</string>
     <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_connecting_error_message" msgid="229861986106185022">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> adlı cihaza bağlanılamadı."</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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Uygulama içeriği NFC ile aktarılmaya hazır"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Kapalı"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC kapalı olduğundan kullanılamıyor"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Bu özellik açık olduğunda, cihazları birbirine yakın tutarak uygulama içeriğini NFC özelliği olan başka bir cihaza ışınlayabilirsiniz. Örneğin, Tarayıcı sayfalarını, YouTube videolarını, Kayıtlı kişilerinizi ve diğer verileri ışınlayabilirsiniz."\n\n"Cihazları bir araya getirmeniz (genellikle sırt sırta) ve ekranınıza dokunmanız yeterli. Uygulama nelerin ışınlanacağını belirler."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Ağ hizmeti keşfi"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Diğer cihazlardaki uygulamaların bu cihazdaki uygulamaları keşfetmesine izin ver"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Kablosuz"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Kablosuzu aç"</string>
     <string name="wifi_settings" msgid="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_setup_wizard_title" msgid="70277346338812325">"Kablosuz seç"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ağlar taranamıyor"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Ağ bildirimi"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Açık bir ağ kullanılabilir olduğunda bana bildir"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Kötü bağlantılardan kaçın"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"İnternet bağlantısı iyi olmadıkça Kablosuz ağı kullanma"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Uyku durumunda Kablosuz bağlantıyı açık tut"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Kötü bağlantılardan kaçın"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"İnternet bağlantısı iyi olmadıkça Kablosuz ağı kullanma"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Uykudayken Kablosuz bağlantıyı açık tut"</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_wps_pbc" msgid="2668564692207863017">"WPS Düğmesi"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Girişi"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Kablosuz Doğrudan Bağlantı"</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_empty_list_wifi_on" msgid="3354911729026237372">"Kablosuz ağlar aranıyor…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Diğer ağ…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Diğer"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Otomatik kurulum (WPS)"</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="8242979682530043184">"Erişim noktasının PIN\'ini yazın"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS kurulumu"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Erişim noktasında <xliff:g id="WPS_PIN">%1$s</xliff:g> PIN\'ini yazın"</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_wps_setup_title" msgid="6034518116333042484">"Kablosuz Korumalı Kurulum"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS başlatılıyor…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Yönlendiricinizdeki Kablosuz Korumalı Kurulum düğmesine basın. \"WPS\" yazıyor olabilir veya bu simgeyi taşıyabilir:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Kablosuz yönlendiricinizde <xliff:g id="NUMBER">%1$s</xliff:g> pin kodunu girin. Kurulum işleminin tamamlanması iki dakika kadar sürebilir."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS başarılı oldu. Ağa bağlanılıyor…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlanıldı"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS kurulumu zaten devam ediyor ve tamamlanması iki dakika kadar sürebilir"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS başarısız oldu. Lütfen birkaç dakika içinde tekrar deneyin."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Kablosuz yönlendirici güvenlik ayarı (WEP) desteklenmiyor"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Kablosuz yönlendirici güvenlik ayarı (TKIP) desteklenmiyor"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Kimlik doğrulama başarısız oldu. Lütfen tekrar deneyin."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Başka bir WPS oturumu saptandı. Lütfen birkaç dakika sonra 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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Kötü İnternet bağlantısından kaçınıldı"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Zayıf bağlantı nedeniyle ağ kullanılmadı. Ayarlar &gt; Kablosuz ekranı, Gelişmiş menü öğesi ile bu davranışı kapatın."</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_wps_available_first_item" msgid="3538912605343585226">"Korumalı ağ kullanılabilir"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (korumalı ağ kullanılabilir)"</string>
+    <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS kullanılabilir"</string>
+    <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS kullanılabilir)"</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_failed_connect_message" msgid="8491902558970292871">"Ağa bağlanılamadı"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Ağ unutulamadı"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Kaydet"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Ağ kaydedilemedi"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"İptal"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Başka bir Kablosuz korumalı oturumu saptandı. Birkaç dk sonra tekr 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Geçit"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Ağ önek uzunluğu"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Kablosuz doğrudan bağlantı"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Eşler arası bağlantı kurulumu"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Kablosuz Doğrudan Bağlantı"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Cihaz bilgileri"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Kablosuz korumalı kurulumu"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"PIN\'i yazın"</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_remove_group" msgid="4844634506540667517">"Grubu kaldır"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Gelişmiş"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Kullanılabilir cihazlar"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Cihaz ara"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Aranıyor…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Cihazı yeniden adlandır"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Cihazları eşle"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Bağlantı kurulamadı."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Cihaz yeniden adlandırılamadı."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Bağlantı kesilsin mi?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Bağlantıyı keserseniz,  <xliff:g id="PEER_NAME">%1$s</xliff:g> ile olan bağlantınız sonlandırılır."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Bağlantıyı keserseniz,  <xliff:g id="PEER_NAME">%1$s</xliff:g> ve diğer <xliff:g id="PEER_COUNT">%2$s</xliff:g> cihazla bağlantınız sonlandırılır."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Davetiye iptal edilsin mi?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> cihazına bağlanma davetiyesini iptal etmek istiyor musunuz?"</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_configure_ap_text" msgid="3474995108398156258">"Kablosuz ortak erişim noktası yapılandır"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Kablosuz hotspot kurulumu yap"</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="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Sessiz mod"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ses Düzeyleri"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Müzik efektleri"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Zil sesi düzeyi"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Sessizken titret"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Titreşim ve zil sesi"</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="incoming_call_volume_title" msgid="8073714801365904099">"Zil sesi"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Zil sesi ve bildirimleri kapat"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Müzik ve diğer medyaların sesini kapat"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Bildirimlerin sesini kapat"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Alarmları kapat"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Çalarken titret"</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>
@@ -623,14 +651,15 @@
     <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" product="tablet" msgid="9015625921245904495">"Yuva sesinin kurulumunu yapmadan önce tableti yuvaya takmalısınız."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Yuva sesinin kurulumunu yapmadan önce telefonu yuvaya takmalısınız."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Yuva sesini ayarlamadan önce tableti yuvaya takmanız gerekir."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Yuva sesini ayarlamadan önce telefonu yuvaya takmanız gerekir."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Yuvaya yerleştirme sesi"</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>
+    <!-- no translation found for account_settings (6403589284618783461) -->
+    <skip />
     <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="7965901687241669598">"Ekran"</string>
@@ -702,7 +731,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Telefon numaram"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MİN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"PRL Sürümü"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"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="2234954758550554549">"Fabrika verilerine sıfırlamayı onaylamak için kilit açma deseninizi çizmelisiniz."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Fabrika verilerine sıfırlamayı onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Sistem Temizleme hizmeti kullanılamadığından sıfırlama yapılmadı."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Sıfırlansın mı?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB depolama birimini sil"</string>
@@ -838,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD kart silinsin mi? Burada saklanan tüm dosyalar silinir. Geri alınamaz!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Her şeyi sil"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Kilit açma deseninizi çizin"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"USB depolama birimini biçimlendirmek istediğinizi onaylamak için kilit açma deseninizi çizmelisiniz."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"USB depolama birimini silmek istediğinizi onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"SD kartı silmek istediğinizi onaylamak için kilit açma deseninizi çizmeniz gerekir."</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="6688416425801386511">"USB internet paylaşımı"</string>
@@ -870,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mobil ağlar"</string>
     <string name="location_title" msgid="1029961368397484576">"Konumum"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google\'ın konum hizmeti"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Uygulamalar yaklaşık konumumu belirlemek için Kablosuz ve mobil ağlar gibi kaynaklardan gelen verileri kullansın"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Anonim konum verilerinin Google\'a gönderilmesine izin ver. Ayrıca, izin verilen uygulamaların da yaklaşık konumunuzu belirlemek üzere Kablosuz ve mobil ağlar gibi kaynaklardan gelen verileri kullanmalarına izin ver."</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>
@@ -915,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Yardım için Menü\'ye basın."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Bittiğinde parmağınızı kaldırın."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"En az <xliff:g id="NUMBER">%d</xliff:g> noktayı birleştirin. Yeniden deneyin:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Desen kaydedildi!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Desen kaydedildi."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Doğrulamak için deseni yeniden çiz:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Yeni kilit açma deseniniz:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Onayla"</string>
@@ -937,7 +966,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"İleri"</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="1075370160667458122">"Kişisel bir kilit açma deseni oluşturarak tabletinizi yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmağınızı kaydırarak 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="tablet" msgid="8616353869251700776">"Kişisel bir kilit açma deseni oluşturarak tabletinizi yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmağınızı kaydırarak noktaları istediğiniz sırada birleştirin. En az dört noktayı birleştirmeniz gereklidir. "\n\n"Başlamaya hazır mısınız? İleri\'ye dokunun."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Kendinize özel bir ekran kilidi açma deseni oluşturarak telefonunuzu yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmağı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="7041951105633616745">"Uygulamaları yönet"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Yüklü uygulamaları yönet ve kaldır"</string>
@@ -945,7 +974,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Uygulamaları yönet, hızlı başlatma kısayolları ayarla"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Uygulama ayarları"</string>
     <string name="install_applications" msgid="4872012136210802181">"Bilinmeyen kaynaklar"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Market dışı uygulamaların yüklenmesine izin ver"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Bilinmeyen kaynaklardan uygulama yüklemeye izin ver"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"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 yalnızca kendinizin sorumlu olduğunu kabul edersiniz."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"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 yalnızca kendinizin sorumlu olduğunu kabul edersiniz."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Gelişmiş ayarlar"</string>
@@ -953,6 +982,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"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="auto_launch_label_generic" msgid="3230569852551968694">"Varsayılanlar"</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>
@@ -972,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Verileri temizle"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Güncellemeleri kaldır"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Bu uygulamayı bazı işlemler için varsayılan olarak başlatmayı seçtiniz."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Bu uygulamanın widget oluşturmasına ve oluşturulan widget\'ların verilerine erişmesine izin vermeyi 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="1616155457673106022">"Bu uygulama, ekranınıza göre tasarlanmamış olabilir; ekranınızda nasıl duracağını buradan kontrol edebilirsiniz."</string>
@@ -982,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Boyuta göre sırala"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Çalışan hizmetleri göster"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Önbllğe alınan işlm göstr"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Uygulama tercihlerini sıfırla"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Uygulama tercihleri sıfırlansın mı?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Bu işlem şunlar için tüm tercihleri sıfırlar:"\n\n" "<li>"Devre dışı uygulamalar"</li>\n" "<li>"Devre dışı uygulama bildirimleri"</li>\n" "<li>"İşlemler için varsayılan uygulamalar"</li>\n" "<li>"Uygulamalar için arka plan sınırlandırmaları"</li>\n\n" Hiçbir uygulama verisi kaybolmaz."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Uygulamaları sıfırla"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Alanı yönet"</string>
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtre seçeneklerini belirleyin"</string>
@@ -1010,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Bu uygulama tabletinizde şunlara erişebilir:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Bu uygulama telefonunuzda şunlara 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="invalid_size_value" msgid="7563537715280712285">"Paket boyutu hesaplanamadı."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Yüklü üçüncü taraf uygulamanı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>
@@ -1032,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Yeni uygulamalar için tercih edilen yükleme konumunu değiştir"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Yerleşik uygulama devre dışı bırakılsın mı?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Yerleşik bir uygulamayı devre dışı bırakırsanız bu, diğer uygulamaların hatalı davranmasına neden olabilir. Emin misiniz?"</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Bildirimler kapatılsın mı?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Bu uygulama için bildirimleri kapatırsanız, önemli uyarıları ve güncellemeleri kaçırabilirsiniz."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Depolama kullanımı"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Uygulamalar tarafından kullanılan depolama alanını görüntüle"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Çalışan hizmetler"</string>
@@ -1084,19 +1121,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Bu giriş yöntemi, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil olmak üzere yazdığınız tüm metni toplayabilir. Yöntem, <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> uygulamasından gelmektedir. Bu giriş yöntemini kullanmak istiyor musunuz?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Bu yazım denetleyici, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil olmak üzere yazdığınız tüm metni toplayabilir. Yazım denetleyici, <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> uygulamasından gelmektedir. Bu yazım denetleyiciyi kullanmak istiyor musunuz?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Ayarlar"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Dil"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> ayarları açılamadı"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Fare/dokunmatik alan"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"İşaretçi hızı"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Oyun Denetleyici"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Titreşimi kullan"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Bağlandığında titreşimi oyun denetleyiciye yönlendir."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Klavye düzenini seçin"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Klavye düzenlerini ayarla"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Değiştirmek için Ctrl-Ara Çubuğu\'na basın"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Varsayılan"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klavye düzenleri"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kullanıcı sözlüğü"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kişisel sözlük"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kişisel sözlükler"</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_add_screen_title" msgid="742580720124344291">"Öbek"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Daha çok seçenek"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Daha az seçenek"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"Tamam"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Kelime:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Kısayol:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Dil:"</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="8165273379942105271">"Kullanıcı sözlüğünde hiç kelimeniz yok. Ekle (+) düğmesini kullanarak kelime ekleyin."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Tüm diller"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Tüm diller için"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Diğer diller…"</string>
     <string name="testing" msgid="6584352735303604146">"Test ediliyor"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet bilgileri"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefon bilgileri"</string>
@@ -1133,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"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>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Geliştirme cihaz kimliği"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Cihaz bilgisi yok"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Uyanık kal"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Şarj edilirken ekran hiçbir zaman uykuya geçmez"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB hata ayıklamasına izin verilsin mi?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB hata ayıklaması yalnızca geliştirme amaçlıdır. Verileri bilgisayarınızla cihazınız arasında kopyalamak, bildirim göndermeksizin uygulamaları cihazınıza yüklemek ve günlük verilerini okumak için kullanın."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Geliştirme amaçlı ayarlara izin verilsin mi?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Bu ayarlar yalnızca geliştirme amaçlıdır. Cihazınızın veya cihazdaki uygulamaların bozulmasına veya hatalı çalışmasına neden olabilir."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB depolama birimini koru"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Uygulamalar USB depolama birimini okumak için izin istemelidir"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB depolama birimi korunsun mu?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB depolama birimi korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir."\n\n"Bazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD kartı koru"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Uygulamalar SD kartı okumak için izin istemelidir"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD kart korunsun mu?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD kart korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir."\n\n"Bazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget seç"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget seç"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget\'ı oluşturup erişime izin vermek istiyor musunuz?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Widget\'ı oluşturmanızdan sonra, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>, widget\'ın görüntülediği tüm verilere erişebilir."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> uygulamasına her zaman widget oluşturma ve verilerine erişme izni ver"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>g <xliff:g id="HOURS">%2$d</xliff:g>s <xliff:g id="MINUTES">%3$d</xliff:g>d <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>s <xliff:g id="MINUTES">%2$d</xliff:g>d <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>d <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
@@ -1160,12 +1227,9 @@
     <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_speak_password_title" msgid="3344423945644925355">"Şifreleri sesli olarak oku"</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="3264723681038625967">"Web komut dosyalarını yükle"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Web erişilebilirliğini artır"</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>
@@ -1180,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hiçbir hizmet yüklenmedi"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Ekran okuyucusuna ihtiyacınız var mı?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack, görme engelli veya az gören kullanıcılara yardımcı olmak için sesli geri bildirim sağlar. Bu uygulamayı Android Market\'ten ücretsiz olarak yüklemek ister misiniz?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Web komut dosyaları yüklensin mi?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Uygulamaların Google\'dan web içeriklerini daha erişilebilir hale getirecek komut dosyaları yüklemesini istiyor musunuz?"</string>
-    <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="1072730037861494125">"Hiçbir açıklama sağlanmadı."</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_not_available" msgid="3214000535532434353">"Pil kullanım verisi yok."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1280,12 +1342,12 @@
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Dil"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Dil tanımlı sesi, konuşulan metin için ayarlar"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Bir örnek dinleyin"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Konuşma sentezinin kısa bir sunumunu yürüt"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Konuşma sentezinin kısa bir sunumunu çal"</string>
     <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_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" msgid="3305141107104670703">"Seçtiğiniz motor çalışmıyor."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Yapılandır"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Başka bir motor seç"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Bu konuşma sentezi motoru, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil konuşulan tüm metni toplayabilir. <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> motorundan gelmektedir. Bu konuşma sentezi motorunun kullanımı etkinleştirilsin mi?"</string>
@@ -1301,7 +1363,7 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Bayan"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Kullanmadan önce yeni motoru etkinleştirin."</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>
@@ -1318,6 +1380,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Kilit açma deseninizi çizin"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kimlik bilgisi yüklemesini onaylamak için kilit açma desenini çizmeniz gerekiyor."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Kimlik bilgileri deposu için şifreyi yazın."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Geçerli şifre:"</string>
@@ -1329,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Kimlik bilgileri deposu silindi."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Kimlik bilgileri deposu silinemedi."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Kimlik bilgileri deposu etkin."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Kimlik bilgileri depolamasını kullanabilmek için önce ekran PIN\'i veya şifre ayarlamalısınız."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kimlik bilgileri depolamasını kullanabilmek için öncelikle bir ekran PIN\'i veya şifre ayarlamanız gerekir."</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="5446972770562918934">"Yedekle ve sıfırla"</string>
@@ -1343,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Otomatik geri yükle"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Bir uygulamayı yeniden yüklendiğinde, yedeklenen ayarları ve diğer verileri 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="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"Masaüstü tam yedeklemeleri şu an korunmuyor"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Masaüstü tam yedeklemelerinin şifresini değiştirmek veya kaldırmak için dokunun"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Kablosuz şifrelerinizin, yer işaretlerinizin, diğer ayarlarınızın ve uygulama verilerinizin yedeklenmesi iptal edilip, Google sunucularındaki tüm kopyaları silinsin mi?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Aygıt yönetimi ayarları"</string>
@@ -1359,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Sistem"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Çağrı zil sesi ve titreşim"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"<xliff:g id="NETWORK_NAME">%s</xliff:g> kablosuz ağına bağlanıyor..."</string>
@@ -1393,7 +1457,10 @@
     <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_failed" msgid="1696499856374109647">"Senkronizasyon başarısız oldu"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Senkronizasyon etkin"</string>
+    <!-- no translation found for account_sync_settings_title (5131314922423053588) -->
+    <skip />
     <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="background_data" msgid="5779592891375473817">"Arka plan veri"</string>
@@ -1404,6 +1471,10 @@
     <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>
+    <!-- no translation found for last_synced (4242919465367022234) -->
+    <skip />
+    <!-- no translation found for sync_in_progress (5151314196536070569) -->
+    <skip />
     <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>
@@ -1413,7 +1484,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google Sync\'e hoş geldiniz!"</font>\n"Google\'ın, kişilerinize, randevularınıza ve diğer bilgilerinize istediğiniz yerden erişebilmenize olanak vermek için verileri senkronizasyon yaklaşımıdır."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"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>
@@ -1427,7 +1498,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Bu hesap, bazı uygulamalar için gereklidir. Hesabı ancak Ayarlar &gt; Yedek &amp; sıfırlama içinden tableti varsayılan fabrika ayarlarına geri döndürerek kaldırabilirsiniz (tüm kişisel verileriniz silinir)."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Bu hesap, bazı uygulamalar için gereklidir. Hesabı ancak Ayarlar &gt; Yedek &amp; sıfırlama içinden telefonu varsayılan fabrika ayarlarına geri döndürerek kaldırabilirsiniz (tüm kişisel verileriniz silinir)."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"El ile senkronize edilemez"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Bu öğe için senkronizasyon şu anda devre dışı bırakılmış durumdadır. Bu ayarı değiştirmek için geçici olarak arka plan verilerini ve otomatik senkronizasyonu açın."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G ayarları"</string>
@@ -1435,7 +1507,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresi"</string>
     <string name="enter_password" msgid="4131758584074246224">"Depolamanın şifresini çözmek için şifre yazın"</string>
     <string name="try_again" msgid="4272075051293936921">"Tekrar deneyin."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Hizmet meşgul. Tekrar deneyin."</string>
     <string name="delete" msgid="4219243412325163003">"Sil"</string>
     <string name="misc_files" msgid="6720680815969643497">"Ç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>
@@ -1443,21 +1514,46 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Hata ayıklama"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Hata ayıklama uygulamasını seçin"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Hata ayıklama uygulaması ayarlanmadı"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Hata ayıklama uygulaması: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Uygulama seçin"</string>
+    <string name="no_application" msgid="2813387563129153880">"Hiçbiri"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Hata ayıklayıcıyı bekle"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Hata ayıklanan uyg. çalıştırılmadan önce hata ayıklayıcının eklenmesini bekliyor"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Girdi"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Çizim"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"İzleme"</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>
     <string name="show_touches" msgid="1356420386500834339">"Dokunmaları göster"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Dokunmalarda görsel geri bildirim göster"</string>
-    <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_screen_updates" msgid="5470814345876056420">"Yüzey güncellemelerini göster"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Güncelleme sırasında tüm pencere yüzeylerini çiz"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU görünüm güncellemelerini göster"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU ile çizim yapılırken pencerelerdeki görünümleri çiz"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"HW katmanlarını devre dışı bırak"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Ekran oluştururken her zaman GPU\'yu kullan"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"İzleri etkinleştir"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Etkin izleri seç"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Şu anda hiçbir iz etkin değil"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Şu anda <xliff:g id="NUM">%1$d</xliff:g> iz etkin"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Tüm izler şu anda etkin"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Düzen sınırlarını göster"</string>
+    <!-- no translation found for debug_layout_summary (2001775315258637682) -->
+    <skip />
     <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="force_hw_ui" msgid="6426383462520888732">"GPU oluşturmayı zorla"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Uygulamalarda 2D donanım hızlandırmayı kullan"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"2D çizimde GPU kullanımını zorla"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Profil GPU oluşturma"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Oluştr süresn adb shell dumpsys gfxinfo içinde ölç"</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="animator_duration_scale_title" msgid="3406722410819934083">"Animatör süre ölçeği"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"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>
@@ -1471,13 +1567,15 @@
     <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_menu_metered" msgid="5056695223222541863">"Mobil hotspot\'lar"</string>
+    <!-- no translation found for data_usage_menu_auto_sync (8203999775948778560) -->
+    <skip />
     <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="8621855507876539282">"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_disclaimer" product="tablet" msgid="2591250607795265503">"Tabletinizin ölçümüdür. Operatörünüzün veri kullanım hesabı farklı olabilir."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Telefonunuzun ölçümüdür. Operatörünüzün veri kullanım hesabı farklı olabilir."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"kısıtlanmış"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Mobil veriler devre dışı bırakılsın mı?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Mobil veri limitini ayarla"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G veri limitini ayarla"</string>
@@ -1488,33 +1586,50 @@
     <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_list_mobile" msgid="5588685410495019866">"Mobil"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"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="8430240158135453271">"Uygulama ayarlarını görüntüle"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Arka plan verileri sınırla"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Arka plan verilerini yalnızca mobil veri ağlarında devre dışı bırak. Uygun olursa Kablosuz kullanılır."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Mobil ağlarda arka plan verilerini devre dışı bırak. Varsa mobil olmayan ağlar kullanılır."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Bu uygulama için arka plan verilerini sınırlamak üzere önce bir mobil veri sınırı belirleyin."</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="5651588785118290771">"Bu özellik, arka plan verilerini kullanan bir uygulamanın Kablosuz bağlantı olmadığında durmasına neden olabilir."\n\n"Uygulamanın içindeki ayarlarda daha uygun veri kullanım denetimleri bulabilirsiniz."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Bu özellik, arka plan verilere dayanan bir uygulamanın, yalnızca mobil ağlar mevcut olması durumunda çalışmayı durdurmasına neden olabilir."\n\n"Daha uygun veri kullanım denetimlerini uygulamanın içindeki ayarlarda bulabilirsiniz."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Arka plan verilerini sınırlama özelliği, yalnızca mobil ağ veri sınırı ayarladığınızda kullanılabilir."</string>
+    <!-- no translation found for data_usage_auto_sync_on_dialog_title (2438617846762244389) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (7312283529426636845) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_on_dialog (2374996799819303283) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog_title (9013139130490125793) -->
+    <skip />
+    <!-- no translation found for data_usage_auto_sync_off_dialog (4744145757533455623) -->
+    <skip />
     <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_warning_editor_title" msgid="3704136912240060339">"Veri kullanım uyarısını ayarla"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Veri kullanım limitini 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" product="tablet" msgid="6401600837858297985">"Belirtilen limite ulaşıldığında <xliff:g id="NETWORKS">%1$s</xliff:g> veri bağlantınız kesilecektir."\n\n"Veri kullanımı tabletiniz tarafından ölçülür ve operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Belirtilen limite ulaşıldığında <xliff:g id="NETWORKS">%1$s</xliff:g> veri bağlantınız kesilecektir."\n\n"Veri kullanımı telefonunuz tarafından ölçülür ve operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Belirtilen limite ulaşıldığında mobil veri bağlantınız kesilecektir."\n\n"Veri kullanımı tabletiniz tarafından ölçüldüğünden operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Belirtilen limite ulaşıldığında mobil veri bağlantınız kesilecektir."\n\n"Veri kullanımı telefonunuz tarafından ölçüldüğünden operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</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="6387252645350792955">"Arka plan mobil verilerini kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: yaklaşık <xliff:g id="TOTAL">%1$s</xliff:g> kullanıldı"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: yaklaşık <xliff:g id="TOTAL">%1$s</xliff:g> kullanıldı."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: yaklaşık <xliff:g id="TOTAL">%1$s</xliff:g> kullanıldı (tabletinizin ölçümü). Operatörünüzün veri kullanımı hesaplaması farklı olabilir."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: yaklaşık <xliff:g id="TOTAL">%1$s</xliff:g> kullanıldı (telefonunuzun ölçümü). Operatörünüzün veri kullanımı hesaplaması farklı olabilir."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobil hotspot\'lar"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Mobil hotspot olan Kablosuz ağları seçin. Arka planda çalışırken uygulamaların bu ağları kullanmaları kısıtlanabilir. Uygulamalar ayrıca yüksek hacimli indirme işlemleri için bu ağları kullanmadan önce kullanıcıyı uyarabilir."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobil ağlar"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Kablosuz ağlar"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Mobil hotspot\'ları seçmek için Kablosuz\'u açın."</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>
@@ -1540,12 +1655,14 @@
     <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_edit" msgid="8647191407179996943">"VPN profilini düzenle"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> profiline 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="vpn_create" msgid="5628219087569761496">"VPN profili ekle"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Profili düzenle"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Profili sil"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Ağ bağlantısı yok. Lütfen daha sonra tekrar deneyin."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Bir sertifika eksik. Lütfen profili düzenleyin."</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>
@@ -1554,25 +1671,7 @@
     <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="477937585801538951">"\"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="3973201880357468747">"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="8764686624055084454">"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="3055831259260848004">"Eğiticiyi tamamladınız. Çıkmak için, <xliff:g id="FINISH">%s</xliff:g> düğmesini bulup dokunun."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Yazım düzeltme"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Yazım denetleyici"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Buraya, mevcut tam yedekleme şifrenizi yazın"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Buraya, tam yedeklemeler için yeni bir şifre yazın"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Buraya mevcut tam yedekleme şifrenizi yeniden yazın"</string>
@@ -1580,4 +1679,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"İptal"</string>
     <string name="percentage" msgid="5866131581207788624">"%%<xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ek sistem güncellemeleri"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Kullanıcılar ve kısıtlamalar"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Kullanıcılar"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Kullanıcı ekle"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Ayrıntıları düzenle"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Kullanıcı bilgileri"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Ad"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"İçerik kısıtlamaları"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN gerektir"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"İçerik oylama"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Sistem uygulaması"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Yüklü uygulamalar"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Sil"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Kullanıcıyı kaldır"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Yaramaz çocuk"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Kullanıcı kaldırılsın mı?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Kullanıcıyı ve onunla ilişkili tüm verileri cihazdan kaldırmak istediğinizden emin misiniz?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Bildirimleri göster"</string>
+    <string name="help_label" msgid="1107174367904110532">"Yardım"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 1e342b7..016975c 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -66,9 +66,9 @@
     <item msgid="7786168277516233536">"Дуже великий"</item>
   </string-array>
   <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Дуже пов."</item>
-    <item msgid="2361722960903353554">"Повіл."</item>
-    <item msgid="1145554631248513562">"Звич."</item>
+    <item msgid="6041212618892492920">"Дуже повільний"</item>
+    <item msgid="2361722960903353554">"Повільний"</item>
+    <item msgid="1145554631248513562">"Звичайний"</item>
     <item msgid="7553665153391107454">"Швидкий"</item>
     <item msgid="2538100882620724753">"Дуже швидко"</item>
   </string-array>
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Відключення..."</item>
     <item msgid="1634960474403853625">"Роз’єднано"</item>
     <item msgid="746097431216080650">"Помилка"</item>
+    <item msgid="6367044185730295334">"Заблоковано"</item>
+    <item msgid="503942654197908005">"Тимчасове уникнення слабкого з’єднання"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Відключення від <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Роз’єднано"</item>
     <item msgid="8578370891960825148">"Помилка"</item>
+    <item msgid="5660739516542454527">"Заблоковано"</item>
+    <item msgid="1805837518286731242">"Тимчасове уникнення слабкого з’єднання"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Кнопка Push"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Немає"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"PIN із точки доступу"</item>
-    <item msgid="7364462169350112617">"PIN із цього пристрою"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"Статичні"</item>
@@ -211,15 +211,10 @@
     <item msgid="3738430123799803530">"Знімна карта SD"</item>
     <item msgid="4498124044785815005">"Дозвольте виріш. системі"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Вимк."</item>
-    <item msgid="4804571292609523335">"Вібросигнал"</item>
-    <item msgid="595707141547423573">"Без звуку"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Короткий"</item>
-    <item msgid="2560532955514699713">"Середній"</item>
-    <item msgid="2372711992605524591">"Довгий"</item>
+    <item msgid="3511504869290423954">"Коротка"</item>
+    <item msgid="2560532955514699713">"Середня"</item>
+    <item msgid="2372711992605524591">"Довга"</item>
   </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ніколи не перевіряти"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Ступінь анімації 5x"</item>
     <item msgid="6660750935954853365">"Ступінь анімації 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Анімацію вимкнено"</item>
+    <item msgid="1138649021950863198">"Ступінь анімації 0,5x"</item>
+    <item msgid="4394388961370833040">"Ступінь анімації 1x"</item>
+    <item msgid="8125427921655194973">"Ступінь анімації 1,5x"</item>
+    <item msgid="3334024790739189573">"Ступінь анімації 2x"</item>
+    <item msgid="3170120558236848008">"Ступінь анімації 5x"</item>
+    <item msgid="1069584980746680398">"Ступінь анімації 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартне обмеження"</item>
     <item msgid="4071574792028999443">"Без фонових процесів"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3579743..ceb5dce 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Так"</string>
     <string name="no" msgid="6731231425810196216">"Ні"</string>
+    <string name="create" msgid="3578857613172647409">"Створити"</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>
@@ -111,6 +112,8 @@
     <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_device_details" msgid="4594773497930028085">"Налаштування пристрою"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Налаштування профілю"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Не встан.назви з вик. наз.обл.зап."</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Сканув. пристроїв"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Перейменувати планшетний ПК"</string>
@@ -131,13 +134,12 @@
     <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="5655704645616731277">"Торкн.для створ.пари"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Пристрої 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="1931617700075106801">"Торкніться, щоб створити пару з пристроєм <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Торкніться, щоб створити пару з пристроєм <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="device_picker" msgid="8398232791303186677">"Інструмент вибору пристрою Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запит на дозвіл Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Програма хоче ввімкнути Bluetooth. Дозволити?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Програма у вашому планшетному ПК хоче зробити його видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд. Дозволити?"</string>
@@ -155,10 +157,10 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Торкніться, щоб підключитися до пристрою \"<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_acceptance_dialog_text" msgid="6555508756987053866">"%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_12_hour_sample" msgid="3259617262618020574">"1:00 пп"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вибрати часовий пояс"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Регіональний (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Введене ім’я хосту не дійсне."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Введений список виключень має неналежний формат. Введіть розділений комами список виключених доменів."</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Треба заповнити поле порту."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Потрібно заповнити поле порту."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поле порту має бути порожнім, якщо поле хосту порожнє."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Введений порт не дійсний."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі-сервер HTTP використовується веб-переглядачем, але не може використовуватися ін. програмами."</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"Зміни поч. діяти після повтор. підключ. USB-кабелю"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Зміни почнуть діяти після повторного підключення 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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"Носій USB не підключено."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Немає карти 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="6691584887397909775">"Тепер можна вилучити носій USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Тепер можна вилучити карту SD"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB – пристр. пам’яті вел.ємн."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Карта SD використовується як пристрій пам\'яті великої ємності."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Тепер можна вилучити носій USB"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Тепер можна вилучити карту 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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB підключ. лише для читання"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Карта SD підключена лише для читання."</string>
     <string name="skip_label" msgid="47510779345218297">"Пропустити"</string>
     <string name="next_label" msgid="4693520878012668114">"Далі"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Мова"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"Якщо дозволити роумінг даних, може стягуватися значна плата за роумінг!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Дозволити роумінг даних?"</string>
     <string name="networks" msgid="6333316876545927039">"Вибір оператора"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Виберіть оператора мережі"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата та час"</string>
@@ -283,12 +285,14 @@
     <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="6951498879879281102">"Вибрати формат дати"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Покращити розпізнавання облич"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Перевірка на справжність"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Просити покліпати очима"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їхні дані, медіа-файли й інші файли. Щойно ви зашифруєте свій планшетний ПК, потрібно буде вводити цифровий PIN-код або пароль для розшифрування планшетного ПК щоразу під час його ввімкнення. Скасувати шифрування планшетного ПК можна, лише відновивши заводські налаштування, що призведе до стирання всіх даних."\n\n"Шифрування триває не менше години. Розпочинати процес шифрування треба із зарядженим акумулятором. Планшетний ПК має бути підключеним до мережі живлення, поки шифрування не закінчиться. Якщо перервати процес шифрування, ви втратите частину чи всі свої дані."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їхні дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий PIN-код або пароль для розшифрування телефону щоразу під час його ввімкнення. Скасувати шифрування телефону можна, лише відновивши заводські налаштування, що призведе до стирання всіх даних."\n\n"Шифрування триває не менше години. Розпочинати процес шифрування треба із зарядженим акумулятором. Телефон має бути підключеним до мережі живлення, поки шифрування не закінчиться. Якщо перервати процес шифрування, ви втратите частину чи всі свої дані."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій планшетний ПК, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування планшетного ПК щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Планшетний ПК має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий 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="2029407131227814893">"Зарядіть акумулятор і повторіть спробу."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Підключіть зарядний пристрій і повторіть спробу."</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_dialog_need_password_message" msgid="4071395977297369642">"Щоб почати шифрування, потрібно встановити PIN-код або пароль для блокування екрана."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Зашифрувати?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Операція шифрування незворотна. Якщо її перервати, ви втратите дані. Шифрування триває не менше години, протягом чого ваш планшетний ПК перезавантажиться декілька разів."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Операція шифрування незворотна. Якщо її перервати, ви втратите дані. Шифрування триває не менше години, протягом чого ваш телефон перезавантажиться декілька разів."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифрування"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Зачекайте, поки ваш планшетний ПК зашифрується. Виконано: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Зачекайте, поки ваш телефон зашифрується. Виконано <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="2223340178473871064">"Введіть пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрування не виконано"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на планшетному ПК більше не доступні. "\n\n"Щоб знову користуватися планшетним ПК, потрібно відновити заводські налаштування. Налаштовуючи планшетний ПК після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на телефоні більше не доступні. "\n\n"Щоб знову користуватися телефоном, потрібно відновити заводські налаштування. Налаштовуючи телефон після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Вибрати тип блок. екр."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на планшетному ПК більше не доступні. "\n\n"Щоб знову користуватися планшетним ПК, потрібно відновити заводські налаштування. Налаштовуючи планшетний ПК після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на телефоні більше не доступні. "\n\n"Щоб знову користуватися телефоном, потрібно відновити заводські налаштування. Налаштовуючи телефон після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Переключити метод введення"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Тип блокув. екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Вибер. резерв. блокув."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокування екрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змінити блокув. екрана"</string>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"Фейсконтроль"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Ключ"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-код"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Пароль"</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>
@@ -362,44 +367,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Максимальна кількість символів у паролі: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"Максимальна кількість цифр у PIN-коді: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN-код має містити лише цифри 0–9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Адміністратор пристрою не дозволяє використовувати останній PIN-код."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Пароль містить заборонений символ."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Пароль має містити принаймні одну букву."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Пароль має містити принаймні одну цифру."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"Пароль має містити принаймні один символ."</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"Пароль має містити принаймні 1 літеру"</item>
-    <item quantity="other" msgid="7278096339907683541">"Пароль має міст. принаймні стільки літер: %d"</item>
+    <item quantity="one" msgid="3063853802158131458">"Пароль має містити принаймні 1 літеру."</item>
+    <item quantity="other" msgid="8186027808415585970">"Пароль має містити принаймні стільки літер: %d."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"Пароль має містити принаймні 1 малу літеру"</item>
-    <item quantity="other" msgid="588499075580432178">"Пароль має містити принаймні стільки малих літер: %d"</item>
+    <item quantity="one" msgid="5583986519662091001">"Пароль має містити принаймні 1 малу літеру."</item>
+    <item quantity="other" msgid="2693910942679679225">"Пароль має містити принаймні стільки малих літер: %d."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"Пароль має містити принаймні 1 велику літеру"</item>
-    <item quantity="other" msgid="2183090598541826806">"Пароль має містити принаймні стільки великих літер: %d"</item>
+    <item quantity="one" msgid="2611909966725502768">"Пароль має містити принаймні 1 велику літеру."</item>
+    <item quantity="other" msgid="3030801209112209245">"Пароль має містити принаймні стільки великих літер: %d."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"Пароль має містити принаймні 1 цифру"</item>
-    <item quantity="other" msgid="995673409754935278">"Пароль має містити принаймні стільки цифр: %d"</item>
+    <item quantity="one" msgid="3820355568839621231">"Пароль має містити принаймні 1 цифру."</item>
+    <item quantity="other" msgid="4703982391407595924">"Пароль має містити принаймні стільки цифр: %d."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"Пароль має містити принаймні 1 спеціальний символ"</item>
-    <item quantity="other" msgid="3047460862484105274">"Пароль має містити принаймні стільки спец. симв.: %d"</item>
+    <item quantity="one" msgid="8456579939292408631">"Пароль має містити принаймні 1 спеціальний символ."</item>
+    <item quantity="other" msgid="1221290525051187757">"Пароль має містити принаймні стільки спеціальних символів: %d."</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"Пароль має містити принаймні 1 небуквений символ"</item>
-    <item quantity="other" msgid="5574191164708145973">"Пароль має міст. принаймні стільки небуквених символів: %d"</item>
+    <item quantity="one" msgid="4594051152085925921">"Пароль має містити принаймні 1 небуквений символ."</item>
+    <item quantity="other" msgid="3952508584649046404">"Пароль має містити принаймні стільки небуквених символів: %d."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Адміністратор пристрою не дозволяє викор. останній пароль"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"Адміністратор пристрою не дозволяє використовувати останній пароль."</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="lock_setup" msgid="1759001157415978959">"Налаштування завершено"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Налаштування завершено."</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>
@@ -409,12 +414,12 @@
     <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="5698297871117529185">"Щоб створити пару з пристроєм: <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Введіть потрібний PIN-код пристрою:"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Для підключення до пристрою <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> введіть потрібний PIN-код:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Щоб створити пару з пристроєм: <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Введіть потрібний ключ доступу пристрою:"</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_enter_pin_other_device" msgid="4637977124526813470">"Також потрібно ввести цей PIN-код на іншому пристрої."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Також потрібно ввести цей ключ доступу на іншому пристрої."</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="2796550001376088433">"Щоб створити пару з пристроєм: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Введіть на ньому: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, а потім натисніть \"Повернутися\" або \"Ввійти\"."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Не вдалося створити пару з пристроєм <xliff:g id="DEVICE_NAME">%1$s</xliff:g> через неправильний PIN-код чи ключ доступу."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Неможливо зв’язатися з пристроєм <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_connecting_error_message" msgid="229861986106185022">"Не вдалося з’єднатися з пристроєм <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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Дозволити обмін даними, коли телефон торкнеться іншого пристрою"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дозволити обмін даними, коли планшетний ПК торкнеться іншого пристрою"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дозволити обмін даними, коли телефон торкнеться іншого пристрою"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Вміст програми готовий до передачі через NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Вимк."</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно, оскільки NFC вимкнено"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Якщо цю функцію ввімкнено, можна передавати вміст програми на інший пристрій, що підтримує технологію NFC, розташувавши пристрої один біля одного. Наприклад, можна передавати сторінки веб-переглядача, відео YouTube, контакти з розділу \"Люди\" тощо."\n\n"Просто розташуйте пристрої один біля одного (зазвичай тильними сторонами) і торкніться свого екрана. Програма визначить, що потрібно передати."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Виявлення мережевої служби"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Дозволити програмам на інших пристроях виявляти програми на цьому пристрої"</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="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_setup_wizard_title" msgid="70277346338812325">"Вибрати Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Неможливо здійснити сканування мереж"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Сповіщення мережі"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Сповіщати мене про доступність відкритої мережі"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Уникнення слабких з’єднань"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Не використовувати мережу Wi-Fi, якщо немає стійкого з’єднання з Інтернетом"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Уникати слабких з’єднань"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Не використовувати мережу Wi-Fi, якщо немає стійкого з’єднання з Інтернетом"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Не від’єднуватися від мережі WiFi у режимі сну"</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_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Введення PIN-коду WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"Пошук мереж Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Інша мережа…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Більше"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Авто-налаштування (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показати розширені параметри"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"Введіть PIN-код із точки доступу"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Налаштування WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Введіть 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_wps_setup_title" msgid="6034518116333042484">"Налаштування захищеної мережі Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запуск WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Натисніть кнопку \"Налаштування захищеної мережі Wi-Fi\" на маршрутизаторі. Вона може називатися \"WPS\" або містити такий символ:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Введіть PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> на своєму маршрутизаторі Wi-Fi. Налаштування може тривати не більше двох хвилин."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS запущено. Під’єднання до мережі..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"З’єднано з мережею Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Налаштування WPS уже виконується, для його завершення потрібно не більше двох хвилин."</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Помилка WPS. Повторіть спробу через декілька хвилин."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Налаштування безпеки бездротового маршрутизатора (WEP) не підтримується"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Налаштування безпеки бездротового маршрутизатора (TKIP) не підтримується"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Помилка автентифікації. Повторіть спробу."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Виявлено ще один сеанс WPS. Повторіть спробу через декілька хвилин."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID мережі"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безпека"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Сила сигналу:"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Збережено"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Вимкнено"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Слабке з’єднання з Інтернетом не встановлено"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Не підключено до мережі через слабке з’єднання. Цю поведінку можна вимкнути в меню \"Розширені\" на екрані Налаштування &gt; Wi-Fi."</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="3538912605343585226">"Захищена мережа доступна"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (захищена мережа доступна)"</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_failed_connect_message" msgid="8491902558970292871">"Помилка під’єднання до мережі."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Видалити"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Помилка видалення мережі"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Зберег."</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Помилка збереження мережі"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Скасувати"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Виявлено інший захищений сеанс Wi-Fi. Повторіть спробу за кілька хвилин."</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Довжина префіксу мережі"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Установити однорангове з’єднання"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Інформація про пристрій"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Налаштування, захищене мережею Wi-Fi"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Введіть 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_remove_group" msgid="4844634506540667517">"Видалити групу"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Розширені"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Доступні пристрої"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Пошук пристроїв"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Пошук…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Перейменувати пристрій"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Однорангові пристрої"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Неможливо з\'єднатися."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Не вдалося перейменувати пристрій."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Від’єднатися?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Якщо від’єднатися, це призведе до роз’єднання з пристроєм <xliff:g id="PEER_NAME">%1$s</xliff:g>."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Якщо від’єднатися, це призведе до роз’єднання з пристроєм <xliff:g id="PEER_NAME">%1$s</xliff:g> і ще з <xliff:g id="PEER_COUNT">%2$s</xliff:g>."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Скасувати запрошення?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Скасувати запрошення під’єднатися до пристрою <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</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_ap_text" msgid="61237027772641155">"Налаштувати точку доступу 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="display_settings_title" msgid="1708697328627382561">"Відображ."</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Беззвуч. режим"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодія телефону"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Гучність"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Музичні ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Гучність дзвінка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вібр. в беззвуч. реж."</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Вібросигнал і дзвінок"</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>
@@ -605,7 +628,7 @@
     <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="8533399267725365088">"Тон під час дотику номеронабирача"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Вимкнути звук сигналу дзвінка та сповіщень"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Вимкнути звук музичних та інших медіа-файлів"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Вимкнути звук сповіщень"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Вимкнути звук сповіщень"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вібрувати під час дзвінка"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"Для налаштування звуку док-станції потрібно вставити в неї планшетний ПК."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Для налаштування звуку док-станції потрібно вставити в неї телефон."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Для налаштування звуку док-станції потрібно вставити в неї планшетний ПК."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Для налаштування звуку док-станції потрібно вставити в неї телефон."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Звук вставлення в док-станцію"</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="account_settings" msgid="6403589284618783461">"Облікові записи"</string>
     <string name="search_settings" msgid="1910951467596035063">"Пошук"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Керуйте налаштув. пошуку та історією"</string>
     <string name="display_settings" msgid="7965901687241669598">"Екран"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"Версія 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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Стерти всю особисту інформацію та завантажені програми? Цю дію не можна скасувати!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Видалити все"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Намалюйте ключ розблок-ня"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Щоб підтвердити відновл. завод. налашт-нь, треба намал. ключ розблок."</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Щоб підтвердити відновлення заводських налаштувань, потрібно намалювати ключ розблокування."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Скидання не виконано, оскільки служба очищення системи не доступна."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Скинути?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Очистити носій USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Стерти карту 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="nosdcard" msgid="2192044794228379224">"Щоб підтвердити очищення носія USB, треба намалювати ключ розблокування."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Щоб підтвердити очищення карти 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="6688416425801386511">"Прив\'язка USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Мобільні мережі"</string>
     <string name="location_title" msgid="1029961368397484576">"Моє місцезнах."</string>
     <string name="location_network_based" msgid="5569673665032992664">"Служба визнач. місцезн. Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Дозволяє програмам використовувати дані з таких джерел, як мережі Wi-Fi і мобільні мережі, щоб визначати ваше приблизне місцезнах."</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Дозволити надсил. анонімні дані про місцезн. в Google. Дозволити програмам викор. дані з моб. мереж і 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>
@@ -906,7 +934,7 @@
     <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>
+    <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>
@@ -915,12 +943,12 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Для допом. натис. меню."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"По заверш. відпуст. палець."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Підключ. принаймні <xliff:g id="NUMBER">%d</xliff:g> точок. Спроб. ще:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Ключ записано!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Ключ записано."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Ще раз намал. ключ для підтвердж:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Ваш новий ключ розблокув.:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Підтверд."</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Перемал."</string>
-    <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Повтор."</string>
+    <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Повтор"</string>
     <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>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Далі"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Захист вашого пристрою"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Захист вашого телефону"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Захистіть свій планшетний ПК від несанкціонованого використання, створивши особистий ключ розблокування екрана. На наступному крані пальцем з’єднайте крапки в будь-якому порядку. Потрібно з’єднати принаймні чотири крапки. "\n\n"Готові? Торкніться опції \"Далі\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Захистіть свій планшетний ПК від несанкціонованого використання, створивши особистий ключ розблокування екрана. На наступному екрані пальцем з’єднайте крапки в будь-якому порядку. Потрібно з’єднати принаймні чотири крапки. "\n\n"Готові? Торкніться опції \"Далі\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Захистіть свій телефон від несанкціонованого використання, створивши особистий ключ розблокування екрана. На наступному екрані пальцем з’єднайте принаймні чотири крапки в будь-якому порядку. "\n\n"Готові? Торкніться опції \"Далі\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Керувати програмами"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Керувати встановленими програмами та видаляти їх"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Керування програмами, налаштування клавіш швидкого запуску"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Налаштування програми"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невідомі джерела"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Дозволити встановлення програм не з Android Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Дозволити встановлення програм з невідомих джерел"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Ваш планшетний ПК і особисті дані більш уразливі до атак із боку програм із невідомих джерел. Ви погоджуєтеся з тим, що несете особисту відповідальність за будь-яку заподіяну вашому планшетному ПК шкоду чи втрату даних унаслідок використання таких програм."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ваш телефон і особисті дані більш уразливі до атак із боку програм із невідомих джерел. Ви погоджуєтеся з тим, що несете особисту відповідальність за будь-яку заподіяну вашому телефону шкоду чи втрату даних унаслідок використання таких програм."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Розширені налаштування"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Інформація про програму"</string>
     <string name="storage_label" msgid="8700867073480107253">"Пам\'ять"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Запускати за умовч."</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"За умовчанням"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Сумісність екрана"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Дозволи"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кеш"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Очистити дані"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Видалити оновлення"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Ви вибрали запуск цієї програми за умовчанням для деяких дій."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Ви вирішили дозволити цій програмі створювати віджети й отримувати доступ до їх даних."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Знач.за умовч не вст."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Очист.парам.за умовч."</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Можливо, ця програма не призначена для вашого екрана. Тут можна контролювати, як вона налаштовується для вашого екрана."</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Сорт. за розм."</string>
     <string name="show_running_services" msgid="5736278767975544570">"Показати запущені служби"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Показати кешовані процеси"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Скинути налашт-ня програм"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Скинути налашт. програм?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ця дія скине всі налаштування для:"\n\n" "<li>"вимкнених програм"</li>\n" "<li>"вимкнених сповіщень програм"</li>\n" "<li>"дій у програмах за умовчанням"</li>\n" "<li>"обмежень щодо фонових даних для програм"</li>\n\n" Жодні дані програм не буде втрачено."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Скинути програми"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Кер. простором"</string>
     <string name="filter" msgid="2018011724373033887">"Фільтрув."</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Вибрати параметри фільтра"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ця програма може отримати у вашому планшетному ПК такі доступи:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ця програма може отримати у вашому телефоні такі доступи:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Обчислення..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"Не вдається визнач. розмір пакета"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"Не вдалось обчислити розмір пакета."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"У вас не встановлено жодних програм сторонніх розробників."</string>
     <string name="version_text" msgid="9189073826278676425">"версія <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Перем."</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Змінити потрібне місце для встановлення нових програм"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Вимкнути вбудовану програму?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Відключення вбудованої програми може призвести до неправильного функціонування інших програм."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Вимкнути сповіщення?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Якщо вимкнути сповіщення для цієї програми, можна пропустити важливі повідомлення й оновлення."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Використання пам\'яті"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Переглянути пам’ять, яку використовують програми"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Запущені служби"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Цей метод введення може записувати весь текст, який ви вводите, зокрема такі особисті дані, як паролі й номери кредитних карток. Він походить від програми <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Використати цей метод введення?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Цей засіб перевірки правопису може збирати весь введений вами текст, зокрема такі особисті дані, як паролі та номери кредитних карток. Він походить від програми <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Використати цей засіб перевірки правопису?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Налаштування"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Мова"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Не вдалося відкрити налаштування для програми <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Миша/сенсорна панель"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Швидкість указівника"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Ігровий контролер"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Використовувати вібросигнал"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Переадресовувати вібросигнал на ігровий контролер, коли є з’єднання."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Вибрати розкладку клавіатури"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Налаштувати розкладки клавіатури"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Щоб переключити, натис. Ctrl–Пробіл"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"За умовчанням"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Розкладки клавіатури"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Словник корист-ча"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Особистий словник"</string>
     <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_add_screen_title" msgid="742580720124344291">"Фраза"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Більше опцій"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Менше опцій"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Слово:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Ярлик:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Мова:"</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="8165273379942105271">"У словнику користувача немає жодного слова. Слово можна додати, торкнувшись кнопки \"Додати\" (+)."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Усі мови"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Для всіх мов"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Інші мови..."</string>
     <string name="testing" msgid="6584352735303604146">"Тестування"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Інф-ція про пристрій"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Інф-я тел-ну"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Установити параметри для розробки програми"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Налагодження USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Реж. налагодж., коли підкл. ч-з USB"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"Ідентифікатор розробки пристрою"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Інформація про пристрій не доступна"</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="7316799925425402244">"Налагодження USB застосовується лише з метою розробки. Його можна використовувати для копіювання даних між комп’ютером і пристроєм, встановлення програм на вашому пристрої без сповіщення та читання даних журналу."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Дозволити налаштування розробки?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ці налаштування застосовуються лише з метою розробки. Вони можуть спричиняти вихід з ладу або неправильне функціонування вашого пристрою чи програм у ньому."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Захистити носій USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Програми мають запитувати дозвіл на читання носія USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Захистити носій USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Якщо носій USB захищено, програми мають запитувати дозвіл на читання даних із зовнішньої пам’яті."\n\n"Деякі програми можуть не працювати до оновлення своїми розробниками."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Захистити карту SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Програми мають запитувати дозвіл на читання карти SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Захистити карту SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Якщо карту SD захищено, програми мають запитувати дозвіл на читання даних із зовнішньої пам’яті."\n\n"Деякі програми можуть не працювати до оновлення своїми розробниками."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Вибрати віджет"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Вибрати віджет"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Створити віджет і дозволити доступ?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Після створення віджета хост <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> зможе отримувати доступ до всіх даних, які в ньому відображаються."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Завжди дозволяти хосту <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> створювати віджети й отримувати доступ до їх даних"</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>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Великий текст"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Кнопка живлення закінчує виклик"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Диктувати паролі"</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="3264723681038625967">"Установити веб-сценарії"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Покращення доступності мережі"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Не встановлено жодної служби"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Потрібна програма зчитування з екрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Функція TalkBack забезпечує мовне голосове відтворення для користувачів із вадами зору. Хочете встановити її безкоштовно з Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Установити веб-сценарії?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Дозволити програмам установлювати сценарії від Google, які зроблять веб-вміст більш доступним?"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"Ця функція змінює реакцію вашого пристрою на дотик. Увімкнути?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Немає опису."</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_not_available" msgid="3214000535532434353">"Статист. викор. батареї недост."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1273,7 +1334,7 @@
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Налашт-ня за умовч."</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Система за умовчанням"</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>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"Неможливо запустити вибрану вами систему."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Налаштувати"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Вибрати іншу систему"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ця система синтезу мовлення може збирати всі відтворювані тексти, зокрема особисті дані, такі як паролі та номери кредитних карток. Вона походить від системи <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Увімкнути використання цієї системи синтезу мовлення?"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"Перед викор. увімк. нову сист."</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Намалюйте ключ розблокування"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Щоб підтвердити встановлення облікових даних, потрібно намалювати ключ розблокування."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ввести пароль для сховища облікових даних."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Поточний пароль:"</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Сховище облік. даних очищено."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Схов.облік.даних неможл.видал."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Сховище облік. даних увімкнено."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Потрібно встановити PIN-код або пароль блокування екрана, перш ніж ви зможете використовувати сховище облікових даних."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Щоб використовувати сховище облікових даних, потрібно встановити PIN-код або пароль для блокування екрана."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Аварійний сингал"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Устан. поведінку при розміщ. аварійного виклику"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Резервне копіювання та скидання"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Автомат. відновлення"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"У разі повторного встановлення програми відновлювати налаштування та дані з резервних копій"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль резерв.копії на ПК"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Повні резервні копії на комп’ютері наразі не захищені."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Виберіть, щоб змінити чи видалити пароль для повного резервного копіювання на комп’ютер"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Повні резервні копії на комп’ютері наразі не захищені"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Торкніться, щоб змінити чи видалити пароль для повного резервного копіювання на комп’ютер"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Припинити створення резервних копій паролів Wi-Fi, закладок, інших налаштувань і даних програм і стерти всі копії на серверах Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Налашт-ня адміністрації пристрою"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Цей адміністратор активний і дозволяє програмі <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">"Мелодія та сповіщення"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Сповіщення"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"Система"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Сигнал і вібрація під час виклику"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"Система"</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="3747859666621319757">"Під’єднання до мережі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Помилка синхронізації"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Синхронізація активна"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Синхронізація"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Наразі виникли проблеми із синхронізацією. Незабаром вона відновиться."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Додати облік. запис"</string>
     <string name="background_data" msgid="5779592891375473817">"Фонові дані"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Синхроніз. ВВІМКНЕНО"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Синхроніз. ВИМКНЕНО"</string>
     <string name="sync_error" msgid="5060969083117872149">"Помилка синхр-ції"</string>
+    <string name="last_synced" msgid="4242919465367022234">"Востаннє синхронізовано: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Синхронізація…"</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Вітаємо в Синхронізації Google!"</font>\n"Це служба Google для синхронізації даних, що дозволяє вам будь-де мати доступ до своїх контактів, подій тощо."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Налаштування синхронізації програми"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Дані та синхронізація"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Змінити пароль"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Цей обліковий запис потрібен для деяких програм. Його можна видалити, лише відновивши заводські налаштування планшетного ПК (при цьому буде видалено всі ваші особисті дані) в меню Налаштування &gt; Резервне копіювання та скидання."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Цей обліковий запис потрібен для деяких програм. Його можна видалити, лише відновивши заводські налаштування телефону (при цьому буде видалено всі ваші особисті дані) в меню Налаштування &gt; Резервне копіювання та скидання."</string>
     <string name="provider_label" msgid="7724593781904508866">"Надіслати підписки"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"Синхронізувати <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Неможливо синхронізувати вручну"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронізацію для цього елемента зараз вимкнено. Щоб змінити це налаштування, тимчасово ввімкніть фонові дані й автоматичну синхронізацію."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Налаштування 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-адреса"</string>
     <string name="enter_password" msgid="4131758584074246224">"Введіть пароль, щоб розшифрувати носій"</string>
     <string name="try_again" msgid="4272075051293936921">"Повторіть спробу."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Служба зайнята. Повторіть спробу."</string>
     <string name="delete" msgid="4219243412325163003">"Видалити"</string>
     <string name="misc_files" msgid="6720680815969643497">"Різні файли"</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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"Вибрати всі"</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="debug_debugging_category" msgid="6781250159513471316">"Налагодження"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Виберіть програму для налагодження"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Не встановлено жодної програми для налагодження"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Програма для налагодження: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Вибрати програму"</string>
+    <string name="no_application" msgid="2813387563129153880">"Нічого"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Зачекайте на налагоджувач"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Програма для налагодження очікує на налагоджувач для виконання"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Ввід"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Рисування"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Моніторинг"</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_screen_updates" msgid="5470814345876056420">"Показ. оновлення поверхні"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Підсвічув. всю поверхню вікна під час оновлення"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Показувати оновл. перегл."</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Підсвічув. область у вікні під час рисування з GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Вимк. апаратн. накладання"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Завжди використовувати GPU для компонування екрана"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Увімкнути трасування"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Вибрати ввімкн.трасування"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Усі трасування зараз вимкнено"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Зараз увімкнено стільки трасувань: <xliff:g id="NUM">%1$d</xliff:g>"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Усі трасування зараз увімкнено"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Показувати межі макета"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Показувати межі роликів, поля тощо"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показати використання ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад-ня на екрані, яке показ.поточне використ.ЦП"</string>
-    <string name="force_hw_ui" msgid="6426383462520888732">"Примус.візуал. граф.проц."</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Використання апаратного прискорення 2D в програмах"</string>
+    <string name="force_hw_ui" msgid="6426383462520888732">"Примусова візуалізація GPU"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Примусово використовувати GPU для 2D-малювання"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Запис часу роботи GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Вимірювати час роботи в adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ступінь анімації вікна"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Ступінь анімації переходу"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Тривалість анімації"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Програми"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не зберігати діяльність"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Знищувати кожну дію, щойно користувач припиняє її"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Мобільні точки доступу"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Автосинхронізація даних"</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="8621855507876539282">"Програми не використовували дані в цей час."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Передній план"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Фон"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Виміряно планшетним ПК. Облік використ. даних вашим оператором може відрізнятися"</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Виміряно телефоном. Облік використання даних вашим оператором може відрізнятися."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"з обмеженнями"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Вимкнути мобільне передавання даних?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Установити ліміт мобільних даних"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Установити ліміт даних 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Мобільні"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Жодної"</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="8430240158135453271">"Див. налаштування програми"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Обмежити фонові дані"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Вимик. фонові дані лише в мережі моб. передав. даних. Використ. Wi-Fi, якщо доступно."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Вимикати фонові дані в мобільних мережах. Використов. не мобільні мережі, якщо доступно."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Щоб обмеж.фонові дані для прогр., споч. встанов.ліміт моб.даних."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Обмежити використання фонових даних?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Ця функція може спричинити припинення роботи програми, яка залежить від фонових даних, якщо немає з’єднання з Wi-Fi."\n\n"Відповідніші елементи керування використанням даних можна знайти в налаштуваннях, доступних у цій програмі."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Якщо доступні лише мобільні мережі, програми, що використовують фонові дані, можуть не працювати."\n\n"Відповідніші елементи керування використанням даних можна знайти в налаштуваннях цієї програми."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Обмеження фонових даних можливе, лише якщо встановлено ліміт мобільних даних."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Увімкнути автосинхроніз-ю даних?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Будь-які зміни до облікових записів, внесені в Інтернеті, автоматично копіюватимуться на ваш планшетний ПК."\n\n"Деякі облікові записи також можуть автоматично копіювати в Інтернет зміни, внесені на планшетному ПК. Так працює обліковий запис Google."\n\n"Щоб вибрати типи інформації, які потрібно синхронізувати з обліковими записами, перейдіть у Налаштування &gt; Облікові записи."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Будь-які зміни до облікових записів, внесені в Інтернеті, автоматично копіюватимуться на ваш телефон."\n\n"Деякі облікові записи також можуть автоматично копіювати в Інтернет зміни, внесені на телефоні. Так працює обліковий запис Google."\n\n"Щоб вибрати типи інформації, які потрібно синхронізувати з обліковими записами, перейдіть у Налаштування &gt; Облікові записи."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Вимкнути автосинхроніз-ю даних?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Це заощаджуватиме використання даних і заряду акумулятора. Проте вам доведеться вручну синхронізувати кожен обліковий запис, щоб зібрати останні відомості. Ви також не отримуватимете сповіщення про оновлення."</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_warning_editor_title" msgid="3704136912240060339">"Установити застереження про використання даних"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Установити ліміт використання даних"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Обмежити використання даних"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Передавання даних <xliff:g id="NETWORKS">%1$s</xliff:g> буде вимкнено в разі досягнення вказаного ліміту."\n\n"Оскільки методи обліку використання даних планшетного ПК і оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Передавання даних <xliff:g id="NETWORKS">%1$s</xliff:g> буде вимкнено в разі досягнення вказаного ліміту."\n\n"Оскільки методи обліку використання даних телефону й оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобільне передавання даних буде вимкнено в разі досягнення вказаного ліміту."\n\n"Оскільки методи обліку використання даних планшетного ПК й оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобільне передавання даних буде вимкнено в разі досягнення вказаного ліміту."\n\n"Оскільки методи обліку використання даних телефону й оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Обмежити використання фонових даних?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Якщо обмежити фонові мобільні дані, деякі програми та служби не працюватимуть, якщо немає з’єднання з мережею Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: використано близько <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: використано приблизно <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> (дані, визначені телефоном). Дані оператора можуть відрізнятись."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> (дані, визначені телефоном). Дані оператора можуть відрізнятись."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Мобільні точки доступу"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Виберіть мережі Wi-Fi, які є мобільними точками доступу. Програмам можна заборонити користуватися цими мережами у фоновому режимі. Також можна створити попередження, якщо такі мережі потрібні програмам для великих завантажень."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобільні мережі"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Мережі Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Щоб вибрати мобільні точки доступу, увімкніть Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Редагувати профіль VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Під’єднатися до профілю <xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"Додати профіль VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Редагувати профіль"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Видалити профіль"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Немає з’єднання з мережею. Повторіть спробу пізніше."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Сертифікат відсутній. Відредагуйте профіль."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"Увімкнувши функцію дослідження дотиком, можна торкатися екрана, щоб дізнаватися, що розташовано під вашим пальцем. Наприклад, на поточному екрані є піктограми програм. Знайдіть одну з них, торкаючись екрана та пересуваючи по ньому пальцем."</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Добре. Водіть пальцем по екрану, доки не знайдете принаймні ще один значок."</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Щоб активувати елемент, якого ви торкаєтеся, швидко натисніть його. Проводьте пальцем, доки не знайдете піктограму програми <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="8764686624055084454">"Для прокручування списку можна провести двома пальцями по екрану. Наприклад, на цьому екрані є список назв програм, який можна прокручувати вгору чи вниз. Спочатку спробуйте визначити кілька елементів у списку, проводячи одним пальцем по екрану."</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="3055831259260848004">"Ви закінчили перегляд посібника. Щоб вийти, знайдіть і натисніть кнопку \"<xliff:g id="FINISH">%s</xliff:g>\"."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Виправлення написання"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Програма перевірки правопису"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Введіть тут поточний пароль повної резервної копії"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Введіть тут новий пароль для повної резервної копії"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Ще раз введіть тут новий пароль повної резервної копії"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Скасувати"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Додаткові оновлення системи"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Користувачі й обмеження"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Користувачі"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Додати користувача"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Редагувати дані"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Інформація користувача"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Ім’я"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Обмеження вмісту"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Запитувати PIN-код"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Рейтинг вмісту"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Системні програми"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Установлені програми"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Закрити"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Видалити користувача"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Надокучлива дитина"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Видалити користувача?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Дійсно видалити користувача та всі пов’язані дані з цього пристрою?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Показати сповіщення"</string>
+    <string name="help_label" msgid="1107174367904110532">"Довідка"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 1a5db8d..479c5cc 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Đang ngắt kết nối…"</item>
     <item msgid="1634960474403853625">"Đã ngắt kết nối"</item>
     <item msgid="746097431216080650">"Không thành công"</item>
+    <item msgid="6367044185730295334">"Bị chặn"</item>
+    <item msgid="503942654197908005">"Tạm thời tránh kết nối kém"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"Đăng ngắt kết nối khỏi <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="197508606402264311">"Đã ngắt kết nối"</item>
     <item msgid="8578370891960825148">"Không thành công"</item>
+    <item msgid="5660739516542454527">"Bị chặn"</item>
+    <item msgid="1805837518286731242">"Tạm thời tránh kết nối kém"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Nút bấm"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Không"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"Mã PIN từ điểm truy cập"</item>
-    <item msgid="7364462169350112617">"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>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Thẻ SD tháo lắp được"</item>
     <item msgid="4498124044785815005">"Cho phép hệ thống quyết định"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Tắt"</item>
-    <item msgid="4804571292609523335">"Rung"</item>
-    <item msgid="595707141547423573">"Tắt tiế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>
@@ -249,6 +244,15 @@
     <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="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Tắt hình động"</item>
+    <item msgid="1138649021950863198">"Tỷ lệ hình động 0,5x"</item>
+    <item msgid="4394388961370833040">"Tỷ lệ hình động 1x"</item>
+    <item msgid="8125427921655194973">"Tỷ lệ hình động 1,5x"</item>
+    <item msgid="3334024790739189573">"Tỷ lệ hình động 2x"</item>
+    <item msgid="3170120558236848008">"Tỷ lệ hình động 5x"</item>
+    <item msgid="1069584980746680398">"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>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d2d9b4e..6e277f3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Có"</string>
     <string name="no" msgid="6731231425810196216">"Không"</string>
+    <string name="create" msgid="3578857613172647409">"Tạo"</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>
@@ -105,12 +106,14 @@
     <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="8002247464357005429">"Thời gian hiển thị"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Hết thời gian 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ị khóa."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Thiết bị Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Tên thiết bị"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Cài đặt thiết bị"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Cài đặt tiểu sử"</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">"Dò tìm thiết bị"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Đổi tên máy tính bảng"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Đang ghép nối…"</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="5655704645616731277">"Chạm để ghép nối"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Ko tìm thấy th.bị Bluetooth lân cận nào."</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="1931617700075106801">"Chạm để ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Chạm để 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="device_picker" msgid="8398232791303186677">"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="5279027758886569301">"Một ứng dụng muốn bật Bluetooth. Cho phép?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Một ứng dụng trên máy tính bảng của bạn muốn đặ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ị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Cho phép?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"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_acceptance_dialog_text" msgid="6555508756987053866">"%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 ch"</string>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"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="6467799485443290961">"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_port" msgid="5539106187558215246">"Bạn cần 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="2671425042711054494">"Cổng bạn đã nhập không hợp lệ."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"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>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Đặt"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Không thành công"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Thành công"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Các thay đổi có hiệu lực khi cáp USB được kết nối lại"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Thay đổi có hiệu lực khi cáp USB được kết nối lại."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Bật thiết bị lưu trữ USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Tổng số byte:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Bộ nhớ USB chưa được kết nối"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Không có thẻ SD nào"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB chưa được kết nối."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Không có thẻ SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Số byte khả dụng:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Bộ nhớ USB đang được sử dụng làm thiết bị lưu trữ dung lượng lớn"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Thẻ SD đang được sử dụng làm thiết bị lưu trữ dung lượng lớn"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Hiện an toàn để tháo b.l.t USB"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Bây giờ đã an toàn để tháo thẻ SD"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB được dùng làm thiết bị lưu trữ dung lượng lớn."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Thẻ SD đang được sử dụng làm thiết bị lưu trữ dung lượng lớn."</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Hiện đã an toàn để tháo USB."</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Bây giờ đã an toàn để tháo thẻ SD."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Bộ nhớ USB đã bị tháo trong khi vẫn đang sử dụng!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Thẻ SD đã bị tháo trong khi vẫn đang sử dụng!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Số byte đã sử dụng:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Đ.quét b.nhớ USB để có p.tiện…"</string>
     <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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB kết nối ở chế độ chỉ đọc."</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"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="5349877711342869319">"Ngôn ngữ"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Kết nối với dịch vụ dữ liệu khi chuyển vùng"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Bạn đã mất kết nối dữ liệu vì bạn đã tắt chuyển vùng dữ liệu của mạng gia đình của mình."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Bật"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Cho phép chuyển vùng dữ liệu? Bạn có thể phải chịu phí chuyển vùng đáng kể!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Chú ý"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Khi cho phép chuyển vùng dữ liệu, bạn có thể bị tính phí chuyển vùng đáng kể!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Cho phép chuyển vùng dữ liệu?"</string>
     <string name="networks" msgid="6333316876545927039">"Chọn nhà cung cấp dịch vụ"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"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>
@@ -283,12 +285,14 @@
     <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>
     <string name="date_time_set_date" msgid="7021491668550232105">"Đặt ngày"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Chọn định dạng ngày"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"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="date_picker_title" msgid="1338210036394128512">"Ngày"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Thời gian"</string>
-    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Cải tiến tính năng khớp khuôn mặt"</string>
+    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Cải tiến khớp khuôn mặt"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Kiểm tra tính sống động"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Yêu cầu nháy mắt khi mở khóa"</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>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống cũng như dữ liệu, phương tiện và các tệp khác. Sau khi bạn mã hóa máy tính bảng của mình, bạn phải nhập mã 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 về 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 tiếng 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ế độ sạc 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="3504519024884099702">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống cũng như dữ liệu, phương tiện và các tệp khác. Sau khi bạn mã hóa điện thoại của mình, bạn phải nhập mã 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 tiếng 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ế độ sạc 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="tablet" msgid="3839235202103924154">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa máy tính bảng, bạn cần nhập mã 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 trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm máy tính bảng cho tới khi quá trình mã hóa hoàn tất. Nếu 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 bạn."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa điện thoại, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã 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 trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm điện thoại cho tới khi quá trình mã hóa hoàn tất. Nếu 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 bạn."</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="2029407131227814893">"Vui lòng sạc pin và thử lại."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Vui lòng cắm 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_dialog_need_password_message" msgid="4071395977297369642">"Bạn cần đặt mã PIN hoặc mật khẩu khóa màn hình trước khi có thể bắt đầu quá trình mã hóa."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Mã hóa?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Tác vụ mã hóa không thể hoàn nguyên đượ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 nhất một tiếng, 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="5682944380460921880">"Tác vụ mã hóa không thể hoàn nguyên đượ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 nhất một tiếng, trong thời gian 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="6689952371032099350">"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="951918761585534875">"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="2223340178473871064">"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="6891198717505120682">"Mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên máy tính bảng của bạn không còn truy cập được. "\n\n" Để tiếp tục sử dụng máy tính bảng của mình, bạn phải thực hiện đặt lại cài đặt ban đầu. Khi bạn thiết lập máy tính bảng sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên điện thoại của bạn không còn truy cập được. "\n\n"Để tiếp tục sử dụng điện thoại của mình, bạn phải thực hiện đặt lại cài đặt ban đầu. Khi bạn thiết lập điện thoại sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Chọn khóa màn hình"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Quá trình mã hóa đã bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên máy tính bảng của bạn không còn có thể truy cập được. "\n\n" Để tiếp tục sử dụng máy tính bảng của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập máy tính bảng sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Quá trình mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên điện thoại của bạn không còn có thể truy cập được. "\n\n"Để tiếp tục sử dụng điện thoại của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập điện thoại sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Chuyển phương thức nhập"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Chọn khóa màn hình"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chọn khóa dự phòng"</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>
@@ -348,9 +353,9 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Không"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Trượt"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Mở khóa bằng khuôn mặt"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Hình"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Mã PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Mật khẩu"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Tắt khóa màn hình"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Xóa hình mở khóa"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Xóa mã PIN mở khóa"</string>
@@ -362,44 +367,44 @@
     <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="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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"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="6419879099090294052">"Mã pin phải ít hơn <xliff:g id="NUMBER">%d</xliff:g> chữ số."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"Mã PIN chỉ được chứa các chữ số 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Quản trị viên thiết bị ko cho phép dùng mã PIN gần đây."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Mật khẩu chứa ký tự không hợp lệ."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Mật khẩu phải chứa ít nhất một chữ cái."</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Mật khẩu phải chứa ít nhất một chữ số."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Mật khẩu phải chứa ít nhất 1 chữ cái."</item>
+    <item quantity="other" msgid="8186027808415585970">"Mật khẩu phải chứa ít nhất %d chữ cái."</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>
+    <item quantity="one" msgid="5583986519662091001">"Mật khẩu phải chứa ít nhất 1 chữ thường."</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Mật khẩu phải chứa ít nhất 1 chữ hoa."</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Mật khẩu phải chứa ít nhất 1 chữ số."</item>
+    <item quantity="other" msgid="4703982391407595924">"Mật khẩu phải chứa ít nhất %d chữ 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>
+    <item quantity="one" msgid="8456579939292408631">"Mật khẩu phải chứa ít nhất 1 ký tự đặc biệt."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"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="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Quản trị viên thiết bị không cho phép sử dụng mật khẩu gần đây."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</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="lock_setup" msgid="1759001157415978959">"Hoàn tất thiết lập"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Đã hoàn tất thiết lập."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Quản lý 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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Để ghép nối với:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Nhập mã xác nhận bắt buộc 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_enter_pin_other_device" msgid="4637977124526813470">"Bạn cũng có thể cần nhập mã PIN này trên thiết bị khác."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Bạn cũng có thể cần nhập mã xác nhận này 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="2796550001376088433">"Để ghép nối với:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Hãy nhập trên thiết bị:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> rồi nhấn Quay lại hoặc Enter."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Không thể 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 đúng."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Không thể kết nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <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_connecting_error_message" msgid="229861986106185022">"Không thể kết nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Dò 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>
@@ -478,19 +483,23 @@
     <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="5237208142892767592">"Cho phép trao đổi dữ liệu khi điện thoại chạm vào thiết bị khác"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Cho phép trao đổi dữ liệu khi máy tính bảng chạm vào thiết bị khác"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Cho phép trao đổi dữ liệu khi điện thoại chạm vào thiết bị khác"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Sẵn sàng truyền tải nội dung ứng dụng qua NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Tắt"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Không khả dụng vì NFC bị tắt"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Khi tính năng này được bật, bạn có thể truyền nội dung ứng dụng vào thiết bị có khả năng NFC khác bằng cách giữ các thiết bị gần nhau. Ví dụ: bạn có thể truyền các trang Trình duyệt, video trên YouTube, danh sách liên hệ Người và nhiều thứ khác."\n\n"Chỉ cần đưa thiết bị gần nhau (thường quay lưng lại với nhau) rồi chạm vào màn hình của bạn. Ứng dụng xác định nội dung nào được truyền."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Khám phá dịch vụ mạng"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Cho phép ứng dụng trên các thiết bị khác khám phá ứng dụng trên thiết bị này"</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="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_setup_wizard_title" msgid="70277346338812325">"Chọn Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Không thể dò tìm mạng"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Thông báo mạng"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Thông báo cho tôi khi mạng mở khả dụng"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Tránh kết nối kém"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"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_poor_network_detection" msgid="4925789238170207169">"Tránh kết nối kém"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"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="9107237003911220057">"Bật Wi-Fi khi ngủ"</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_wps_pbc" msgid="2668564692207863017">"Nút Đẩy WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Nhập mã pin WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Dò"</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_empty_list_wifi_on" msgid="3354911729026237372">"Đang tìm kiếm mạng Wi-Fi..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Mạng khác…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Khác"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Thiết lập tự động (WPS)"</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="8242979682530043184">"Nhập mã PIN từ điểm truy cập"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Thiết lập WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Nhập mã PIN <xliff:g id="WPS_PIN">%1$s</xliff:g> tại đ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_wps_setup_title" msgid="6034518116333042484">"Thiết lập Wi-Fi được bảo vệ"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Đang khởi động WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Nhấn nút Thiết lập Wi-Fi được bảo vệ trên bộ định tuyến của bạn. Quá trình này có thể được gọi là \"WPS\" hoặc chứa ký hiệu sau:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Nhập mã pin <xliff:g id="NUMBER">%1$s</xliff:g> trên bộ định tuyến Wi-Fi của bạn. Thiết lập có thể mất tới hai phút để hoàn tất."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS đã thành công. Đang kết nối với mạng…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Đã kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS đã được xử lý và có thể mất tối đa hai giây để hoàn tất"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS không thành công. Vui lòng thử lại sau ít phút."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Cài đặt bảo mật bộ định tuyến không dây (WEP) không được hỗ trợ"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Cài đặt bảo mật bộ định tuyến không dây (TKIP) không được hỗ trợ"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Xác thực không thành công. Vui lòng thử lại."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Đã phát hiện một phiên WPS khác. Vui lòng thử lại sau ít phút."</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>
@@ -537,20 +559,20 @@
     <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="3111321240793227690">"Đã tránh kết nối Internet kém"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Mạng này đã bị tránh do kết nối kém. Hãy tắt hiện tượng này từ màn hình Cài đặt &gt; Wi-Fi, mục trình đơn Nâng cao."</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_wps_available_first_item" msgid="3538912605343585226">"Có mạng được bảo vệ"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (có mạng được bảo vệ)"</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_failed_connect_message" msgid="8491902558970292871">"Không thể kết nối với mạng"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Quên"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Không thể bỏ qua mạng"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Lưu"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Không thể lưu mạng"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Hủy"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Đã ph.hiện 1 phiên Wi-Fi khác đc bảo vệ. Hãy thử lại sau ít 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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Cổ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="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Thiết lập kết nối ngang hàng"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Thông tin thiết bị"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Thiết lập Wi-Fi được bảo vệ"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Nhập mã 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_remove_group" msgid="4844634506540667517">"Xóa nhóm"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Nâng cao"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Thiết bị có sẵn"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Tìm kiếm thiết bị"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Đang tìm kiếm…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Đổi tên thiết bị"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Thiết bị ngang hàng"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Không thể kết nối."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Không thể đổi tên thiết bị."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Ngắt kết nối?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Nếu bạn ngắt kết nối, kết nối của bạn với <xliff:g id="PEER_NAME">%1$s</xliff:g> sẽ kết thúc."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Nếu bạn ngắt kết nối, kết nối của bạn với <xliff:g id="PEER_NAME">%1$s</xliff:g> và <xliff:g id="PEER_COUNT">%2$s</xliff:g> thiết bị khác sẽ kết thúc."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Hủy lời mời?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Bạn có muốn hủy lời mời kết nối với <xliff:g id="PEER_NAME">%1$s</xliff:g> không?"</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_configure_ap_text" msgid="3474995108398156258">"Định cấu hình điểm phát sóng Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Thiết lập đ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="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Âm thanh"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"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="4296957391257836961">"Âm lượng"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Hiệu ứng âm nhạc"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Âm lượng chuông"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rung khi im lặng"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Rung và đổ chuông"</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="incoming_call_volume_title" msgid="8073714801365904099">"Nhạc chuông"</string>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"Tắt nhạc chuông và ẩn thông báo"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Tắt nhạc và phương tiện khác"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Ẩn thông báo"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Tắt báo thức"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Rung khi đổ chuông"</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>
@@ -623,14 +651,14 @@
     <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" product="tablet" msgid="9015625921245904495">"Bạn phải gắn đế cho máy tính bảng trước khi thiết lập âm thanh đế."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Bạn phải gắn đế cho điện thoại trước khi thiết lập âm thanh đế."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Bạn cần gắn máy tính bảng vào đế trước khi thiết lập âm thanh đế."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Bạn cần gắn điện thoại vào đế trước khi thiết lập âm thanh đế."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Âm thanh khi lắp đế"</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="account_settings" msgid="6403589284618783461">"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="7965901687241669598">"Hiển thị"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Số điện thoại của tôi"</string>
     <string name="status_min_number" msgid="3519504522179420597">"TỐI THIỂU"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Phiên bản PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"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>
@@ -823,7 +851,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Xóa tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn? Bạn không thể hoàn nguyên tác vụ này!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Xóa mọi thứ"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Vẽ hình mở khóa của bạn"</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_gesture_explanation" msgid="826193821455182780">"Bạn cần vẽ hình mở khóa để xác nhận thiết lập lại dữ liệu ban đầu."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Không có tác vụ đặt lại nào được thực hiện vì dịch vụ Xóa hệ thống không khả dụng."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Đặt lại?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Xóa bộ nhớ USB"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Xóa thẻ SD, xóa tất cả các tệp được lưu trữ ở đó? Bạn không thể hoàn nguyên tác vụ này!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"Xóa mọi thứ"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Vẽ hình mở khóa của bạn"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"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 bộ nhớ USB."</string>
-    <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="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Bạn cần vẽ hình mở khóa để xác nhận rằng bạn muốn xóa bộ lưu trữ USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Bạn cần vẽ hình mở khóa để 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="6688416425801386511">"Dùng làm điểm truy cập Internet qua USB"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mạng di động"</string>
     <string name="location_title" msgid="1029961368397484576">"Vị trí của tôi"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Dịch vụ vị trí của Google"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Cho phép ứng dụng sử dụng dữ liệu từ các nguồn như mạng Wi-Fi và mạng di động để xác định vị trí gần đúng của bạn"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Cho phép gửi dữ liệu vị trí ẩn danh cho Google. Đồng thời cho phép các ứng dụng được phép sử dụng dữ liệu từ nguồn như Wi-Fi và mạng di động để xác định vị trí gần đúng 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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nhấn vào Trình đơn để được trợ giúp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Thả ngón tay khi xong."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Kết nối ít nhất <xliff:g id="NUMBER">%d</xliff:g> điểm. Hãy thử lại:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Hình đã được ghi lại!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Hình đã được ghi lại."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Vẽ lại hình để xác nhận:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Hình mở khóa mới của bạn:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Xác nhận"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Tiếp theo"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Đang bảo vệ máy tính bảng của bạn"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Đang bảo vệ điện thoại của bạn"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Bảo vệ máy tính bảng của bạn khỏi hành vi 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. Trượt ngón tay để kết nối các điểm theo thứ tự bất kỳ trên màn hình tiếp theo. 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ưa? Hãy chạm Tiếp theo."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Bảo vệ máy tính bảng của bạn khỏi hành vi 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. Trượt ngón tay để kết nối các điểm theo thứ tự bất kỳ trên màn hình tiếp theo. Bạn cần kết nối ít nhất bốn điểm. "\n\n"Bạn đã sẵn sàng bắt đầu chưa? Hãy chạm vào Tiếp theo."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Bảo vệ điện thoại của bạn khỏi hành vi 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. Trượt 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? Hãy chạm vào Tiếp theo."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Quản lý ứng dụng"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Quản lý và xóa ứng dụng đã cài đặt"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Quản lý ứng dụng, thiết lập lối tắt khởi chạy nhanh"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Cài đặt ứng dụng"</string>
     <string name="install_applications" msgid="4872012136210802181">"Không rõ nguồn gốc"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Cho phép cài đặt ứng dụng không thuộc Market"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Cho phép cài đặt ứng dụng từ những nguồn không xác định"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Máy tính bảng và dữ liệu cá nhân của bạn dễ bị tấn công hơn bởi các ứng dụng từ nguồn không xác đinh. Bạn đồng ý rằng bạn tự chịu trách nhiệm cho mọi hỏng hóc đối với máy tính bảng của bạn hoặc mất mát dữ liệu có thể phát sinh do sử dụng những ứng dụng này."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Điện thoại và dữ liệu cá nhân của bạn dễ bị tấn công hơn bởi các ứng dụng từ nguồn không xác đinh. Bạn đồng ý rằng bạn tự chịu trách nhiệm cho mọi hỏng hóc đối với điện thoại của bạn hoặc mất mát dữ liệu có thể phát sinh do sử dụng những ứng dụng này."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Cài đặt nâng cao"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Thông tin về ứ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="auto_launch_label_generic" msgid="3230569852551968694">"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>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Xóa dữ liệu"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Gỡ cài đặt cập nhật"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"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="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Bạn đã chọn cho phép ứng dụng này tạo các tiện ích và truy cập dữ liệu của chúng."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Chưa đặt mặc định."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Xóa mặc định"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"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>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Sắp xếp theo kích thước"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Hiển thị dịch vụ đg.chạy"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Hiển thị quá trình đã được lưu trong bộ nhớ cache"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Đặt lại tùy chọn ứng dụng"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Đặt lại tùy chọn ứng dụng?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:"\n\n" "<li>"Ứng dụng đã tắt"</li>\n" "<li>"Thông báo ứng dụng đã tắt"</li>\n" "<li>"Ứng dụng mặc định cho tác vụ"</li>\n" "<li>"Hạn chế dữ liệu nền cho ứng dụng"</li>\n\n" Bạn sẽ mất mọi dữ liệu ứng dụng."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Đặt lại ứng dụng"</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="8693024463731076091">"Chọn tùy chọn bộ lọc"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ứ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="61749028818785244">"Ứ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="invalid_size_value" msgid="7563537715280712285">"Không thể tính toán kích thước gói."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Thay đổi vị trí cài đặt ưa thích cho ứng dụng mới"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Tắt ứng dụng tích hợp sẵn?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Nếu bạn tắt một ứng dụng tích hợp sẵn, các ứng dụng khác có thể hoạt động sai."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Tắt thông báo?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Nếu bạn tắt thông báo cho ứng dụng này, bạn có thể bỏ qua cảnh báo và cập nhật quan trọng."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Sử dụng bộ nhớ"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Xem dung lượng lưu trữ mà các ứng dụng sử dụng"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Các dịch vụ đang hoạt động"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"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 đến 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>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Trình kiểm tra chính tả này có thể thu thập được 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. Trình này đến từ ứng dụng <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Sử dụng trình kiểm tra chính tả này?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Cài đặt"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Ngôn ngữ"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Không thể mở cài đặt cho <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Chuột/bàn di chuột"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Tốc độ con trỏ"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Trình điều khiển trò chơi"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Sử dụng bộ rung"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Chuyển hướng bộ rung sang trình điều khiển trò chơi khi được kết nối."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Chọn bố cục bàn phím"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Thiết lập bố cục bàn phím"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Để chuyển, nhấn Control-Phím cách"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Mặc định"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Bố cục bàn phím"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Từ điển người dùng"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Từ điển cá nhân"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Từ điển cá nhân"</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_add_screen_title" msgid="742580720124344291">"Cụm từ"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Tùy chọn khác"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Ít tùy chọn hơn"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Từ:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Phím tắt:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Ngôn ngữ:"</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">"Xóa"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"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="user_dict_settings_all_languages" msgid="6742000040975959247">"Cho tất cả ngôn ngữ"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Ngôn ngữ khác…"</string>
     <string name="testing" msgid="6584352735303604146">"Đang kiểm tra"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Thông tin về máy tính bảng"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Thông tin điện thoại"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Đặ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="verifier_device_identifier" msgid="5079997701152411060">"ID thiết bị phát triển"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Thông tin thiết bị chưa sẵn có"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Không khóa màn hình"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Màn hình sẽ không bao giờ chuyển sang chế độ nghỉ khi sạc"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Cho phép gỡ lỗi USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Gỡ lỗi USB chỉ dành cho mục đích phát triển. Hãy sử dụng tính năng này để sao chép dữ liệu giữa máy tính và thiết bị của bạn, cài đặt ứng dụng trên thiết bị của bạn mà không thông báo và đọc dữ liệu nhật ký."</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"Cho phép cài đặt phát triển?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Những cài đặt này chỉ dành cho mục đích phát triển. Chúng có thể làm cho thiết bị và ứng dụng trên thiết bị của bạn bị lỗi và hoạt động sai."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Bảo vệ bộ lưu trữ USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Các ứng dụng phải yêu cầu quyền đọc bộ lưu trữ USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Bảo vệ bộ lưu trữ USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Khi bộ lưu trữ USB được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài."\n\n"Một số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Bảo vệ thẻ SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Các ứng dụng phải yêu cầu quyền đọc thẻ SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Bảo vệ thẻ SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Khi thẻ SD được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài."\n\n"Một số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Chọn tiện ích"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Chọn tiện ích"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Tạo tiện ích và cho phép truy cập?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Sau khi bạn tạo tiện ích, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> có thể truy cập tất cả dữ liệu mà nó hiển thị."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Luôn cho phép <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> tạo các tiện ích và truy cập dữ liệu của chúng"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> ngày <xliff:g id="HOURS">%2$d</xliff:g> giờ <xliff:g id="MINUTES">%3$d</xliff:g> phút <xliff:g id="SECONDS">%4$d</xliff:g> giây"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> giờ <xliff:g id="MINUTES">%2$d</xliff:g> phút <xliff:g id="SECONDS">%3$d</xliff:g> giây"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> phút <xliff:g id="SECONDS">%2$d</xliff:g> giây"</string>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Chữ 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_speak_password_title" msgid="3344423945644925355">"Nói mật khẩu"</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="3264723681038625967">"Cài đặt tập lệnh web"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Nâng cao khả năng truy cập của web"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Chưa có dịch vụ nào được cài đặt"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Cần trình đọc màn hình?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack cung cấp phản hồi bằng giọng nói nhằm giúp người dùng bị mù và mắt kém. Bạn có muốn cài đặt ứng dụng này miễn phí từ Android Market không?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Cài đặt tập lệnh web?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Bạn có muốn ứng dụng cài đặt tập lệnh từ Google làm cho nội dung web của chúng dễ truy cập hơn?"</string>
-    <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ản hồi với tác vụ chạm. Bật?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Không có mô tả nào được cung cấp."</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_not_available" msgid="3214000535532434353">"Không có dữ liệu sử dụng pin."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1285,7 +1346,7 @@
     <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_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" msgid="3305141107104670703">"Công cụ bạn đã chọn không thể chạy được."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Định cấu hình"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Chọn công cụ khác"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Công cụ tổng hợp tiếng nói này có thể thu thập tất cả nội dụng sẽ được nói, bao gồm dữ liệu cá nhân như mật khẩu và số thẻ tín dụng. Công cụ này xuất phát từ công cụ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Cho phép sử dụng công cụ tổng hợp tiếng nói này?"</string>
@@ -1301,11 +1362,11 @@
     <string name="pico_voice_summary_female" msgid="8047327176247727492">"Nữ"</string>
     <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_notif_engine_install_message" msgid="7250804349781973329">"Bật công cụ mới trước khi 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="5519037532720577836">"Kiểm soát nguồn điện"</string>
+    <string name="gadget_title" msgid="5519037532720577836">"Kiểm soát điện năng"</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_title" msgid="5662579425832406705">"VPN"</string>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"Vẽ hình mở khóa của bạn"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Bạn cần vẽ hình mở khóa của mình để xác nhận cài đặt thông tin xác thực."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Nhập mật khẩu cho vùng lưu trữ thông tin xác thực."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mật khẩu hiện tại:"</string>
@@ -1329,7 +1392,7 @@
     <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="93461830775441220">"Ko thể xóa b.nhớ t.tin x.thực."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Bộ nhớ thông tin xác thực đã bật."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Bạn phải đặt mật khẩu hoặc mã PIN của màn hình khóa trước khi bạn có thể sử dụng vùng lưu trữ thông tin xác thực."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Bạn cần đặt mã PIN hoặc mật khẩu khóa màn hình trước khi có thể sử dụng vùng lưu trữ thông tin xác thực."</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="5446972770562918934">"Sao lưu &amp; đặt lại"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Tự động khôi phục"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Khi cài đặt lại một ứng dụng, khôi phục dữ liệu và cài đặt đã 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="4780151366296088113">"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="local_backup_password_summary_none" msgid="393503434408227110">"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="2731163425081172638">"Chạm để 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="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Dừng sao lưu mật khẩu Wi-Fi, dấu trang, cài đặt khác và dữ liệu ứng dụng của bạn đồng thời xóa tất cả sao chép trên máy chủ của Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Quản lý thiết bị"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"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_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="6047518536574673606">"Hệ thống"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Nhạc chuông và rung khi gọi"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"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="3747859666621319757">"Đang kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"Đồng bộ hóa không thành công"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Đồng bộ hóa hoạt động"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Đồng bộ hóa"</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="background_data" msgid="5779592891375473817">"Dữ liệu nền"</string>
@@ -1404,6 +1469,8 @@
     <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="last_synced" msgid="4242919465367022234">"Đồng bộ hóa sau cùng <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Đang đồ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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><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 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="6205903695598000286">"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>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"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 (tác vụ này sẽ xóa tất cả dữ liệu cá nhân của bạn) trong đặt lại Cài đặt &gt; Sao lưu &amp;."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"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 (tác vụ này sẽ xóa tất cả dữ liệu cá nhân của bạn) trong đặt lại Cài đặt &gt; Sao lưu &amp;."</string>
     <string name="provider_label" msgid="7724593781904508866">"Đăng ký dịch vụ Push"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"Đồng bộ hóa <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Không thể đồng bộ hóa theo cách thủ công"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Đồng bộ hóa cho mục này hiện đã bị vô hiệu hóa. Để thay đổi cài đặt này, hãy tạm thời bật dữ liệu nền và đồng bộ hóa tự động."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Cài đặt 4G"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Địa chỉ MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Nhập mật khẩu để giải mã bộ nhớ"</string>
     <string name="try_again" msgid="4272075051293936921">"Thử lại."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Dịch vụ đang bận. Hãy thử lại."</string>
     <string name="delete" msgid="4219243412325163003">"Xóa"</string>
     <string name="misc_files" msgid="6720680815969643497">"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>
@@ -1443,21 +1510,45 @@
     <string name="select_all" msgid="1562774643280376715">"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="debug_debugging_category" msgid="6781250159513471316">"Gỡ lỗi"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Chọn ứng dụng gỡ lỗi"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Không có ứng dụng gỡ lỗi nào được đặt"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Ứng dụng gỡ lỗi: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Chọn ứng dụng"</string>
+    <string name="no_application" msgid="2813387563129153880">"Không có ứng dụng"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Đợi trình gỡ lỗi"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Ứng dụng được gỡ lỗi chờ trình gỡ lỗi đính kèm trước khi thực hiện"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Nhập"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Bản vẽ"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Giám sát"</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_screen_updates" msgid="5470814345876056420">"Hiển thị cập nhật bề mặt"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Chuyển nhanh toàn bộ các giao diện cửa sổ khi các giao diện này cập nhật"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Hiển thị cập nhật chế độ xem GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Chuyển nhanh chế độ xem trong cửa sổ khi được vẽ bằng GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Vô hiệu hóa các lớp phủ HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Luôn sử dụng GPU để tổng hợp màn hình"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Bật dấu vết"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Chọn các dấu vết đã bật"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Hiện không có dấu vết nào được bật"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> dấu vết hiện đang được bật"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Tất cả dấu vết hiện đang được bật"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Hiển thị ranh giới bố cục"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Hiển thị giới hạn đoạn video, lề, v.v.."</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="force_hw_ui" msgid="6426383462520888732">"Bắt buộc kết xuất GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Sử dụng tăng tốc phần cứng 2D trong các ứng dụng"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Bắt buộc sử dụng GPU cho bản vẽ 2d"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Kết xuất GPU cấu hình"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Đo thời gian kết xuất trong adb shell dumpsys gfxinfo"</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="animator_duration_scale_title" msgid="3406722410819934083">"T.lệ th.lượng tr.tạo h.đ"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Ứ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>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"Điểm phát sóng di động"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Tự động đồng bộ hóa dữ liệu"</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="8621855507876539282">"Ko ứng dụng nào s.dụng dữ liệu trong t.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_disclaimer" product="tablet" msgid="2591250607795265503">"Được đo bằng máy tính bảng của bạn. Cách tính mức sử dụng dữ liệu của nhà cung cấp dịch vụ của bạn có thể khác nhau."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Được đo bằng điện thoại của bạn. Cách tính mức sử dụng dữ liệu của nhà cung cấp dịch vụ của bạn có thể khác nhau."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"bị hạn chế"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Tắt dữ liệu di động?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Đặt giới hạn dữ liệu di động"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Đặt giới hạn dữ liệu 4G"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"Di động"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"0 mạ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="8430240158135453271">"Xem cài đặt ứng dụng"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Hạn chế dữ liệu nền"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Chỉ tắt d.liệu nền trên mạng d.liệu d.động. Dùng Wi-Fi nếu có."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Tắt dữ liệu nền trên mạng di động. Sử dụng mạng không di động nếu cần."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Để giới hạn dữ liệu nền cho ứng dụng này, trước tiên hãy đặt giới hạn dữ liệu di động."</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="5651588785118290771">"Tính năng này có thể khiến ứng dụng phụ thuộc vào dữ liệu nền ngừng hoạt động khi không có Wi-Fi."\n\n"Bạn có thể tìm thêm điều khiển sử dụng dữ liệu phù hợp trong các cài đặt có trong ứng dụng."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Tính năng này có thể khiến ứng dụng phụ thuộc vào dữ liệu nền ngừng hoạt động chỉ khi có mạng di động."\n\n"Bạn có thể tìm thấy biện pháp kiểm soát mức sử dụng dữ liệu thích hợp khác trong các cài đặt có trong ứng dụng."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Chỉ có thể giới hạn dữ liệu nền khi bạn đặt giới hạn dữ liệu di động."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Bật tính năng tự động đồng bộ hóa dữ liệu?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Mọi thay đổi bạn thực hiện cho các tài khoản của bạn trên web sẽ tự động được sao chép sang máy tính bảng của bạn."\n\n"Một số tài khoản cũng có thể tự động sao chép mọi thay đổi bạn thực hiện trên máy tính bảng lên web. Tài khoản Google hoạt động theo cách này."\n\n"Để chọn loại thông tin sẽ đồng bộ hóa với từng tài khoản, truy cập Cài đặt và tài khoản."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Mọi thay đổi bạn thực hiện cho các tài khoản của bạn trên web sẽ được tự động sao chép sang điện thoại của bạn."\n\n"Một số tài khoản cũng có thể tự động đồng bộ hóa mọi thay đổi bạn thực hiện trên điện thoại với web. Tài khoản Google hoạt động theo cách này."\n\n"Để chọn loại thông tin sẽ đồng bộ hóa trong từng tài khoản, truy cập Cài đặt và tài khoản."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Tắt tính năng tự động đồng bộ hóa dữ liệu?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Việc này sẽ bảo toàn mức sử dụng dữ liệu và pin, tuy nhiên bạn sẽ cần phải đồng bộ hóa từng tài khoản theo cách thủ công để thu thập thông tin gần đây. Và bạn sẽ không nhận được thông báo khi có cập nhật."</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_warning_editor_title" msgid="3704136912240060339">"Thiết lập cảnh báo sử dụng dữ liệu"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Thiết lập giới hạn sử dụng dữ liệu"</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" product="tablet" msgid="6401600837858297985">"Kết nối dữ liệu <xliff:g id="NETWORKS">%1$s</xliff:g> của bạn sẽ bị vô hiệu khi đạt đến giới hạn được chỉ định."\n\n"Vì việc sử dụng dữ liệu được đo bằng máy tính bảng của bạn và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Kết nối dữ liệu <xliff:g id="NETWORKS">%1$s</xliff:g> của bạn sẽ bị vô hiệu khi đạt đến giới hạn được chỉ định."\n\n"Vì việc sử dụng dữ liệu được đo bằng điện thoại của bạn và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Kết nối dữ liệu di động của bạn sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định."\n\n"Vì việc sử dụng dữ liệu được máy tính bảng của bạn tính và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Kết nối dữ liệu di động của bạn sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định."\n\n"Vì việc sử dụng dữ liệu được điện thoại của bạn tính và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</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="6387252645350792955">"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ừ khi bạn kết nối với mạng Wi-Fi."</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng, giá trị này được máy tính bảng của bạn đo. Việc tính mức sử dụng dữ liệu của nhà cung cấp dịch vụ của bạn có thể khác nhau."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng, giá trị này được điện thoại của bạn đo. Việc tính mức sử dụng dữ liệu của nhà cung cấp dịch vụ của bạn có thể khác nhau."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Điểm phát sóng di động"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Chọn mạng Wi-Fi là điểm phát sóng di động. Ứng dụng có thể bị hạn chế sử dụng các mạng này khi chạy dưới nền. Ứng dụng cũng có thể cảnh báo trước khi sử dụng các mạng này để tải xuống tệp có kích thước lớn."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mạng di động"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Mạng Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Để chọn điểm phát sóng di động, hãy bật Wi-Fi."</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"Chỉnh sửa cấu hình VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Kết nối với <xliff:g id="PROFILE">%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">"Xóa mạng"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Thêm cấu hình VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Chỉnh sửa cấu hình"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Xóa cấu hình"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Không có kết nối mạng. Vui lòng thử lại sau."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Thiếu chứng chỉ. Vui lòng chỉnh sửa tiểu sử."</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"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="3973201880357468747">"Để 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 đã 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="8764686624055084454">"Để 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="3055831259260848004">"Bạn đã hoàn tất hướng dẫn. Để thoát, tìm và chạ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="spellcheckers_settings_title" msgid="399981228588011501">"Trình kiểm tra chính tả"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"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="8755501377391998428">"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="3238728882512787864">"Nhập lại toàn bộ mật khẩu sao lưu mới của bạn vào đây"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Hủy"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</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="user_settings_title" msgid="5189224330534906766">"Người dùng và giới hạn"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Người dùng"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Thêm người dùng"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Chỉnh sửa chi tiết"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Thông tin người dùng"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Tên"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Giới hạn nội dung"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Yêu cầu mã PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Xếp hạng nội dung"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Ứng dụng hệ thống"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Ứng dụng đã cài đặt"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Hủy"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Xóa người dùng"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Đứa trẻ phiền hà"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Xóa người dùng?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Bạn có chắc chắn muốn xóa người dùng và tất cả các dữ liệu được liên kết khỏi thiết bị này không?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Hiển thị thông báo"</string>
+    <string name="help_label" msgid="1107174367904110532">"Trợ giúp"</string>
 </resources>
diff --git a/res/values-zh-rCN-nokeys/strings.xml b/res/values-zh-rCN-nokeys/strings.xml
index b6da481..5a65a25 100644
--- a/res/values-zh-rCN-nokeys/strings.xml
+++ b/res/values-zh-rCN-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-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 44aeee3..4940c23 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -39,7 +39,7 @@
     <item msgid="6864027152847611413">"30 分钟"</item>
   </string-array>
   <string-array name="dream_timeout_entries">
-    <item msgid="3149294732238283185">"从不"</item>
+    <item msgid="3149294732238283185">"永不"</item>
     <item msgid="2194151041885903260">"15 秒"</item>
     <item msgid="5892295237131074341">"30 秒"</item>
     <item msgid="3538441365970038213">"1 分钟"</item>
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"正在断开连接..."</item>
     <item msgid="1634960474403853625">"已断开连接"</item>
     <item msgid="746097431216080650">"失败"</item>
+    <item msgid="6367044185730295334">"已阻止"</item>
+    <item msgid="503942654197908005">"暂时关闭状况不佳的连接"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"正在断开与 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的连接..."</item>
     <item msgid="197508606402264311">"已断开连接"</item>
     <item msgid="8578370891960825148">"失败"</item>
+    <item msgid="5660739516542454527">"已阻止"</item>
+    <item msgid="1805837518286731242">"暂时关闭状况不佳的连接"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按钮"</item>
@@ -142,7 +147,7 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"始终"</item>
     <item msgid="844721238536786870">"仅限充电时"</item>
-    <item msgid="2990218920631468642">"从不（会增加数据流量）"</item>
+    <item msgid="2990218920631468642">"永不（会增加数据网络流量）"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"始终"</item>
@@ -157,12 +162,13 @@
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"使用时间"</item>
     <item msgid="3703676222230317933">"启动次数"</item>
-    <item msgid="2502754479975776899">"应用程序名称"</item>
+    <item msgid="2502754479975776899">"应用名称"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"无"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"从接入点获取的 PIN"</item>
-    <item msgid="7364462169350112617">"从此设备生成的 PIN"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"静态"</item>
@@ -207,22 +207,17 @@
     <item msgid="6848428671997893147">"未指定"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"设备内部存储"</item>
+    <item msgid="8151497958991952759">"设备内存"</item>
     <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
     <item msgid="4498124044785815005">"由系统确定"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"关闭"</item>
-    <item msgid="4804571292609523335">"振动"</item>
-    <item msgid="595707141547423573">"静音"</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="441827799230089869">"永不检查"</item>
     <item msgid="6042769699089883931">"仅检查 DRM 内容"</item>
     <item msgid="9174900380056846820">"总是检查"</item>
   </string-array>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"动画缩放 5x"</item>
     <item msgid="6660750935954853365">"动画缩放 10x"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"关闭动画"</item>
+    <item msgid="1138649021950863198">"动画缩放 0.5x"</item>
+    <item msgid="4394388961370833040">"动画缩放 1x"</item>
+    <item msgid="8125427921655194973">"动画缩放 1.5x"</item>
+    <item msgid="3334024790739189573">"动画缩放 2x"</item>
+    <item msgid="3170120558236848008">"动画缩放 5x"</item>
+    <item msgid="1069584980746680398">"动画缩放 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"不允许后台进程"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6305712..78f8b7d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"是"</string>
     <string name="no" msgid="6731231425810196216">"无"</string>
+    <string name="create" msgid="3578857613172647409">"创建"</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>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"屏幕锁定时停止使用蓝牙拨号器"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"蓝牙设备"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"设备名称"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"设备设置"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"配置文件设置"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"未设置名称，使用帐户名"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"扫描查找设备"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"重命名平板电脑"</string>
@@ -118,7 +121,7 @@
     <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_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>
@@ -131,23 +134,22 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"正在配对..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"未命名的蓝牙设备"</string>
     <string name="progress_scanning" msgid="192587958424295789">"正在搜索"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"触摸可配对"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"未在附近找到蓝牙设备。"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配对请求"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"触摸可与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行配对"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"触摸可与<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="device_picker" msgid="8398232791303186677">"蓝牙设备选择器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"某个应用程序想要打开蓝牙。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"您平板电脑上的某个应用程序想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"您手机上的某个应用程序想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"您平板电脑上的某个应用程序想让其他蓝牙设备“一直可检测到”您的平板电脑。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"您手机上的某个应用程序想让其他蓝牙设备“一直可检测到”您的手机。允许该程序执行相应操作吗？"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"您平板电脑上的某个应用程序想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"您手机上的某个应用程序想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"您平板电脑上的某个应用程序想要打开蓝牙，以便其他设备可检测到您的平板电脑。允许该程序打开蓝牙吗？"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"您手机上的某个应用程序想要打开蓝牙，以便其他设备可检测到您的手机。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"某个应用想要打开蓝牙。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"您平板电脑上的某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序执行相应操作吗？"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"您手机上的某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序执行相应操作吗？"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"您平板电脑上的某个应用想让其他蓝牙设备“一直可检测到”您的平板电脑。允许该程序执行相应操作吗？"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"您手机上的某个应用想让其他蓝牙设备“一直可检测到”您的手机。允许该程序执行相应操作吗？"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"您平板电脑上的某个应用想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"您手机上的某个应用想要打开蓝牙，以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"您平板电脑上的某个应用想要打开蓝牙，以便其他设备可检测到您的平板电脑。允许该程序打开蓝牙吗？"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"您手机上的某个应用想要打开蓝牙，以便其他设备可检测到您的手机。允许该程序打开蓝牙吗？"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"正在打开蓝牙..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"正在关闭蓝牙…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自动连接"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"触摸可连接到“<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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -174,7 +176,7 @@
     <string name="proxy_settings_title" msgid="5912878565897294401">"代理设置"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"代理服务器端口"</string>
-    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"对以下对象绕过代理："</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="2957063145357903951">"完成"</string>
@@ -184,10 +186,10 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"确定"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"您键入的主机名无效。"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"您键入的排除列表的格式不正确。请键入以逗号分隔的排除域列表。"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必须填写端口字段。"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"您需要填写端口字段。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"如果主机字段为空，则端口字段必须为空。"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"您键入的端口无效。"</string>
-    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"该浏览器使用 HTTP 代理，但其他应用程序可能不会使用。"</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"浏览器会使用 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>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"重新连接 USB 线后更改生效"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"重新连接 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_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_not_present_status" product="nosdcard" msgid="1636218515775929394">"未装载 USB 存储设备。"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"无 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="6691584887397909775">"现在可以安全地移除该 USB 存储设备了"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"现在可以安全地移除该 SD 卡了"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"计算机正将 USB 存储设备用作大容量存储设备。"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"计算机正将 SD 卡用作大容量存储设备。"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"现在可以安全地移除该 USB 存储设备了。"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"现在可以安全地移除 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_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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"已将 USB 存储设备装载为只读设备。"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"已将 SD 卡装载为只读设备。"</string>
     <string name="skip_label" msgid="47510779345218297">"跳过"</string>
     <string name="next_label" msgid="4693520878012668114">"下一步"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"语言"</string>
@@ -261,13 +263,13 @@
     <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>
-    <string name="roaming_disable" msgid="1295279574370898378">"漫游时连接到数据服务"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"数据连接已断，因为您已离开本地网络并已关闭数据漫游。"</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_turn_it_on_button" msgid="4387601818162120589">"将其启用"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"要允许数据漫游？这可能产生大量漫游费！"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"注意"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"请注意，允许移动数据网络漫游可能会产生高额漫游费！"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"允许移动数据网络漫游吗？"</string>
     <string name="networks" msgid="6333316876545927039">"运营商选择"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"选择网络运营商"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期和时间"</string>
@@ -283,16 +285,18 @@
     <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="6951498879879281102">"选择日期格式"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"改善面部匹配"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"真人判断"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"需要眨眼"</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="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="4608681417960923911">"键入要在锁定屏幕上显示的文字"</string>
     <string name="location_settings_title" msgid="8935806698251432196">"位置服务"</string>
@@ -306,26 +310,27 @@
     <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="923629233459331136">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除平板电脑上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，需要确保电池有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，会丢失部分或全部数据。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"您可以加密自己的帐户、设置、已下载的应用程序及其数据、媒体和其他文件。加密手机后，您每次开机时都必须输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除手机上的所有数据。"\n\n"加密过程需要一个小时或更长时间。在开始加密前，需要确保电池有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除平板电脑上的所有数据。"\n\n"加密过程需要 1 小时或更长时间。在开始加密前，电池必须有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密手机后，您每次开机时都需要输入数字 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="2029407131227814893">"请为电池充电，然后重试。"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"插上充电器，然后重试。"</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_dialog_need_password_message" msgid="4071395977297369642">"您需要先设置锁定屏幕 PIN 或密码才能开始加密。"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"要加密吗？"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"加密操作无法撤消，如果您中断该过程，则会丢失数据。加密过程需要 1 小时或更长时间，在此期间，平板电脑会重新启动数次。"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"加密操作无法撤消，如果您中断该过程，则会丢失数据。加密过程需要 1 小时或更长时间，在此期间，手机会重新启动数次。"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"正在加密"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"正在加密您的平板电脑（已完成 <xliff:g id="PERCENT">^1</xliff:g>%），请耐心等待。"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"正在加密您的手机（已完成 <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="2223340178473871064">"键入密码"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失败"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"加密过程中断，无法完成。因此，您无法再访问平板电脑上的数据了。"\n\n"要继续使用您的平板电脑，必须将其恢复出厂设置。恢复出厂设置后对平板电脑进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到平板电脑中。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"加密过程中断，无法完成。因此，您无法再访问手机上的数据了。"\n\n"要继续使用您的手机，必须将其恢复出厂设置。恢复出厂设置后对手机进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到手机中。"</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"选择屏幕锁定"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密过程中断，无法完成。因此，您已无法再使用平板电脑上的数据。"\n\n"要继续使用您的平板电脑，您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到平板电脑中。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密过程中断，无法完成。因此，您已无法再使用手机上的数据。"\n\n"要继续使用您的手机，您需要恢复出厂设置。恢复出厂设置后对手机进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到手机中。"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"切换输入法"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"选择备份锁"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"屏幕锁定"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改锁定屏幕"</string>
@@ -344,13 +349,13 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中高等安全性"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密码"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高安全性"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已被管理员、加密政策或凭据存储停用"</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_biometric_weak" msgid="3008473624490350142">"人脸解锁"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"图案"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"密码"</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>
@@ -362,44 +367,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"密码必须少于 <xliff:g id="NUMBER">%d</xliff:g> 个字符。"</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN 必须少于 <xliff:g id="NUMBER">%d</xliff:g> 位数。"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN 只能包含 0-9 的数字。"</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"设备管理员不允许使用最近用过的 PIN。"</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"密码包含非法字符。"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"密码必须包含至少 1 个字母。"</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"密码必须包含至少 1 个数字。"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"密码必须包含至少 1 个符号。"</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"密码中至少应包含 1 个字母"</item>
-    <item quantity="other" msgid="7278096339907683541">"密码中至少应包含 %d 个字母"</item>
+    <item quantity="one" msgid="3063853802158131458">"密码必须包含至少 1 个字母。"</item>
+    <item quantity="other" msgid="8186027808415585970">"密码必须包含至少 %d 个字母。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"密码中至少应包含 1 个小写字母"</item>
-    <item quantity="other" msgid="588499075580432178">"密码中至少应包含 %d 个小写字母"</item>
+    <item quantity="one" msgid="5583986519662091001">"密码必须包含至少 1 个小写字母。"</item>
+    <item quantity="other" msgid="2693910942679679225">"密码必须包含至少 %d 个小写字母。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"密码中至少应包含 1 个大写字母"</item>
-    <item quantity="other" msgid="2183090598541826806">"密码中至少应包含 %d 个大写字母"</item>
+    <item quantity="one" msgid="2611909966725502768">"密码必须包含至少 1 个大写字母。"</item>
+    <item quantity="other" msgid="3030801209112209245">"密码必须包含至少 %d 个大写字母。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"密码中至少应包含 1 个数字"</item>
-    <item quantity="other" msgid="995673409754935278">"密码中至少应包含 %d 个数字"</item>
+    <item quantity="one" msgid="3820355568839621231">"密码必须包含至少 1 个数字。"</item>
+    <item quantity="other" msgid="4703982391407595924">"密码必须包含至少 %d 个数字。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"密码中至少应包含 1 个特殊符号"</item>
-    <item quantity="other" msgid="3047460862484105274">"密码中至少应包含 %d 个特殊符号"</item>
+    <item quantity="one" msgid="8456579939292408631">"密码必须包含至少 1 个特殊符号。"</item>
+    <item quantity="other" msgid="1221290525051187757">"密码必须包含至少 %d 个特殊符号。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"密码中至少应包含 1 个非字母字符"</item>
-    <item quantity="other" msgid="5574191164708145973">"密码中至少应包含 %d 个非字母字符"</item>
+    <item quantity="one" msgid="4594051152085925921">"密码必须包含至少 1 个非字母字符。"</item>
+    <item quantity="other" msgid="3952508584649046404">"密码必须包含至少 %d 个非字母字符。"</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"设备管理器不允许使用最近的密码"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"设备管理员不允许使用最近用过的密码。"</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="lock_setup" msgid="1759001157415978959">"设置已完成"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"设置完毕。"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"要与 <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 设备配对，请键入该设备所需的配对密钥："</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_enter_pin_other_device" msgid="4637977124526813470">"您可能还需要在另一台设备上输入此 PIN。"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"您可能还需要在另一台设备上输入此密钥。"</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="2796550001376088433">"要与 <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 设备配对，请在该设备上键入：<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>，然后按回车键。"</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN 或配对密钥不正确，无法与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”配对。"</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"无法与“<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_connecting_error_message" msgid="229861986106185022">"无法连接到<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>
@@ -440,7 +445,7 @@
     <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_empty_list_bluetooth_off" msgid="4793562956642282639">"要搜索可用设备，请打开蓝牙功能。"</string>
     <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>
@@ -457,7 +462,7 @@
     <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_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>
@@ -472,25 +477,29 @@
     <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" 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="5237208142892767592">"允许手机在接触其他设备时交换数据"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"允许平板电脑在接触其他设备时交换数据"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"允许手机在接触其他设备时交换数据"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"已准备好通过 NFC 传输应用程序内容"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"已准备好通过 NFC 传输应用内容"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"关闭"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"无法使用，因为 NFC 已关闭"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"打开此功能后，您只需将自己的设备与另一台支持 NFC 的设备靠在一起，即可将您设备上的应用程序内容同步分享给对方。例如，您可以发送网页、YouTube 视频、“分享对象”联系人等等。"\n\n"您只需将设备靠在一起（通常是背靠背）然后触摸屏幕即可，所分享的内容是由该应用程序确定的。"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"打开此功能后，您只需将自己的设备与另一台支持 NFC 的设备靠在一起，即可将您设备上的应用内容同步分享给对方。例如，您可以发送网页、YouTube 视频、联系人等等。"\n\n"您只需将设备靠在一起（通常是背靠背）然后触摸屏幕即可，所分享的内容由相应的应用确定。"</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"网络服务发现"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"允许其他设备上的应用发现此设备上的应用"</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="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_setup_wizard_title" msgid="70277346338812325">"选择 Wi-Fi"</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>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"扫描不到网络"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"网络通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"附近有开放网络时通知我"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"不采用状况差的连接"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"仅在 Wi-Fi 互联网连接状况良好时使用 Wi-Fi 网络"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"不采用状况不佳的连接"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"仅在 Wi-Fi 互联网连接状况良好时使用 Wi-Fi 网络"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"在休眠状态下保持 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_wps_pbc" msgid="2668564692207863017">"WPS 按钮"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 输入"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</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_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_empty_list_wifi_on" msgid="3354911729026237372">"正在搜索 Wi-Fi 网络…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"其他网络…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"自动设置 (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"显示高级选项"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"键入从接入点获取的 PIN"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS 设置"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"键入接入点上的 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_wps_setup_title" msgid="6034518116333042484">"Wi-Fi 保护设置"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在启动 WPS..."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"请按下您路由器上的 Wi-Fi 保护设置按钮，它可能会标为“WPS”或包含此符号："</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"请在 Wi-Fi 路由器上输入 PIN <xliff:g id="NUMBER">%1$s</xliff:g>。设置过程最多可能需要两分钟时间才能完成。"</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 已成功启动。正在连接网络..."</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"已连接到 Wi-Fi 网络 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"正在设置 WPS，此过程最多可能需要两分钟时间才能完成"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS 未能成功启动。请过几分钟后重试。"</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"无线路由器安全设置 (WEP) 不受支持"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"无线路由器安全设置 (TKIP) 不受支持"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"身份验证失败。请重试。"</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"检测到其他 WPS 会话。请过几分钟后重试。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"网络 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"信号强度"</string>
@@ -524,7 +546,7 @@
     <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>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"已保存"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"已停用状况不佳的互联网连接"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"系统因连接状况不佳而停用了该网络。您可以通过“设置”&gt;“Wi-Fi”屏幕中的“高级”菜单项关闭此功能。"</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="3538912605343585226">"受保护的网络可用"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" （受保护的网络可用）"</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_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_failed_connect_message" msgid="8491902558970292871">"无法连接网络"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"取消保存"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"无法取消保存网络"</string>
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"无法保存网络"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"检测到另一个 Wi-Fi 保护会话。请过几分钟后重试。"</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>
@@ -568,35 +590,36 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"域名 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"网关"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"网络前缀长度"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"设置对等连接"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"设备信息"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi 保护设置"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"键入 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_remove_group" msgid="4844634506540667517">"删除群组"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"高级"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"可用设备"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"搜索设备"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"正在搜索…"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"重命名设备"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"对等设备"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"无法连接。"</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"无法重命名设备。"</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"断开连接？"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"如果断开连接，您与<xliff:g id="PEER_NAME">%1$s</xliff:g>的连接将中断。"</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"如果断开连接，您与<xliff:g id="PEER_NAME">%1$s</xliff:g>和另外 <xliff:g id="PEER_COUNT">%2$s</xliff:g> 台设备的连接将中断。"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀请？"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"要取消连接<xliff:g id="PEER_NAME">%1$s</xliff:g>的邀请吗？"</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_ap_text" msgid="61237027772641155">"设置 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>
-    <string name="silent_mode_title" msgid="3181479108593217704">"静音模式"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"音乐效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"铃声音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"静音时振动"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"振动并响铃"</string>
     <string name="notification_sound_title" msgid="312032901303146002">"默认通知"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"有通知时指示灯闪烁"</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>
@@ -604,7 +627,7 @@
     <string name="media_volume_title" msgid="3576565767317118106">"媒体"</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="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>
@@ -614,23 +637,28 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"使铃声和通知静音"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"使音乐和其他媒体静音"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"使通知静音"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"使闹钟静音"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"响铃时振动"</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_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="9015625921245904495">"您必须先将平板电脑插入基座才能设置基座音频。"</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"您必须先将手机插入基座才能设置基座音频。"</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="8405432495282299143">"您需要先将平板电脑插入基座，才能设置基座音频。"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"您需要先将手机插入基座，才能设置基座音频。"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"插入基座提示音"</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="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="account_settings" msgid="6403589284618783461">"帐户"</string>
     <string name="search_settings" msgid="1910951467596035063">"搜索"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜索设置和历史记录"</string>
     <string name="display_settings" msgid="7965901687241669598">"显示"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -723,11 +751,11 @@
     <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="7064506641121346242">"应用程序"</string>
+    <string name="memory_apps_usage" msgid="7064506641121346242">"应用"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"媒体"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"下载内容"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"图片、视频"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"音频文件（音乐、铃声、播客等）"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"音频（音乐、铃声、播客等）"</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>
@@ -746,8 +774,8 @@
     <string name="read_only" msgid="6702420168629076340">" （只读）"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"要卸载 USB 存储设备吗？"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"要卸载 SD 卡吗？"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"如果卸载该 USB 存储设备，您当前使用的某些应用程序会停止运行，并且在您重新装载该设备前可能都无法使用。"</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"如果卸载该 SD 卡，您当前使用的某些应用程序会停止，并且在您重新装载该 SD 卡前，这些应用程序可能都无法使用。"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"如果卸载该 USB 存储设备，您当前使用的某些应用会停止运行，并且在您重新装载该设备前可能都无法使用。"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"如果卸载该 SD 卡，您当前使用的某些应用会停止，并且在您重新装载该 SD 卡前，这些应用可能都无法使用。"</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"无法卸载 USB 存储设备，请稍后重试。"</string>
@@ -760,9 +788,9 @@
     <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_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_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>
@@ -808,8 +836,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板电脑上的所有数据"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手机上的所有数据"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内存设备"</b>"中的所有数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统及应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"此操作会清除您手机"<b>"内存设备"</b>"中的所有数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统及应用程序数据和设置"</li>\n<li>"已下载的应用程序"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内存设备"</b>"中的所有数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"此操作会清除您手机"<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="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB 存储设备"</b>"。"</string>
@@ -820,10 +848,10 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除 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="7209547812233487345">"要清除所有个人信息和下载的应用程序吗？请注意，此操作无法撤消！"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"要清除所有个人信息和下载的应用吗？请注意，此操作无法撤消！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部内容"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"绘制您的解锁图案"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"您必须绘制解锁图案才能确认恢复出厂设置。"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"您需要绘制解锁图案以确认要恢复出厂设置。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"“系统清除”服务不可用，因此未执行重置操作。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"要重置吗？"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"格式化 USB 存储设备"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"要清空该 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="nosdcard" msgid="2192044794228379224">"您需要绘制解锁图案以确认要清空 USB 存储设备。"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"您需要绘制解锁图案以确认要清空 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="6688416425801386511">"USB 共享网络"</string>
@@ -870,10 +898,10 @@
     <string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google 的位置服务"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"允许应用程序使用来自 Wi-Fi 或移动网络的数据确定您的大致位置"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"允许系统向 Google 发送匿名位置数据。同时允许具有权限的应用使用来自 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="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>
@@ -915,7 +943,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"按 MENU 获得帮助。"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"完成后松开手指。"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"至少连接 <xliff:g id="NUMBER">%d</xliff:g> 个点，请重试："</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"图案已记录！"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"图案已记录。"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"再次绘制图案进行确认："</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"您的新解锁图案："</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"确认"</string>
@@ -937,22 +965,23 @@
     <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"保护您的平板电脑"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"手机安全设置"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"创建个人屏幕解锁图案可防止他人未经许可使用您的平板电脑。用手指按任意顺序连接下一屏幕上的点，但至少要连接四个点。"\n\n"准备好开始了吗？请触摸“下一步”。"</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"创建个人屏幕解锁图案可防止他人未经许可使用您的平板电脑。在下一屏幕上用手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗？请触摸“下一步”。"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"创建个人屏幕解锁图案可防止他人未经许可使用您的手机。在下一屏幕上滑动手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗？请触摸“下一步”。"</string>
-    <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理应用程序"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用程序"</string>
-    <string name="applications_settings" msgid="1721442176406964682">"应用程序"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"管理应用程序、设置快速启动快捷方式"</string>
-    <string name="applications_settings_header" msgid="1014813055054356646">"应用程序设置"</string>
+    <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理应用"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用"</string>
+    <string name="applications_settings" msgid="1721442176406964682">"应用"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"管理应用、设置快速启动快捷方式"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"应用设置"</string>
     <string name="install_applications" msgid="4872012136210802181">"未知来源"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"允许安装不是从电子市场获取的应用程序"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"您的平板电脑和个人数据更容易受到从未知来源获取的应用程序的攻击。对于因使用这些应用程序而造成的平板电脑损坏或数据丢失，您同意自行承担全部责任。"</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"您的手机和个人数据更容易受到从未知来源获取的应用程序的攻击。对于因使用这些应用程序而造成的手机损坏或数据丢失，您同意自行承担全部责任。"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"允许安装来自未知来源的应用"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"您的平板电脑和个人数据更容易受到从未知来源获取的应用的攻击。对于因使用这些应用而造成的平板电脑损坏或数据丢失，您同意自行承担全部责任。"</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"您的手机和个人数据更容易受到从未知来源获取的应用的攻击。对于因使用这些应用而造成的手机损坏或数据丢失，您同意自行承担全部责任。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"高级设置"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"启用更多设置选项"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"应用程序信息"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"应用信息"</string>
     <string name="storage_label" msgid="8700867073480107253">"存储"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"默认启动"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"默认操作"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"屏幕兼容性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"权限"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"缓存"</string>
@@ -961,8 +990,8 @@
     <string name="controls_label" msgid="7611113077086853799">"控件"</string>
     <string name="force_stop" msgid="7435006169872876756">"强行停止"</string>
     <string name="total_size_label" msgid="1048676419552557254">"总计"</string>
-    <string name="application_size_label" msgid="8494609207373874267">"应用程序"</string>
-    <string name="external_code_size_label" msgid="3459343140355961335">"USB 存储（应用程序）"</string>
+    <string name="application_size_label" msgid="8494609207373874267">"应用"</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>
@@ -971,17 +1000,22 @@
     <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="2652825923953591251">"您已选择在默认情况下对某些操作启动此应用程序。"</string>
+    <string name="auto_launch_enable_text" msgid="2652825923953591251">"您已选择在默认情况下对某些操作启动此应用。"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"您已选择允许该应用创建窗口小部件并访问其数据。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"无默认设置。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除默认设置"</string>
-    <string name="screen_compatibility_text" msgid="1616155457673106022">"此应用程序可能不是针对您的屏幕设计的。您可以在此处调整其显示尺寸/比例，让它适合您的屏幕。"</string>
+    <string name="screen_compatibility_text" msgid="1616155457673106022">"此应用可能不是针对您的屏幕设计的。您可以在此处调整其显示尺寸/比例，让它适合您的屏幕。"</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"启动时确认"</string>
-    <string name="enable_compatibility" msgid="5806819252068617811">"调整应用程序的显示尺寸/比例"</string>
+    <string name="enable_compatibility" msgid="5806819252068617811">"调整应用的显示尺寸/比例"</string>
     <string name="unknown" msgid="1592123443519355854">"未知"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"按名称排序"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"按大小排序"</string>
     <string name="show_running_services" msgid="5736278767975544570">"显示当前运行的服务"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"显示缓存进程"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"重置应用偏好设置"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"要重置应用偏好设置吗？"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"此操作将会重置以下全部偏好设置："\n\n<li>"停用的应用"</li>\n<li>"停用的应用通知"</li>\n<li>"执行操作的默认应用"</li>\n<li>"应用的后台数据限制"</li>\n\n"您将不会丢失任何应用数据。"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"重置应用"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空间"</string>
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"选择过滤选项"</string>
@@ -991,27 +1025,27 @@
     <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="7336588977497084921">"无应用程序。"</string>
+    <string name="no_applications" msgid="7336588977497084921">"无应用。"</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>
     <string name="recompute_size" msgid="7722567982831691718">"正在重新计算大小..."</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"要删除应用程序数据吗？"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"系统会永久删除此应用程序的所有数据。删除的内容包括所有文件、设置、帐户、数据库等。"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"要删除应用数据吗？"</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"系统会永久删除此应用的所有数据。删除的内容包括所有文件、设置、帐户、数据库等。"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"确定"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"取消"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
-    <string name="app_not_found_dlg_text" msgid="8333723538280257243">"在已安装应用程序的列表中找不到该应用程序。"</string>
-    <string name="clear_data_failed" msgid="1907582169616856698">"无法清除应用程序数据。"</string>
+    <string name="app_not_found_dlg_text" msgid="8333723538280257243">"在已安装应用的列表中找不到该应用。"</string>
+    <string name="clear_data_failed" msgid="1907582169616856698">"无法清除应用数据。"</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"要卸载更新吗？"</string>
-    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"系统将会卸载此 Android 系统应用程序的所有相关更新。"</string>
+    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"系统将会卸载此 Android 系统应用的所有相关更新。"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"清除数据"</string>
-    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"无法清除应用程序数据。"</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"此应用程序有权访问您平板电脑上的以下内容："</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"此应用程序有权访问您手机上的以下内容："</string>
+    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"无法清除应用数据。"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"此应用有权访问您平板电脑上的以下内容："</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"此应用有权访问您手机上的以下内容："</string>
     <string name="computing_size" msgid="1599186977475211186">"正在计算..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"无法计算包大小"</string>
-    <string name="empty_list_msg" msgid="5993162337235907160">"未安装任何第三方应用程序。"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"无法计算包的大小。"</string>
+    <string name="empty_list_msg" msgid="5993162337235907160">"未安装任何第三方应用。"</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>
@@ -1020,30 +1054,32 @@
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"移至 SD 卡"</string>
     <string name="moving" msgid="6431016143218876491">"正在移动"</string>
     <string name="insufficient_storage" msgid="481763122991093080">"存储空间不足。"</string>
-    <string name="does_not_exist" msgid="3476487214886606748">"应用程序不存在。"</string>
-    <string name="app_forward_locked" msgid="6331564656683790866">"应用程序受版权保护。"</string>
+    <string name="does_not_exist" msgid="3476487214886606748">"应用不存在。"</string>
+    <string name="app_forward_locked" msgid="6331564656683790866">"应用受版权保护。"</string>
     <string name="invalid_location" msgid="2786030127356312746">"安装位置无效。"</string>
     <string name="system_package" msgid="6222593098063037137">"无法在外部介质上安装系统更新。"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"要强行停止吗？"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"强行停止某个应用程序可能会导致其出现异常。"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"强行停止某个应用可能会导致其出现异常。"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
-    <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"无法移动应用程序。<xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"无法移动应用。<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="5155453752692959098">"更改安装新应用程序时使用的首选安装位置"</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"要停用内置应用程序吗？"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"如果停用内置应用程序，其他应用程序可能会出现异常。"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"更改安装新应用时使用的首选安装位置"</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"要停用内置应用吗？"</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"如果停用内置应用，其他应用可能会出现异常。"</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"要关闭通知吗？"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"如果关闭此应用的通知，您可能会错过重要提醒和最新动态信息。"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"存储空间使用情况"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看应用程序使用的存储空间"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看应用使用的存储空间"</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="818675099014723551">"已由应用程序启动。"</string>
+    <string name="service_started_by_app" msgid="818675099014723551">"已由应用启动。"</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="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 />
@@ -1051,15 +1087,15 @@
     <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="3224004818524731568">"正在运行的应用程序"</string>
+    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"正在运行的应用"</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="9146619928198961643">"此服务由其应用程序启动。停止服务可能会导致应用程序无法运行。"</string>
-    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"无法安全地停止该应用程序。如果强行停止，可能会导致您目前的部分工作内容丢失。"</string>
-    <string name="background_process_stop_description" msgid="5034773197139654588">"这是旧应用程序进程，仍在运行，以备不时之需。通常不建议停止。"</string>
+    <string name="service_stop_description" msgid="9146619928198961643">"此服务由其应用启动。停止服务可能会导致应用无法运行。"</string>
+    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"无法安全地停止该应用。如果强行停止，可能会导致您目前的部分工作内容丢失。"</string>
+    <string name="background_process_stop_description" msgid="5034773197139654588">"这是旧应用进程，仍在运行，以备不时之需。通常不建议停止。"</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="1130702347066340890">"正在使用的主要进程。"</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"正在使用服务<xliff:g id="COMP_NAME">%1$s</xliff:g>。"</string>
@@ -1068,7 +1104,7 @@
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"如果停止此服务，您平板电脑上的某些功能也将随之停止工作，并在您将平板电脑关机然后再重新打开后才能使用。"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果停止此服务，您手机上的某些功能也将随之停止工作，并在您将手机关机然后再重新打开后才能使用。"</string>
     <string name="language_settings" msgid="5292716747264442359">"语言和输入法"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"语言和输入设备"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"语言和输入法"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"语言设置"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"键盘和输入法"</string>
     <string name="phone_language" msgid="8870144109924299673">"语言"</string>
@@ -1080,37 +1116,56 @@
     <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="3001113966880559611">"使密码可见"</string>
+    <string name="show_password" msgid="3001113966880559611">"显示密码"</string>
     <string name="show_password_summary" msgid="7345931695292850058"></string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"此输入法可能会收集您输入的所有文字，包括密码和信用卡号等个人数据。它源自应用程序“<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>”。要使用此输入法吗？"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"此拼写检查工具可能会收集您键入的所有文字，包括密码和信用卡号等个人数据。它源自应用程序“<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>”。要使用此拼写检查工具吗？"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"此输入法可能会收集您输入的所有文字，包括密码和信用卡号等个人数据。它源自应用“<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>”。要使用此输入法吗？"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"此拼写检查工具可能会收集您键入的所有文字，包括密码和信用卡号等个人数据。它源自应用“<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>”。要使用此拼写检查工具吗？"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"设置"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"语言"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"无法打开 <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> 的设置"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"鼠标/触控板"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"指针速度"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"游戏控制器"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"使用振动器"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"连接后将振动器重定向到游戏控制器。"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"选择键盘布局"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"设置键盘布局"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"要切换，请按 Ctrl+空格键"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"默认"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"键盘布局"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"用户词典"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"个人词典"</string>
     <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_add_screen_title" msgid="742580720124344291">"词组"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"显示更多选项"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"隐藏部分选项"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"确定"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"字词："</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"快捷键："</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"语言："</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="8165273379942105271">"用户词典中没有您定义的任何字词。您可以触摸“添加”(+) 按钮添加字词。"</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"所有语言"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"所有语言"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"更多语言..."</string>
     <string name="testing" msgid="6584352735303604146">"测试"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板电脑信息"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手机信息"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"电池信息"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"快速启动"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"设置启动应用程序的键盘快捷键"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"分配给应用程序"</string>
+    <string name="quick_launch_summary" msgid="8101133819188001190">"设置启动应用的键盘快捷键"</string>
+    <string name="quick_launch_assign_application" msgid="6240064079456617501">"分配给应用"</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_ok_button" msgid="2634568926597586716">"确定"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"取消"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"应用程序"</string>
+    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"应用"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"快捷方式"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"文字输入"</string>
     <string name="input_method" msgid="5434026103176856164">"输入法"</string>
@@ -1130,19 +1185,30 @@
     <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="1815795401632854041">"设置应用程序开发选项"</string>
+    <string name="development_settings_summary" msgid="1815795401632854041">"设置应用开发选项"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 调试"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"连接 USB 后启用调试模式"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"开发设备 ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"无法读取设备信息"</string>
-    <string name="keep_screen_on" msgid="1146389631208760344">"保持唤醒状态"</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="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="7316799925425402244">"USB 调试仅适用于开发工作。该功能可用于在您的计算机和设备之间复制数据、在您的设备上安装应用程序而不发送通知以及读取日志数据。"</string>
+    <string name="adb_warning_message" msgid="7316799925425402244">"USB 调试仅适用于开发工作。该功能可用于在您的计算机和设备之间复制数据、在您的设备上安装应用而不发送通知以及读取日志数据。"</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"允许开发设置？"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"这些设置仅适用于开发工作。一旦启用，会导致您的设备以及设备上的应用崩溃或出现异常。"</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"对 USB 存储设备进行读写保护"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"应用必须请求读取 USB 存储设备的权限"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"要对 USB 存储设备进行读写保护吗？"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"如果 USB 存储设备受到读写保护，则应用必须请求相关权限才能读取外部存储设备中的数据。"\n\n"某些应用需要其开发人员更新之后才能正常使用。"</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"对 SD 卡进行读写保护"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"应用必须请求读取 SD 卡的权限"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"要对 SD 卡进行读写保护吗？"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"如果 SD 卡受到读写保护，则应用必须请求相关权限才能读取外部存储设备中的数据。"\n\n"某些应用需要其开发人员更新之后才能正常使用。"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"选择小工具"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"选择窗口小部件"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否允许该应用创建并访问窗口小部件？"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"当您创建窗口小部件后，<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>能够访问其显示的所有数据。"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"始终允许<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>创建窗口小部件并访问其数据"</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>
@@ -1150,7 +1216,7 @@
     <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="5440362857006046193">"应用程序"</string>
+    <string name="app_name_label" msgid="5440362857006046193">"应用"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"次数"</string>
     <string name="usage_time_label" msgid="295954901452833058">"使用时间"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"辅助功能"</string>
@@ -1160,12 +1226,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"大号字体"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"按“电源”按钮结束通话"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"说出密码"</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="3264723681038625967">"安装网页脚本"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"增强网页辅助功能"</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>
@@ -1179,15 +1242,13 @@
     <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"触摸“确定”会停用<xliff:g id="SERVICE">%1$s</xliff:g>。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安装任何服务"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要屏幕阅读器吗？"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"“话语提示”可提供语音反馈以帮助盲人和有视力障碍的用户。您要通过 Android 电子市场免费安装该服务吗？"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"要安装网页脚本吗？"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"您要允许应用程序安装来自 Google 的脚本，以便于您浏览这些应用程序的网页内容吗？"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"此功能会更改您的设备对触摸的响应方式。要打开吗？"</string>
+    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"“话语提示”可提供语音反馈以帮助盲人和有视力障碍的用户。您要通过 Play 商店免费安装该服务吗？"</string>
+    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"您要允许应用安装来自 Google 的脚本，以便于您浏览这些应用的网页内容吗？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"没有提供说明。"</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_not_available" msgid="3214000535532434353">"无法获取电池使用数据。"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1231,8 +1292,8 @@
     <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="7861051816778419018">"应用程序信息"</string>
-    <string name="battery_action_app_settings" msgid="4570481408106287454">"应用程序设置"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"应用信息"</string>
+    <string name="battery_action_app_settings" msgid="4570481408106287454">"应用设置"</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>
@@ -1248,10 +1309,10 @@
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"蓝牙所耗的电量"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"请在不使用蓝牙功能时将其关闭"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"尝试连接另一蓝牙设备"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"应用程序所耗电量"</string>
-    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"停止或卸载应用程序"</string>
-    <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"手动控制 GPS，以阻止应用程序使用它"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"该应用程序中可能提供了用于减少耗电量的设置"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"应用所耗电量"</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"停止或卸载应用"</string>
+    <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"手动控制 GPS，以阻止应用使用它"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"该应用中可能提供了用于减少耗电量的设置"</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>
@@ -1269,7 +1330,7 @@
     <string name="tts_settings" msgid="8186971894801348327">"文字转语音设置"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"文字转语音 (TTS) 输出"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"总是使用我的设置"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"使用以下默认设置代替应用程序设置"</string>
+    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"使用以下默认设置代替应用设置"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"默认设置"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"默认引擎"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"设置用于文字语音转换的语音合成引擎"</string>
@@ -1279,13 +1340,13 @@
     <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_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" msgid="3305141107104670703">"您选择的引擎无法运行。"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"配置"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"选择其他引擎"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"此语音合成引擎能够收集语音中出现的所有信息，包括密码和信用卡号码之类的个人数据。此功能由 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 引擎提供。是否启用此语音合成引擎？"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"启用新引擎后才能使用。"</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"绘制您的解锁图案"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您需要绘制解锁图案，以确认凭据安装操作。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"键入凭据存储的密码。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"当前密码："</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"凭据存储已删除。"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"系统无法清除凭据存储。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"凭证存储已启用。"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"必须设置一个锁屏 PIN 或密码，然后才能使用凭据存储。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您需要先设置锁定屏幕 PIN 或密码才能使用凭据存储。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"备份和重置"</string>
@@ -1337,16 +1400,16 @@
     <string name="backup_section_title" msgid="7952232291452882740">"备份和还原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"个人数据"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"备份我的数据"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"将应用程序数据、Wi-Fi 密码和其他设置备份到 Google 服务器"</string>
+    <string name="backup_data_summary" msgid="9157861529438245957">"将应用数据、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="4235615056371993807">"重新安装某个应用程序后，系统会还原已经备份的设置和数据"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"重新安装某个应用后，系统会还原已经备份的设置和数据"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面备份密码"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"桌面完整备份当前未设置保护。"</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"选择以更改或删除桌面完整备份的密码"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"桌面完整备份当前未设置密码保护"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"触摸可更改或删除用于桌面完整备份的密码"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"要停止备份您的 Wi-Fi 密码、书签、其他设置以及应用程序数据，并清除 Google 服务器上的所有副本吗？"</string>
+    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"要停止备份您的 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>
@@ -1355,13 +1418,13 @@
     <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="2026747446313628233">"激活此管理器可允许应用程序“<xliff:g id="APP_NAME">%1$s</xliff:g>”执行以下操作："</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"此管理器已激活，允许应用程序“<xliff:g id="APP_NAME">%1$s</xliff:g>”执行以下操作："</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"激活此管理器可允许应用“<xliff:g id="APP_NAME">%1$s</xliff:g>”执行以下操作："</string>
+    <string name="device_admin_status" msgid="4252975713178851910">"此管理器已激活，允许应用“<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">"铃声和通知"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"系统"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"来电铃声和振动"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"系统"</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="3747859666621319757">"正在连接到 Wi-Fi 网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”..."</string>
@@ -1375,7 +1438,7 @@
     <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_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="5317003416385428036">"正在扫描查找网络..."</string>
@@ -1393,17 +1456,21 @@
     <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_failed" msgid="1696499856374109647">"同步失败"</string>
+    <string name="sync_active" msgid="8476943765960863040">"正在同步"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"同步"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"同步操作当前遇到了一些问题，很快便可恢复。"</string>
     <string name="add_account_label" msgid="7811707265834013767">"添加帐户"</string>
     <string name="background_data" msgid="5779592891375473817">"后台数据"</string>
-    <string name="background_data_summary" msgid="8328521479872763452">"应用程序可以随时同步、发送和接收数据"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"应用可以随时同步、发送和接收数据"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"要停用后台数据吗？"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"停用后台数据可延长电池待机时间并减少数据流量的使用，但某些应用程序可能仍会使用后台数据连接。"</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"自动同步应用程序数据"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"停用后台数据可延长电池待机时间并减少数据流量的使用，但某些应用可能仍会使用后台数据连接。"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"自动同步应用数据"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"同步功能已开启"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"同步功能已关闭"</string>
     <string name="sync_error" msgid="5060969083117872149">"同步出错"</string>
+    <string name="last_synced" msgid="4242919465367022234">"上次同步时间：<xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"正在同步…"</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>
@@ -1413,8 +1480,8 @@
     <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="6205903695598000286">"应用程序同步设置"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"欢迎使用 Google Sync！"</font>" "\n"这款数据同步工具可让您随时随地查看您的联系人、约会以及更多信息。"</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"应用同步设置"</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>
@@ -1424,10 +1491,11 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"要删除帐户吗？"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"删除该帐户会从平板电脑中删除所有相关的邮件、联系人以及其他数据。"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"删除该帐户会从手机中删除所有相关的邮件、联系人以及其它数据。"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"某些应用程序需要使用此帐户。您只有将平板电脑重置为出厂默认设置（此操作会删除您的所有个人数据），才能删除此帐户。您可以通过“设置”&gt;“备份和重置 ”执行此操作。"</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"某些应用程序需要使用此帐户。您只有将手机重置为出厂默认设置（此操作会删除您的所有个人数据），才能删除此帐户。您可以通过“设置”&gt;“备份和重置”执行此操作。"</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"某些应用需要使用此帐户。您只有将平板电脑重置为出厂默认设置（此操作会删除您的所有个人数据），才能删除此帐户。您可以通过“设置”&gt;“备份和重置 ”执行此操作。"</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"某些应用需要使用此帐户。您只有将手机重置为出厂默认设置（此操作会删除您的所有个人数据），才能删除此帐户。您可以通过“设置”&gt;“备份和重置”执行此操作。"</string>
     <string name="provider_label" msgid="7724593781904508866">"推送订阅"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"同步<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"无法手动同步"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"目前，此条目的同步功能已停用。要更改此设置，请暂时启用后台数据和自动同步功能。"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G 设置"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 地址"</string>
     <string name="enter_password" msgid="4131758584074246224">"键入密码以解密存储设备"</string>
     <string name="try_again" msgid="4272075051293936921">"请重试。"</string>
-    <string name="service_busy" msgid="2325014135156127705">"该服务正忙，请重试。"</string>
     <string name="delete" msgid="4219243412325163003">"删除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他文件"</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>
@@ -1443,41 +1510,66 @@
     <string name="select_all" msgid="1562774643280376715">"全选"</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="debug_debugging_category" msgid="6781250159513471316">"调试"</string>
+    <string name="debug_app" msgid="8349591734751384446">"选择调试应用"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"未设置任何调试应用"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"调试应用：<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"选择应用"</string>
+    <string name="no_application" msgid="2813387563129153880">"无"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"等待调试器"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"调试应用会在执行前等待附加调试器"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"输入"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"绘图"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"监控"</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_screen_updates" msgid="5470814345876056420">"显示面 (surface) 更新"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"窗口中的面 (surface) 更新时全部闪烁"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"显示 GPU 视图更新"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"使用 GPU 进行绘图时闪烁显示窗口中的视图"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"停用 HW 叠加层"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"始终使用 GPU 进行屏幕合成"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"启用跟踪"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"选择已启用的跟踪"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"当前未启用任何跟踪"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"当前已启用 <xliff:g id="NUM">%1$d</xliff:g> 项跟踪"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"当前已启用所有跟踪"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"显示布局边界"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"显示剪辑边界、边距等。"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"显示 CPU 使用情况"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"屏幕叠加层显示当前 CPU 使用情况"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"强制进行 GPU 渲染"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"在应用程序中使用 2D 硬件加速"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"强制使用 GPU 进行 2D 绘图"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"GPU 呈现模式分析"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"计算 adb shell dumpsys gfxinfo 中的呈现时间"</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="4206913653849771549">"应用程序"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"动画程序时长调整"</string>
+    <string name="debug_applications_category" msgid="4206913653849771549">"应用"</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="641908614413544127">"为后台应用程序显示“应用程序无响应”对话框"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"显示所有“应用无响应”(ANR)"</string>
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"为后台应用显示“应用无响应”对话框"</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_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_menu_metered" msgid="5056695223222541863">"移动热点"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"自动同步数据"</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="8621855507876539282">"没有任何应用程序在此期间产生过数据流量。"</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"没有任何应用在此期间产生过数据流量。"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"前台"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"后台"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"由您的平板电脑计算而得。您的运营商对于数据流量的计算可能有所不同。"</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"由您的手机计算而得。您的运营商对于数据流量的计算可能有所不同。"</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"受限"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"要停用移动数据吗？"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"设置移动数据流量限制"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"设置 4G 数据流量限制"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"移动网络"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"无"</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="8430240158135453271">"查看应用程序设置"</string>
+    <string name="data_usage_app_settings" msgid="8430240158135453271">"查看应用设置"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"限制后台数据"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"仅在使用移动数据网络时停用后台数据。系统会尽量使用 Wi-Fi 连接。"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"要限制此应用程序使用后台数据，请先设置移动数据上限。"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"使用移动网络时停用后台数据。系统会尽量使用非移动网络。"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"要限制此应用使用后台数据，请先设置移动数据上限。"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制后台数据？"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"在没有 Wi-Fi 连接的情况下，此功能可能导致需要后台数据的应用程序停止运行。"\n\n"您可以在相关应用程序内的设置中查找更合适的数据流量控制选项。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"只能连接到移动网络时，此功能可能会导致需要使用后台数据的应用停止运行。"\n\n"您可以在相关应用的设置中查找更合适的数据流量控制选项。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"您只有在设置移动数据上限后才能限制后台数据。"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"要打开自动同步数据功能吗？"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"您在网络上对您的帐户进行的所有更改都会自动同步到您的平板电脑。"\n\n"有些帐户还可以将您在平板电脑上进行的所有更改自动同步到网络上。这就是 Google 帐户的精彩之处。"\n\n"要选择每个帐户中要同步哪些类型的信息，请转到“设置 &gt; 帐户”。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"您在网络上对您的帐户进行的所有更改都会自动同步到您的手机。"\n\n"有些帐户还可以将您在手机上进行的所有更改自动同步到网络上。这就是 Google 帐户的精彩之处。"\n\n"要选择每个帐户中要同步哪些类型的信息，请转到“设置 &gt; 帐户”。"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"要关闭自动同步数据功能吗？"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"这样可以节省数据流量和电池电量，但您需要手动同步每个帐户才能收集最新信息，并且在有更新时不会收到通知。"</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_warning_editor_title" msgid="3704136912240060339">"设置流量使用量警告"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"设置数据使用限制"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"正在限制数据使用量"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"达到指定的数据使用上限时，系统会停用您的<xliff:g id="NETWORKS">%1$s</xliff:g>数据连接。"\n\n"由于数据流量是由您的平板电脑计算而得的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"达到指定的数据使用上限时，系统会停用您的<xliff:g id="NETWORKS">%1$s</xliff:g>数据连接。"\n\n"由于数据流量是由您的手机计算而得的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"达到指定的数据流量上限时，系统会停用您的移动数据连接。"\n\n"由于数据流量是由您的平板电脑计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"达到指定的数据流量上限时，系统会停用您的移动数据连接。"\n\n"由于数据流量是由您的手机计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制后台数据？"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果限制后台移动数据，那么除非您已连接到 Wi-Fi 网络，否则部分应用程序和服务会无法运行。"</string>
+    <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果限制后台移动数据，那么除非您已连接到 Wi-Fi 网络，否则部分应用和服务会无法运行。"</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_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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用约 <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用约 <xliff:g id="TOTAL">%1$s</xliff:g>。"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用约 <xliff:g id="TOTAL">%1$s</xliff:g>，由您的平板电脑计算得出。您的运营商对于流量的计算方法可能有所不同。"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用约 <xliff:g id="TOTAL">%1$s</xliff:g>，由您的手机计算得出。您的运营商对于流量的计算方法可能有所不同。"</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"移动热点"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"选择属于移动热点的 Wi-Fi 网络。这样可限制应用在后台使用这些网络。应用在使用这些网络下载较大的文件时，还可能会发出警告。"</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"移动网络"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi 网络"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"要选择移动热点，请打开 Wi-Fi。"</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"修改 VPN 配置文件"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"连接到<xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"添加 VPN 配置文件"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"修改配置文件"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"删除配置文件"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"目前没有网络连接。请稍后重试。"</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"证书缺失。请修改配置文件。"</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"打开“触摸浏览”功能后，您可以触摸屏幕以了解手指触摸处的组件。例如，当前屏幕中包含应用程序图标，您可以触摸屏幕，然后随意滑动手指，找出其中某个应用程序。"</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"做得不错！请继续在屏幕上随意滑动您的手指，至少再找到一个图标。"</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"要激活您正触摸的应用程序，只需点按一下即可。滑动您的手指，直到找到“<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="8764686624055084454">"要滚动浏览列表，您可以沿着屏幕滑动两根手指。例如，当前屏幕包含了一个应用程序名称列表，可供您上下滚动浏览。请先使用一根手指四处滑动，尝试找出列表中的几个项目。"</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="3055831259260848004">"您已经学完了本教程。要退出，请找到“<xliff:g id="FINISH">%s</xliff:g>”按钮并触摸一下。"</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"拼写更正"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"拼写检查工具"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"在此键入您当前的完整备份密码"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"在此键入新的完整备份密码"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"在此重新键入新的完整备份密码"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"取消"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"其他系统更新"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"用户和限制"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"用户"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"修改详细信息"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"用户信息"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"用户名"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"内容限制"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"需要 PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"内容分级"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"系统应用"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"已安装的应用"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"舍弃"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"删除用户"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"是否删除用户？"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"您确定要从设备中删除该用户和所有相关数据吗？"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"显示通知"</string>
+    <string name="help_label" msgid="1107174367904110532">"帮助"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 2394270..7723ee9 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"中斷連線中…"</item>
     <item msgid="1634960474403853625">"已中斷連線"</item>
     <item msgid="746097431216080650">"失敗"</item>
+    <item msgid="6367044185730295334">"已封鎖"</item>
+    <item msgid="503942654197908005">"目前正暫時避開品質不佳的連線"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <item msgid="7698638434317271902">"正在中斷 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 連線 ..."</item>
     <item msgid="197508606402264311">"已中斷連線"</item>
     <item msgid="8578370891960825148">"失敗"</item>
+    <item msgid="5660739516542454527">"已封鎖"</item>
+    <item msgid="1805837518286731242">"目前正暫時避開品質不佳的連線"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按鈕"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"PEAP"</item>
     <item msgid="8667872640594311615">"TLS"</item>
     <item msgid="7182812872984827322">"TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"無"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"從存取點產生 PIN"</item>
-    <item msgid="7364462169350112617">"從這個裝置產生 PIN"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
     <item msgid="628395202971532382">"靜態"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"卸除式 SD 卡"</item>
     <item msgid="4498124044785815005">"讓系統決定"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"關閉"</item>
-    <item msgid="4804571292609523335">"震動"</item>
-    <item msgid="595707141547423573">"靜音"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
@@ -233,7 +228,7 @@
   </string-array>
   <string-array name="window_animation_scale_entries">
     <item msgid="8134156599370824081">"關閉動畫"</item>
-    <item msgid="6624864048416710414">"動畫比例 .5x"</item>
+    <item msgid="6624864048416710414">"動畫比例 0.5x"</item>
     <item msgid="2219332261255416635">"動畫比例 1x"</item>
     <item msgid="3544428804137048509">"動畫比例 1.5x"</item>
     <item msgid="3110710404225974514">"動畫比例 2x"</item>
@@ -242,13 +237,22 @@
   </string-array>
   <string-array name="transition_animation_scale_entries">
     <item msgid="8464255836173039442">"關閉動畫"</item>
-    <item msgid="3375781541913316411">"動畫比例 .5x"</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="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"關閉動畫"</item>
+    <item msgid="1138649021950863198">"動畫比例 0.5x"</item>
+    <item msgid="4394388961370833040">"動畫比例 1x"</item>
+    <item msgid="8125427921655194973">"動畫比例 1.5x"</item>
+    <item msgid="3334024790739189573">"動畫比例 2x"</item>
+    <item msgid="3170120558236848008">"動畫比例 5x"</item>
+    <item msgid="1069584980746680398">"動畫比例 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準限制"</item>
     <item msgid="4071574792028999443">"不執行背景處理程序"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 907372f..f741612 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"是"</string>
     <string name="no" msgid="6731231425810196216">"否"</string>
+    <string name="create" msgid="3578857613172647409">"建立"</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>
@@ -105,12 +106,14 @@
     <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="8002247464357005429">"顯示時限"</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>
     <string name="bluetooth_devices" msgid="1886018064039454227">"藍牙裝置"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"裝置名稱"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"裝置設定"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"個人資料設定"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"未設定名稱，使用帳戶名稱"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"掃描裝置"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"重新命名平板電腦"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"配對中..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"未命名的藍牙裝置"</string>
     <string name="progress_scanning" msgid="192587958424295789">"搜尋中"</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"輕觸即可配對"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"找不到附近的藍牙裝置。"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"藍牙配對要求"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"配對要求"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"輕觸即可和 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 進行配對"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"輕觸即可和「<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="device_picker" msgid="8398232791303186677">"藍牙裝置選擇器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"應用程式要求開啟藍牙功能，您要允許這項要求嗎？"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"平板電腦上的某個應用程式要求將平板電腦設成開放其他藍牙裝置搜尋，開放的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。您要允許這項要求嗎？"</string>
@@ -148,14 +150,14 @@
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"您手機中的某個應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒鐘，讓其他藍牙裝置可在這段時間內搜尋到您的手機。您要允許這項要求嗎？"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"平板電腦上的某個應用程式要求將平板電腦設成開放其他藍牙裝置搜尋，您要允許這項要求嗎？"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"您手機中的某個應用程式要求開啟藍牙功能，讓其他藍牙裝置可在這段時間內搜尋到您的手機。您要允許這項要求嗎？"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"開啟藍牙？"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"藍牙開啟中…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"正在關閉藍牙…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動連線"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"藍牙連線要求"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"輕觸即可連線至「<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_acceptance_dialog_text" msgid="6555508756987053866">"%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>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"確定"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"您所輸入的主機名稱無效。"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"您所輸入的排除清單格式有誤，請輸入以英文逗點分隔的排除網域清單。"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"您必須輸入連接埠欄位。"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"您必須填寫通訊埠欄位。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"若主機欄位空白，連接埠欄位也須空白。"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"您所輸入的通訊埠無效。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy，但其他應用程式不一定會採用這項設定。"</string>
@@ -224,23 +226,23 @@
     <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="sdcard_changes_instructions" msgid="1364712901180556244">"USB 傳輸線重新連接後，變更才會生效"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"重新連接 USB 傳輸線後，變更才會生效。"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"啟用 USB 大量儲存裝置"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"總容量 (bytes)："</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_not_present_status" product="nosdcard" msgid="1636218515775929394">"未掛接 USB 儲存裝置。"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"沒有 SD 卡。"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"可用容量 (bytes)："</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 卡已視為 USB 大量儲存裝置"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"現在可以安全移除 USB 儲存裝置了"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"現在可以安全移除 SD 卡了"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB 儲存裝置目前作為大量儲存裝置使用。"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD 卡目前作為大量儲存裝置使用。"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"現在可以放心移除 USB 儲存裝置了。"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"現在可以放心移除 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">"使用容量 (bytes)："</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="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB 儲存裝置已掛接為唯讀裝置。"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD 卡已掛接為唯讀裝置。"</string>
     <string name="skip_label" msgid="47510779345218297">"略過"</string>
     <string name="next_label" msgid="4693520878012668114">"下一頁"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"語言"</string>
@@ -266,8 +268,8 @@
     <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="roaming_warning" msgid="7625933694709170887">"允許漫遊服務時，您可能需要支付龐大的漫遊費用！"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"允許漫遊服務？"</string>
     <string name="networks" msgid="6333316876545927039">"選取電信業者"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"選擇網路業者"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期與時間"</string>
@@ -283,19 +285,21 @@
     <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="6951498879879281102">"選擇日期格式"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"提升臉部配對精準度"</string>
+    <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"加強臉部辨識精準度"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"生動度檢查"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"解鎖時需眨眼"</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="4608681417960923911">"輸入鎖定畫面上所要顯示的文字"</string>
-    <string name="location_settings_title" msgid="8935806698251432196">"位置資訊服務"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"輸入要在鎖定畫面上顯示的文字"</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>
@@ -306,37 +310,38 @@
     <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="923629233459331136">"您可以將帳戶、設定、已下載的應用程式資料、媒體和其他檔案內容予以加密。加密保護平板電腦之後，每次開機都需輸入解密用的數字 PIN 或密碼。如要解除加密狀態，必須恢復原廠設定，但這樣會清除平板電腦中的所有資料。"\n\n"加密作業可能超過 1 個小時。加密前請將平板電腦的電池充滿，而且加密完成前切勿拔除電源。加密作業若遭中斷，會造成資料遺失。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"您可以將帳戶、設定、已下載的應用程式資料、媒體和其他檔案內容予以加密。加密保護手機之後，每次開機都需輸入解密用的數字 PIN 或密碼。如要解除加密狀態，必須恢復原廠設定，但這樣會清除手機中的所有資料。"\n\n"加密作業可能超過 1 個小時。加密前請將手機的電池充滿，而且加密完成前切勿拔除電源。加密作業若遭中斷，會造成資料遺失。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將平板電腦加密，就必須在每次開機時輸入數字 PIN 或密碼，如此才能解密。如要解除加密狀態，必須恢復原廠設定，但這樣會清除平板電腦上的所有資料。"\n\n"加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電，並且在過程中讓平板電腦持續連接電源，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將手機加密，就必須在每次開機時輸入數字 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="2029407131227814893">"將電池充電，然後再試一次。"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"連接充電器，再試一次。"</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_dialog_need_password_message" msgid="4071395977297369642">"您必須先設定鎖定螢幕的 PIN 或密碼，才能開始加密。"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"加密？"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"您無法取消加密操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，您的平板電腦會在過程中重新啟動數次。"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"您無法取消加密操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，您的手機會在過程中重新啟動數次。"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"加密中"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"平板電腦正在進行加密，請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"正在對手機加密，請稍候 (已完成 <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="2223340178473871064">"輸入密碼"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失敗"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"加密過程中斷且未完成，因此您無法繼續存取平板電腦上的資料。"\n\n"如要繼續使用平板電腦，您必須恢復平板電腦的原廠設定。完成重設後，您可以在設定平板電腦時將先前備份至「Google 帳戶」的任何資料還原。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"加密過程中斷且未完成，因此您無法繼續存取手機上的資料。"\n\n"如要繼續使用手機，您必須恢復手機的原廠設定。完成重設後，您可以在設定手機時將先前備份至「Google 帳戶」的任何資料還原。"</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"選擇螢幕鎖定方式"</string>
-    <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"選擇備份解鎖方式"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密過程中斷，無法完成，因此您再也不能存取平板電腦上的資料。"\n\n"如要恢復使用平板電腦，請先將平板電腦重設回原廠設定。完成重設後，您可以在設定平板電腦時，將先前備份至「Google 帳戶」的資料全部還原。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密過程中斷，無法完成，因此您再也不能存取手機上的資料。"\n\n"如要恢復使用手機，請先將手機重設回原廠設定。完成重設後，您可以在設定手機時，將先前備份至「Google 帳戶」的資料全部還原。"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"切換輸入法"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
+    <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"選擇備用解鎖方式"</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_backup_info_summary" msgid="108524727803788172">"「臉部辨識解鎖」無法順利辨識時，您要如何解鎖？"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"「人臉解鎖」無法順利辨識時，您要如何解鎖？"</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="8914673583104628191">"無安全性設定"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"臉部辨識解鎖"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"人臉解鎖"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"安全性低的實驗性設定"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"圖形"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"中等安全性設定"</string>
@@ -347,10 +352,10 @@
     <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_biometric_weak" msgid="3008473624490350142">"臉部辨識解鎖"</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_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"人臉解鎖"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"圖形"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"密碼"</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>
@@ -362,44 +367,44 @@
     <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="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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"密碼最多只能有 <xliff:g id="NUMBER">%d</xliff:g> 個字元。"</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN 最多只能有 <xliff:g id="NUMBER">%d</xliff:g> 個數字。"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN 只能包含數字 0-9。"</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"裝置管理員不允許使用最近用過的 PIN。"</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"密碼含有無效的字元。"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"密碼至少必須包含 1 個字母。"</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"密碼至少必須包含 1 個數字。"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"密碼至少必須包含 1 個符號。"</string>
   <plurals name="lockpassword_password_requires_letters">
-    <item quantity="one" msgid="1462968118065694590">"密碼至少必須包含 1 個字母"</item>
-    <item quantity="other" msgid="7278096339907683541">"密碼至少必須包含 %d 個字母"</item>
+    <item quantity="one" msgid="3063853802158131458">"密碼至少必須包含 1 個字母。"</item>
+    <item quantity="other" msgid="8186027808415585970">"密碼至少必須包含 %d 個字母。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_lowercase">
-    <item quantity="one" msgid="2048653993044269649">"密碼至少必須包含 1 個小寫字母"</item>
-    <item quantity="other" msgid="588499075580432178">"密碼至少必須包含 %d 個小寫字母"</item>
+    <item quantity="one" msgid="5583986519662091001">"密碼至少必須包含 1 個小寫字母。"</item>
+    <item quantity="other" msgid="2693910942679679225">"密碼至少必須包含 %d 個小寫字母。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_uppercase">
-    <item quantity="one" msgid="7677454174080582601">"密碼至少必須包含 1 個大寫字母"</item>
-    <item quantity="other" msgid="2183090598541826806">"密碼至少必須包含 %d 個大寫字母"</item>
+    <item quantity="one" msgid="2611909966725502768">"密碼至少必須包含 1 個大寫字母。"</item>
+    <item quantity="other" msgid="3030801209112209245">"密碼至少必須包含 %d 個大寫字母。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_numeric">
-    <item quantity="one" msgid="8585088032818933985">"密碼至少必須包含 1 個數字"</item>
-    <item quantity="other" msgid="995673409754935278">"密碼至少必須包含 %d 個數字"</item>
+    <item quantity="one" msgid="3820355568839621231">"密碼至少必須包含 1 個數字。"</item>
+    <item quantity="other" msgid="4703982391407595924">"密碼至少必須包含 %d 個數字。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_symbols">
-    <item quantity="one" msgid="3930886641317826293">"密碼至少必須包含 1 個特殊符號"</item>
-    <item quantity="other" msgid="3047460862484105274">"密碼至少必須包含 %d 個特殊符號"</item>
+    <item quantity="one" msgid="8456579939292408631">"密碼至少必須包含 1 個特殊符號。"</item>
+    <item quantity="other" msgid="1221290525051187757">"密碼至少必須包含 %d 個特殊符號。"</item>
   </plurals>
   <plurals name="lockpassword_password_requires_nonletter">
-    <item quantity="one" msgid="1716355580615489062">"密碼至少必須包含 1 個非字母字元"</item>
-    <item quantity="other" msgid="5574191164708145973">"密碼至少必須包含 %d 個非字母字元"</item>
+    <item quantity="one" msgid="4594051152085925921">"密碼至少必須包含 1 個非字母字元。"</item>
+    <item quantity="other" msgid="3952508584649046404">"密碼至少必須包含 %d 個非字母字元。"</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"裝置管理員不允許使用最近用過的密碼"</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"裝置管理員不允許使用最近用過的密碼。"</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="lock_setup" msgid="1759001157415978959">"設定完成"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"下一步"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"設定完成。"</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"如要與 <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 配對，請輸入裝置的密碼金鑰："</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_enter_pin_other_device" msgid="4637977124526813470">"您可能也必須在另一個裝置上輸入這個 PIN。"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"您可能也必須在另一個裝置上輸入這個密碼金鑰。"</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="2796550001376088433">"如要與 <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 配對，請輸入：<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>，然後按下 [返回] 或 [輸入]。"</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 配對，因為 PIN 或密碼金鑰不正確。"</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"無法與 <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_connecting_error_message" msgid="229861986106185022">"無法連線至「<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>
@@ -454,7 +459,7 @@
     <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_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>
@@ -471,52 +476,69 @@
     <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_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="5237208142892767592">"允許手機與其他裝置接觸時交換資料"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"允許平板電腦在與其他裝置接觸時交換資料"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"允許手機與其他裝置接觸時交換資料"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"準備就緒，可透過 NFC 傳輸應用程式內容"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"關閉"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC 已關閉，因此無法使用"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"這項功能啟用時，您只要將裝置靠在一起，即可讓應用程式內容傳輸至其他支援 NFC 的裝置。例如，您可以傳輸瀏覽器頁面、YouTube 影片、使用者聯絡人等內容。"\n\n"只要將裝置靠在一起 (一般都是背靠背)，然後輕觸螢幕，接著應用程式會決定要傳輸哪些內容。"</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"網路服務搜尋"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"允許其他裝置上的應用程式搜尋這個裝置上的應用程式"</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="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="6716593470710880000">"開啟 Wi-Fi？"</string>
+    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"選取 WiFi"</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="8652520421778203796">"處於飛行模式時"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"無法掃描網路"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"網路通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"有開放網路時通知我"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"避開品質不佳的連線"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"除非 Wi-Fi 網路連線狀態良好，否則不使用"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避開品質不佳的連線"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"除非 WiFi 網路連線穩定，否則不使用"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"休眠狀態仍保持 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_wps_pbc" msgid="2668564692207863017">"WPS 按鈕"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"輸入 WPS 個人識別碼"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"WiFi Direct"</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_empty_list_wifi_on" msgid="3354911729026237372">"正在搜尋  Wi-Fi 網路..."</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"其他網路..."</string>
+    <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定 (WPS)"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"顯示進階選項"</string>
-    <string name="wifi_network_setup" msgid="2243277654809358812">"WPS"</string>
-    <string name="wifi_wps_pin" msgid="8242979682530043184">"從存取點輸入 PIN"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"WPS 設定"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"在存取點上輸入 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_wps_setup_title" msgid="6034518116333042484">"WiFi 保護設定"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在啟動 WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"按下路由器上的 Wi-Fi 保護設定按鈕，該按鈕可能標示為「WPS」或含有這個符號："</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"請在 WiFi 路由器上輸入 PIN 碼：<xliff:g id="NUMBER">%1$s</xliff:g>。設定程序最多可能需要兩分鐘完成。"</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 成功，正在連線至網路…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"已連線至 WiFi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS 已開始執行，最多需要兩分鐘可完成"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS 無法成功啟動，請過幾分鐘後再試一次。"</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"不支援無線路由器安全性設定 (WEP)"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"不支援無線路由器安全性設定 (TKIP)"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"驗證失敗，請再試一次。"</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"偵測到另一個 WPS 工作階段，請稍候再試。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"網路 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"訊號強度"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"已儲存"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"已避開品質不佳的網際網路連線"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"已避開這個連線品質不佳的網路。您可以前往 [設定] &gt; [Wi-Fi 畫面]，選取 [進階] 選單項目關閉這個行為。"</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="3538912605343585226">"有可用的受保護網路"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (有可用的受保護網路)"</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_failed_connect_message" msgid="8491902558970292871">"無法連線至網路"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"清除"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"無法刪除網路"</string>
     <string name="wifi_save" msgid="3331121567988522826">"儲存"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"無法儲存網路"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"偵測到其他受保護的 Wi-Fi 工作階段，請稍候幾分鐘再試一次。"</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>
@@ -563,38 +585,39 @@
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"請輸入有效的 IP 位址。"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"輸入有效的閘道位址。"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"請輸入有效的 DNS 位址。"</string>
-    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"輸入長度介於 0 到 32 之間的網路首碼。"</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"輸入長度介於 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_network_prefix_length" msgid="3028785234245085998">"網路首碼長度"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"Wi-Fi Direct"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"設定點對點連線"</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_device_info" msgid="3191876744469364173">"裝置資訊"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Wi-Fi 保護設定"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"輸入 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_remove_group" msgid="4844634506540667517">"移除群組"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"進階"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"可用的裝置"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"搜尋裝置"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"搜尋中..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"重新命名裝置"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"對端裝置"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"無法連線。"</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"無法重新命名裝置。"</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"中斷連線？"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"如果您中斷連線，即會結束您與「<xliff:g id="PEER_NAME">%1$s</xliff:g>」的連線。"</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"如果您中斷連線，即會結束您與「<xliff:g id="PEER_NAME">%1$s</xliff:g>」和其他 <xliff:g id="PEER_COUNT">%2$s</xliff:g> 個裝置的連線。"</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀請？"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"您要取消 <xliff:g id="PEER_NAME">%1$s</xliff:g> 的連線邀請？"</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_ap_text" msgid="61237027772641155">"設定 WiFi 無線基地台"</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>
-    <string name="silent_mode_title" msgid="3181479108593217704">"靜音模式"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"音樂效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"鈴聲音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"靜音時震動"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"震動並響鈴"</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>
@@ -614,6 +637,11 @@
     <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="volume_ring_mute" msgid="3018992671608737202">"關閉鈴聲和通知音效"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"關閉音樂和其他媒體音效"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"關閉通知音效"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"關閉鬧鐘音效"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"鈴響時震動"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"您必須先將平板電腦安置於座架上，才能設定座架音效。"</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"您必須先將手機安置於座架上才能設定座架音效。"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"您必須先將平板電腦安置於座架上，才能設定座架音效。"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"您必須先將手機安置於座架上，才能設定座架音效。"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"座架插入音效"</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="account_settings" msgid="6403589284618783461">"帳戶"</string>
     <string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"管理搜尋設定和記錄"</string>
     <string name="display_settings" msgid="7965901687241669598">"顯示"</string>
@@ -642,7 +670,7 @@
     <string name="brightness" msgid="2354961343555249270">"亮度"</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="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="519078346877860129">"選擇桌布來源"</string>
     <string name="screensaver_settings_title" msgid="3848608373818910549">"螢幕保護程式模組"</string>
@@ -702,7 +730,7 @@
     <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_prl_version" msgid="1007470446618081441">"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>
@@ -715,7 +743,7 @@
     <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_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>
@@ -758,7 +786,7 @@
     <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_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>
@@ -792,7 +820,7 @@
     <string name="carrier_enabled" msgid="407655861175280806">"APN 啟用/停用"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN 已啟用"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN 已停用"</string>
-    <string name="bearer" msgid="594270280031923558">"承載者"</string>
+    <string name="bearer" msgid="594270280031923558">"承載系統"</string>
     <string name="menu_delete" msgid="6981294422841124659">"刪除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新增 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"儲存"</string>
@@ -821,9 +849,9 @@
     <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="7209547812233487345">"您要清除所有個人資訊和已下載的應用程式嗎？您無法復原這個動作！"</string>
-    <string name="master_clear_final_button_text" msgid="5390908019019242910">"清除全部"</string>
+    <string name="master_clear_final_button_text" msgid="5390908019019242910">"全部清除"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"畫出解鎖圖形"</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"您必須畫出解鎖圖形，以確認恢復原廠設定。"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"請畫出解鎖圖形，確認您要恢復原廠設定。"</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"無法使用 System Clear 服務，因此未執行任何重設。"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"您要重設嗎？"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"清除 USB 儲存裝置"</string>
@@ -838,8 +866,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"清除 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="nosdcard" msgid="2192044794228379224">"您必須畫出解鎖圖形以確認要清除 USB 儲存裝置的資料。"</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"請畫出解鎖圖形，確認您要清除 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="6688416425801386511">"USB 網路共用"</string>
@@ -870,7 +898,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"行動網路"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Google 的定位服務"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"讓應用程式使用 Wi-Fi 和行動網路等來源的資料測定您的約略位置"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"允許系統將匿名的位置資料傳送給 Google，也允許授權的應用程式使用 WiFi 和行動網路等來源資料判斷您的約略位置。"</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>
@@ -913,9 +941,9 @@
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"請再試一次："</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"畫出解鎖圖形"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"請按 [Menu] 以取得說明。"</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"完成後手指離開。"</string>
+    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"完成時請移開手指。"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"請連接至少 <xliff:g id="NUMBER">%d</xliff:g> 點。再試一次："</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"圖形已記錄！"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"圖形已記錄。"</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"再次畫出圖形以確認："</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"新的解鎖圖形："</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"確認"</string>
@@ -937,7 +965,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"保護平板電腦的安全"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"手機安全設定"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"建立個人螢幕解鎖圖形，避免有人擅自使用您的平板電腦。在下個畫面中，用手指任意連結螢幕中的點，至少連結四個點。"\n\n"準備開始了嗎？請輕觸 [下一步]。"</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"建立個人螢幕解鎖圖形，避免有心人士未經授權即擅自使用您的平板電腦。在下個畫面中，滑動手指任意連結螢幕中至少 4 個點。"\n\n"準備開始了嗎？請輕觸 [下一步]。"</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"建立個人螢幕解鎖圖形，避免他人未經授權擅自使用您的手機。請在下一個畫面中，滑動手指任意連接至少四個點。"\n\n"準備開始了嗎？請輕觸 [下一步]。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理應用程式"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和移除已安裝的應用程式"</string>
@@ -945,7 +973,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"管理應用程式，設定快速啟動鍵"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"應用程式設定"</string>
     <string name="install_applications" msgid="4872012136210802181">"不明的來源"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"允許安裝非 Market 應用程式"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"允許安裝來源不明的應用程式"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"來歷不明的應用程式可能會損害您的平板電腦及個人資料，如因使用這些應用程式導致平板電腦受損或資料遺失，請自行負責。"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"來歷不明的應用程式可能會損害您的手機及個人資料。如因使用這些應用程式導致手機受損或資料遺失，請自行負責。"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
@@ -953,6 +981,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"應用程式資訊"</string>
     <string name="storage_label" msgid="8700867073480107253">"儲存空間"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"預設為啟動"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"預設設定"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"螢幕相容性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"權限"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"快取"</string>
@@ -972,6 +1001,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"清除資料"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"解除安裝更新"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"您已預設在某些操作下啟動這個應用程式。"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"您已選擇允許這個應用程式建立小工具並存取其資料。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"沒有預設值。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除預設值"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"這個應用程式可能與您的螢幕不相容；您可以在這裡進行設定，將應用程式調整成與您的螢幕相容。"</string>
@@ -982,6 +1012,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"依大小排序"</string>
     <string name="show_running_services" msgid="5736278767975544570">"顯示執行中的服務"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"顯示快取處理程序"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"重設應用程式偏好設定"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"重設應用程式偏好設定？"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"這會將下列項目的所有偏好設定全部重設："\n\n" "<li>"已停用的應用程式"</li>\n" "<li>"已停用的應用程式通知"</li>\n" "<li>"執行動作的預設應用程式"</li>\n" "<li>"應用程式背景資料限制"</li>\n\n" 請放心，您的所有應用程式資料都不會遭到移除。"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"重設應用程式"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"選擇篩選器選項"</string>
@@ -1010,7 +1044,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"這個應用程式可存取您平板電腦中的下列項目："</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"這個應用程式可存取您手機上的下列項目："</string>
     <string name="computing_size" msgid="1599186977475211186">"計算中..."</string>
-    <string name="invalid_size_value" msgid="1901940003700269523">"無法計算封裝大小"</string>
+    <string name="invalid_size_value" msgid="7563537715280712285">"無法計算套件大小。"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"您並未安裝任何第三方應用程式。"</string>
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移動"</string>
@@ -1032,6 +1066,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"變更偏好的新應用程式安裝位置"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"您要停用內建應用程式嗎？"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"如果您停用內建應用程式，其他應用程式可能無法正常運作。"</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"關閉通知？"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"如果您關閉這個應用程式的通知，可能會錯失重要的警示與更新。"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"儲存空間使用量"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看應用程式的儲存空間使用量"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在運作的服務"</string>
@@ -1067,8 +1103,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"停止系統服務？"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"如果您停用這項服務，您的平板電腦上的某些功能可能無法正常運作，待您重新開機後才會恢復正常。"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果您停用這項服務，您的手機上的某些功能可能無法正常運作，待您重新開機後才會恢復正常。"</string>
-    <string name="language_settings" msgid="5292716747264442359">"語言與輸入裝置"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"語言與輸入裝置"</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="8275523930352487827">"鍵盤與輸入法"</string>
     <string name="phone_language" msgid="8870144109924299673">"語言"</string>
@@ -1084,19 +1120,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"此輸入法可能會收集您輸入的所有文字，包括密碼和信用卡號等個人資料。此輸入法來自「<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>」應用程式。是否要使用此輸入法？"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"這個拼字檢查程式可能會收集您輸入的所有文字，包括密碼和信用卡號等個人資料。該程式是由應用程式「<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>」所提供，要使用這個拼字檢查程式嗎？"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"設定"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"語言"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"無法開啟「<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>」的設定"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"滑鼠/觸控板"</string>
-    <string name="pointer_speed" msgid="1221342330217861616">"指標速度"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"游標速度"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"遊戲控制器"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"使用震動"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"連接時使遊戲控制器產生震動。"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"選擇鍵盤配置"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"設定鍵盤配置"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"如要切換，請按下 Ctrl+空白鍵。"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"預設"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"鍵盤配置"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"使用者字典"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"個人字典"</string>
     <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_add_screen_title" msgid="742580720124344291">"詞組"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"更多選項"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"較少選項"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"確定"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"字詞："</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"捷徑："</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"語言："</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="8165273379942105271">"您的使用者字典中沒有任何字詞，如要新增字詞，請輕觸 [新增] (+) 按鈕。"</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"所有語言"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"所有語言"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"更多語言..."</string>
     <string name="testing" msgid="6584352735303604146">"測試中"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板電腦資訊"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手機資訊"</string>
@@ -1133,16 +1188,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"設定應用程式開發選項"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 偵錯"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"連接 USB 時進入偵錯模式"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"開發裝置 ID"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"無法取得裝置資訊"</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="7316799925425402244">"USB 偵錯是針對應用程式開發而設計的功能，可讓您複製電腦和裝置中的資料、不需經由通知即可在裝置上安裝應用程式，以及讀取記錄資料。"</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"允許開發設定？"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"這些設定僅供開發之用，可能導致您的裝置及裝置中的應用程式毀損或運作異常。"</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"保護 USB 儲存裝置"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"應用程式必須取得權限，才能讀取 USB 儲存裝置"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"保護 USB 儲存裝置？"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB 儲存裝置受到保護時，應用程式必須取得權限，才能從外部儲存裝置讀取資料。"\n\n"部分應用程式可能需由開發人員更新，才能正常運作。"</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"保護 SD 卡"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"應用程式必須取得權限，才能讀取 SD 卡"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"保護 SD 卡？"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD 卡受到保護時，應用程式必須取得權限，才能從外部儲存裝置讀取資料。"\n\n"部分應用程式可能需由開發人員更新，才能正常運作。"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"選擇小工具"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"選擇小工具"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否要建立小工具並允許存取？"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"建立小工具後，<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> 即可存取所顯示的所有資料。"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"一律允許 <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> 建立小工具並存取其資料"</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>
@@ -1159,13 +1225,10 @@
     <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_speak_password_title" msgid="3344423945644925355">"朗讀密碼"</string>
-    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"輕觸探索"</string>
-    <string name="accessibility_touch_exploration_summary" msgid="1163951209315238103">"開啟 [輕觸探索] 時，您就能聽到或看到您手指觸碰到的描述。"\n\n"這項功能是專為視力不佳的使用者而設計的。"</string>
+    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"說出密碼"</string>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"輕觸並按住的延遲時間"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"安裝網路指令碼"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"強化網頁協助工具"</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>
@@ -1180,14 +1243,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安裝任何服務"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要螢幕閱讀器嗎？"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack 提供語音回應功能協助視障或視力不佳的使用者。現在可以免費從 Android Market 安裝這項功能，您要安裝嗎？"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"安裝網路指令碼？"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"您要允許應用程式安裝 Google 提供的指令碼，讓其網路內容更容易存取嗎？"</string>
-    <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"這項功能會變更裝置回應觸控的方式，確定要開啟嗎？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</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_not_available" msgid="3214000535532434353">"沒有電池用量資料。"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<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>
@@ -1213,7 +1274,7 @@
     <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_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>
@@ -1285,7 +1346,7 @@
     <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" msgid="3305141107104670703">"您選擇的引擎無法執行。"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"設定"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"選擇其他引擎"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"此語音合成引擎可能會收集您輸入的所有語音，包括密碼和信用卡號等個人資料。此引擎來自「<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>」引擎，是否要使用此語音合成引擎？"</string>
@@ -1301,7 +1362,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"請先啟用新引擎再使用。"</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>
@@ -1318,6 +1379,8 @@
     <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_install_gesture_prompt" msgid="2207390278112395082">"畫出解鎖圖形"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您必須畫出解鎖圖形，才能確認安裝憑證。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"輸入認證儲存空間的密碼。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"目前的密碼："</string>
@@ -1329,7 +1392,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"憑證儲存空間已清除。"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"無法清除認證儲存空間。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"已啟用認證儲存空間。"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"您必須先設定螢幕鎖定 PIN 或密碼，才能使用認證儲存空間。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您必須先設定螢幕鎖定 PIN 或密碼，才能使用憑證儲存空間。"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"備份與重設"</string>
@@ -1343,8 +1406,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"自動還原功能"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"重新安裝應用程式時，還原備份的設定和資料"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"電腦備份密碼"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"電腦完整備份目前未受保護。"</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"選取要變更或移除電腦完整備份的密碼"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"電腦完整備份目前未受保護"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"輕觸即可變更或移除電腦完整備份的密碼"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"停止備份您的 Wi-Fi 密碼、書籤、其他設定，以及應用程式資料，並清除 Google 伺服器上儲存的所有副本嗎？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"裝置管理設定"</string>
@@ -1359,9 +1422,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"這個管理員正在作業中，且允許 <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">"鈴聲與通知"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
-    <string name="sound_category_feedback_title" msgid="6047518536574673606">"系統"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"來電鈴聲與震動"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"系統"</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="3747859666621319757">"正在連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1393,7 +1456,9 @@
     <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_failed" msgid="1696499856374109647">"同步處理失敗"</string>
+    <string name="sync_active" msgid="8476943765960863040">"同步處理已啟用"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"同步處理"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"目前同步處理發生問題。稍後會回復正常。"</string>
     <string name="add_account_label" msgid="7811707265834013767">"新增帳戶"</string>
     <string name="background_data" msgid="5779592891375473817">"背景資料"</string>
@@ -1404,6 +1469,8 @@
     <string name="sync_enabled" msgid="4551148952179416813">"已開啟同步處理功能"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"已關閉同步處理功能"</string>
     <string name="sync_error" msgid="5060969083117872149">"同步處理錯誤"</string>
+    <string name="last_synced" msgid="4242919465367022234">"上次同步處理時間：<xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"目前正在同步處理..."</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>
@@ -1413,7 +1480,7 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"歡迎使用 Google Sync！"</font>\n"這是 Google 所提供的資料同步處理工具，可讓您隨時隨地存取通訊錄、約會等多種資料。"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"應用程式同步處理設定"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"資料及同步處理"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"變更密碼"</string>
@@ -1427,7 +1494,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"部分應用程式需要使用這個帳戶。如要移除帳戶，您必須將平板電腦重設為原廠設定 (系統會刪除您所有的個人資料)；請至 [設定] &gt; [備份] 進行重設。"</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"部分應用程式需要使用這個帳戶。如要移除帳戶，您必須先將手機重設為原廠設定 (系統會刪除您所有的個人資料)；請至 [設定] &gt; [備份與重設] 進行重設。"</string>
     <string name="provider_label" msgid="7724593781904508866">"發送訂閱"</string>
-    <string name="sync_item_title" msgid="1931551540462877488">"同步處理<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"無法手動同步處理"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"這個項目的同步處理功能已停用。如要變更這項設定，請暫時開啟背景資料與自動同步處理功能。"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"4G 設定"</string>
@@ -1435,7 +1503,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 位址"</string>
     <string name="enter_password" msgid="4131758584074246224">"輸入密碼即可為儲存裝置解密"</string>
     <string name="try_again" msgid="4272075051293936921">"請再試一次。"</string>
-    <string name="service_busy" msgid="2325014135156127705">"服務忙碌中，請再試一次。"</string>
     <string name="delete" msgid="4219243412325163003">"刪除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他檔案"</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>
@@ -1443,26 +1510,50 @@
     <string name="select_all" msgid="1562774643280376715">"全選"</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="debug_debugging_category" msgid="6781250159513471316">"偵錯"</string>
+    <string name="debug_app" msgid="8349591734751384446">"選取偵錯應用程式"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"未設定偵錯應用程式"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"偵錯應用程式：<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"選取應用程式"</string>
+    <string name="no_application" msgid="2813387563129153880">"無"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"等待偵錯程式"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"先等待偵錯程式附加至偵錯程序，再對要接受偵錯的應用程式開始執行"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"輸入"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"繪圖"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"監控"</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_screen_updates" msgid="5470814345876056420">"顯示表層更新"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"更新表層時閃爍顯示整個視窗表層"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"顯示 GPU 畫面更新"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"使用 GPU 繪圖時在視窗中閃爍顯示畫面"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"停用硬體重疊圖層"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"一律使用 GPU 進行畫面合成"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"啟用追蹤項目"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"選取已啟用的追蹤項目"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"目前未啟用任何追蹤項目"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"目前已啟用 <xliff:g id="NUM">%1$d</xliff:g> 個追蹤項目"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"目前已啟用所有追蹤項目"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"顯示版面配置界限"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"顯示剪輯範圍、邊界等。"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"顯示 CPU 使用量"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"在螢幕上方顯示目前的 CPU 使用量"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"強制使用 GPU 轉譯"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"在應用程式中使用 2D 硬體加速"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"強制使用 GPU 進行 2D 繪圖"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"剖析 GPU 轉譯"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"測量「adb shell dumpsys gfxinfo」指令中的轉譯時間"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"視窗動畫比例"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"轉場動畫比例"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator 影片長度比例"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"應用程式"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"不要保留活動"</string>
-    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"使用者離開活動後隨即銷毀活動"</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" msgid="28462979638729082">"顯示所有無回應程式"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"為背景應用程式顯示「應用程式無回應」對話方塊"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"資料用量"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"資料用量週期"</string>
@@ -1471,13 +1562,14 @@
     <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_menu_metered" msgid="5056695223222541863">"行動熱點"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"自動同步處理資料"</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="8621855507876539282">"這段期間沒有應用程式使用數據。"</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"沒有任何應用程式在這段期間產生資料用量。"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"前景"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"背景"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"依您的平板電腦來計算。行動通訊業者資料用量計費方式可能會有所不同。"</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"依您的手機來計算。行動通訊業者資料用量計費方式可能會有所不同。"</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"限制"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"停用行動數據？"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"設定行動數據上限"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"設定 4G 數據上限"</string>
@@ -1488,33 +1580,45 @@
     <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_list_mobile" msgid="5588685410495019866">"行動網路"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"都不套用"</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="8430240158135453271">"查看應用程式設定"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"限制背景資料"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"只停用行動數據網路的背景資料，可連上 Wi-Fi 時則使用 Wi-Fi。"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"停用行動網路的背景資料。系統將使用非行動網路 (可連上時)。"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"您必須設定行動數據限制，才能限制這個應用程式的背景資料。"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制背景資料？"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"這項功能可能導致需要使用背景資料的應用程式在無法連上 Wi-Fi 時停止運作。"\n\n"如需更多適合的資料用量控制項，請前往應用程式本身的設定中尋找。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"如果採用這項功能，當只有行動網路可供使用時，需要背景數據傳輸的應用程式可能會停止運作。"\n\n"您可以在應用程式的設定選單中，找出更多適當的數據用量的選項。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"您必須設定行動數據限制，才能限制背景資料。"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"開啟自動同步處理資料？"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"您在網路上對帳戶進行的任何變更都會自動複製到您的平板電腦。"\n\n"部分帳戶也可能自動將您在平板電腦上進行的所有變更複製到網路上。Google 帳戶會按照這種方式運作。"\n\n"如要選擇每個帳戶要同步處理的資訊類型，請前往 [設定] &gt; [帳戶]。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"您在網路上對帳戶進行的任何變更都會自動複製到您的手機。"\n\n"部分帳戶也可能自動將您在手機上進行的所有變更複製到網路上。Google 帳戶會按照這種方式運作。"\n\n"如要選擇每個帳戶要同步處理的資訊類型，請前往 [設定] &gt; [帳戶]。"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"關閉自動同步處理資料？"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"這樣可以節省資料用量和電池用量，但您必須手動同步處理每個帳戶才能收集最新資訊。此外，系統進行更新時不會通知您。"</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_warning_editor_title" msgid="3704136912240060339">"設定數據用量警告"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"設定數據用量上限"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"限制資料用量"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"達到指定的流量上限時，系統會停用您的 <xliff:g id="NETWORKS">%1$s</xliff:g> 數據連線。"\n\n"由於資料用量需依您的平板電腦來計算，而您的行動通訊業者計費方式可能有所不同，請考慮使用保守估計的上限值。"</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"達到指定的流量上限時，系統會停用您的 <xliff:g id="NETWORKS">%1$s</xliff:g> 數據連線。"\n\n"由於資料用量需依您的手機來計算，而您的行動通訊業者計費方式可能有所不同，請考慮使用保守估計的上限值。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"達到指定的流量上限時，系統會停用您的行動數據連線。"\n\n"由於資料用量需依您的平板電腦來計算，而您的行動通訊業者計費方式可能有所不同，請考慮採用保守估計的上限值。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"達到指定的流量上限時，系統會停用您的行動數據連線。"\n\n"由於資料用量需依您的手機來計算，而您的行動通訊業者計費方式可能有所不同，請考慮採用保守估計的上限值。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制背景資料？"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果您限制背景行動數據傳輸，則必須連線至 Wi-Fi 網路才能使用特定應用程式與服務。"</string>
+    <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果您限制背景行動數據傳輸，則必須連線至 Wi-Fi 網路，否則部分應用程式和服務無法運作。"</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="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>：根據平板電腦計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者對於資料用量的計算方式可能會有所不同。"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>：根據手機計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者對於資料用量的計算方式可能會有所不同。"</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"行動熱點"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"選取行動熱點 WiFi 網路。背景應用程式在使用這類網路時可能會受到限制。在透過這些網路下載大量資料時，應用程式也可能會提出警告。"</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"行動網路"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WiFi 網路"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"如要選取行動熱點，請開啟 WiFi。"</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>
@@ -1540,12 +1644,14 @@
     <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_edit" msgid="8647191407179996943">"編輯 VPN 設定檔"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"連線到「<xliff:g id="PROFILE">%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="vpn_create" msgid="5628219087569761496">"新增 VPN 設定檔"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"編輯設定檔"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"刪除設定檔"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"沒有網路連線，請稍後再試。"</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"找不到憑證，請編輯設定檔。"</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>
@@ -1554,25 +1660,7 @@
     <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="477937585801538951">"開啟「輕觸探索」後，您可以輕觸螢幕來瞭解手指所碰觸的項目。例如，目前的畫面包含各種應用程式的圖示，您可以輕觸螢幕並用手指四處滑動，找出其中一個應用程式。"</string>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"很好！請繼續用手指在螢幕上四處滑動，至少再找到一個圖示為止。"</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"如要啟用您輕觸的應用程式，只要輕按即可。滑動您的手指，直到找到 <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="8764686624055084454">"如要捲動清單，您可使用兩指沿螢幕滑動。例如，目前畫面中的應用程式名稱清單可供上下捲動，因此首先請您將一隻手指四處滑動，嘗試找出清單中的幾個項目。"</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="3055831259260848004">"您已完成教學課程。如要結束課程，請按一下 [<xliff:g id="FINISH">%s</xliff:g>] 按鈕。"</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"拼字修正"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"拼字檢查"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"在這裡輸入您目前的完整備份密碼"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"在這裡輸入完整備份的新密碼"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"在這裡重新輸入完整備份的新密碼"</string>
@@ -1580,4 +1668,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"取消"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"其他系統更新"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"使用者與限制"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"使用者"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"編輯詳細資訊"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"使用者資訊"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"名稱"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"內容限制"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"需要輸入 PIN"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"內容分級"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"系統應用程式"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"已安裝的應用程式"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"捨棄"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"移除使用者"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"小頑童"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"移除使用者？"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"您確定要將使用者和所有相關聯的資料從裝置上移除嗎？"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"顯示通知"</string>
+    <string name="help_label" msgid="1107174367904110532">"說明"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 3669232..f929c73 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -90,6 +90,8 @@
     <item msgid="7979680559596111948">"Inqamula uxhumano kwi-inthanethi..."</item>
     <item msgid="1634960474403853625">"Ayixhunyiwe"</item>
     <item msgid="746097431216080650">"Akuphumelelanga"</item>
+    <item msgid="6367044185730295334">"Uvinjelwe"</item>
+    <item msgid="503942654197908005">"Okwesikhashana ivikela ukuxhumana okungaqinile"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -102,6 +104,8 @@
     <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>
+    <item msgid="5660739516542454527">"Uvinjelwe"</item>
+    <item msgid="1805837518286731242">"Okwesikhashana ivikela ukuxhumana okungaqinile"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,7 @@
     <item msgid="1160193392455075561">"I-PEAP"</item>
     <item msgid="7981731051382306293">"i-TLS"</item>
     <item msgid="2892994535305020162">"i-TTLS"</item>
+    <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"Cindezela inkinobho"</item>
@@ -163,6 +168,7 @@
     <item msgid="8615575908717909498">"I-PEAP"</item>
     <item msgid="8667872640594311615">"I-TLS"</item>
     <item msgid="7182812872984827322">"I-TTLS"</item>
+    <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Lutho"</item>
@@ -171,12 +177,6 @@
     <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="7468724146672456026">"I-pin kusuka kwindawo yokungena"</item>
-    <item msgid="7364462169350112617">"Iphinilkhodi kusuka kuledivaysi"</item>
-  </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"i-DHCP"</item>
     <item msgid="628395202971532382">"Isibalo"</item>
@@ -211,11 +211,6 @@
     <item msgid="3738430123799803530">"Khipha ikhadi le-SD"</item>
     <item msgid="4498124044785815005">"Vumela isistimu inqume"</item>
   </string-array>
-  <string-array name="silent_mode_entries">
-    <item msgid="783505504936446770">"Valiwe"</item>
-    <item msgid="4804571292609523335">"Dlidliza"</item>
-    <item msgid="595707141547423573">"Thulisa"</item>
-  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kufushane"</item>
     <item msgid="2560532955514699713">"Okulingene"</item>
@@ -249,6 +244,15 @@
     <item msgid="7705857441213621835">"Isilinganisi sesithombe esinyakazayo 5x"</item>
     <item msgid="6660750935954853365">"Isilinganiso sesithombe esinyakazayo"</item>
   </string-array>
+  <string-array name="animator_duration_scale_entries">
+    <item msgid="6039901060648228241">"Isithombe esinyakazayo sivaliwe"</item>
+    <item msgid="1138649021950863198">"Isilinganiso sesithombe esinyakazayo ngu-05x"</item>
+    <item msgid="4394388961370833040">"Isilinganiso sesithombe esinyakazayo ngu-1x"</item>
+    <item msgid="8125427921655194973">"Isilinganiso sesithombe esinyakazayo ngu-1.5x"</item>
+    <item msgid="3334024790739189573">"Isilinganiso sesithombe esinyakazayo ngu-2x"</item>
+    <item msgid="3170120558236848008">"Isilinganisi sesithombe esinyakazayo 5x"</item>
+    <item msgid="1069584980746680398">"Isilinganiso sesithombe esinyakazayo 10x"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Isilanganiso esivamile"</item>
     <item msgid="4071574792028999443">"Azikho izinqubo zesizinda"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e0ff161..bc98219 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Yebo"</string>
     <string name="no" msgid="6731231425810196216">"Cha"</string>
+    <string name="create" msgid="3578857613172647409">"Yakha"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Akwaziwa"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"AMANETHIWEKHI NOKUNGENANTAMBO"</string>
     <string name="header_category_device" msgid="5781174212691167553">"IDIVAYISI"</string>
@@ -111,6 +112,8 @@
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gwema ukusebenzisa isidayeli se-bluetooth lapho isikrini sivaliwe"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Amadivaysi e-Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Igama ledivaysi"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"Izilungiselelo zedivayisi"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Izilungiselelo zephrofayela"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Alikho igama elisethiwe, usebenzisa igama le-akhawunti"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skena amadivaysi"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Qamba kabusha ithebhulethi"</string>
@@ -131,13 +134,12 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Iyabhangqa..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Idivayisi ye-Bluetooth engaqanjwanga igama"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Iyasesha..."</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Cindezela ukuze umatanise"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Awekho amadivayisi e-Bluetooth atholakele."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Isicelo sokubhanqa i-Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Isicelo sokubhangqa"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"Khetha ukubhanqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Thinta ukuze ubhanqe ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Bonisa amafayili atholiwe"</string>
-    <string name="device_picker" msgid="8721012448931226323">"Isithathi sedivaysi ye-Bluetooth"</string>
+    <string name="device_picker" msgid="8398232791303186677">"Isikhethi sedivayisi ye-Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Isicelo semvume ye-Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Zonke izinhlelo zokulungiselela ukusebenza zifuna ukuvula i-Bluetooth. Ngabe uyakuvumela lokhu?"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Uhlelo lokusebenza olukwi-tablet yakho lufuna ukwenza ukuthi i-tablet yakho ibonwe ngamanye amadivayisi e-Bluetooth  <xliff:g id="TIMEOUT">%1$d</xliff:g> imizuzwana. Ngabe uyakuvumela lokhu?"</string>
@@ -155,7 +157,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Thinta ukuxhumana ku \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Uyafuna ukuxhuma ku \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Isicelo sebhuku lefoni"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="5203107624986011263">"%1$s angathanda ukufinyelela othintana nabo nomlando wekholi. Nikeza ukufinyelela ku-%2$s?"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"I-%1$s ifuna ukufinyelela kothintana nabo nomlando wekholi. Nikeza ukufinyelela ku-%2$s?"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ungabuzi futhi"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Usuku nezilungiselelo zesikhathi"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
@@ -184,7 +186,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"KULUNGILE"</string>
     <string name="proxy_error_invalid_host" msgid="8052095511862922213">"Igama lomethuleli olithayiphile alilungile."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="6467799485443290961">"Uhlu lokukhishwayo oluthayiphile alufomethiwe kahle. Sicela ufake uhlu oluhlukaniswe ngofeleba lwezizinda ezingahlanganisiwe"</string>
-    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Kumelwe ugcwalise inkundla yembobo."</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"Udinga ukugcwalisa inkambu yentunja."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Inkundla yembobo kumelwe ingabi nalutho uma inkundla yesikhungo ingenalutho."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Imbobo oyithayiphile ayilungile."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Iphrokzi ye-HTTP isetshenziswa isiphequluli kodwa kungenzeka ingasetshenziswa ezinye izinhlelo zokusebenza"</string>
@@ -224,23 +226,23 @@
     <string name="band_mode_set" msgid="5730560180249458484">"Hlela"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Akuphumelelanga"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Kuphumelele"</string>
-    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Izinguquko zenzeka lapho ikhebula ye-USB ixhunyiwe kabusha"</string>
+    <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Izinguquko zenzeka lapho ikhebula ye-USB ixhunyiwe kabusha"</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Nika amandla isitoreji esiphezulu se-USB"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Inani lamabhaythi:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Isitoreji se-USB sehlisiwe"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Alikho ikhadi le-SD"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"Isilondolozi se-USB sehlisiwe."</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"Alikho ikhadi le-SD."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Amabhaythi atholakalayo:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Ikhadi le-SD lisetshenziswa njengedivaysi yesitoreji esikhulu"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Ikhadi le-SD lisebenziswa njengedivaysi yesitoreji esiphezulu"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="6691584887397909775">"Kuphephile manje ukuthi ukhiphe ikhadi le-SD"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="7189526306223689608">"Kuphephile manje ukuba ukhiphe ikhadi le-SD"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"Ikhadi le-SD lisetshenziswa njengedivaysi yesilondolozi ephezulu."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"Ikhadi le-SD lisetshenziswa njengedivaysi yesilondolozi esiphezulu"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"Kuphephile manje ukuthi ukhiphe ikhadi le-SD"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"Kuphephile manje ukuba ukhiphe ikhadi le-SD."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Ikhadi lesitoreji se-SD likhishwe ngenkathi lisasebenza!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Ikhadi le-SD likhishwe ngenkathi lisasebenza!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Amabhaythi asebenzisiwe:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Iskena isitoreji se-USB kwimidiya..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Iskena ikhadi le-SD lemidiya..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Isitoreji se-USB sikhwezelwa ukufunda kuphela"</string>
-    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Ikhadi le-SD likhuliswe njengelokufunda kuphela"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Isilondolozi se-USB sikhwezelwe ukufunda kuphela"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Ikhadi le-SD likhuliswe njengelokufunda kuphela"</string>
     <string name="skip_label" msgid="47510779345218297">"Yeqa"</string>
     <string name="next_label" msgid="4693520878012668114">"Okulandelayo"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Ulimi"</string>
@@ -266,8 +268,8 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Xhuma kumasevisi edatha lapho uzulazula"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Ulahlekelwe uxhumano lwedatha ngoba ushiye inethiwekhi yakho yasekhaya inokuzulazula kwedatha kuvaliwe."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Yivule"</string>
-    <string name="roaming_warning" msgid="1269870211689178511">"Vumela ukuzulazula ngedatha? Ungabhekana nezindleko eziphezulu zokuzulazula!"</string>
-    <string name="roaming_reenable_title" msgid="7626425894611573131">"Qaphela"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Uma uvumela ukuhamba kwedatha, ungathola amashaji yokuthola amancane!"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Vumela ukuhamba kwedatha?"</string>
     <string name="networks" msgid="6333316876545927039">"Inketho yo-opheretha"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Khetha inkamapani yenethiwekhi"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Idethi nesikhathi"</string>
@@ -283,12 +285,14 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"Setha isikhathi"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Khetha umkhawulo wesikhathi"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Setha idethi"</string>
-    <string name="date_time_date_format" msgid="436706100255870967">"Khetha ifomethi yedethi"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Khetha ifomethi yedethi"</string>
     <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="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Enza kangcono ukufana kobuso"</string>
+    <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Ukuhlola ukuphila"</string>
+    <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Kudinga ukucwayiza kweso"</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 ulwazi lomnikazi ekuvaleni isikrini"</string>
@@ -306,26 +310,27 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Dinga i-PIN yenombolo noma iphasiwedi ukubonisa umbhalo wemfihlo kwithebhulethi ngazo zonke izikhathi lapho uyivula"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Dinga i-PIN yenombolo noma iphasiwedi ukungabhali ngemfihlo ifoni yakho njalo lapho uyivula"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Betheliwe"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="923629233459331136">"Ungabhala ngemfihlo ama-akhawunti, izilungiselelo, izinhlelo zokusebenza ezilandiwe kanye nenye idatha, kanye namafayela. Emva kokuba ubhale ngemfihlo ithebhulethi yakho, ngeke ukwazi ukuyishintsha ngaphandle kokwenza ukuhlela kabusha kwemboni, okwesula yonke idatha kwithebhulethi yakho."\n\n"Ukubhala ngemfihlo kungathatha ihora noma ngaphezulu. Kumele uqale ngebhetri eshajiwe futhi ugcine ithebhulethi ixhunyiwe kuze kube yilapho ukubhala ngemfihlo kuqedile. Uma uphazamisa inqubo yokubhala ngemfihlo, uzolahlekelwa idatha embalwa noma yiyo yonke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Ungabhala ngemfihlo ama-akhawunti, izilungiselelo, izinhlelo zokusebenza ezilandiwe kanye nenye idatha, kanye namafayela. Emva kokuba ubhale ngemfihlo ithebhulethi yakho, ngeke ukwazi ukuyishintsha ngaphandle kokwenza ukuhlela kabusha kwemboni, okwesula yonke idatha kwithebhulethi yakho."\n\n"Ukubhala ngemfihlo kungathatha ihora. Kumele uqale ngebhetri eshajiwe futhi ugcine ithebhulethi ixhunyiwe kuze kube yilapho ukubhala ngemfihlo kuqedile. Uma uphazamisa inqubo yokubhala ngemfihlo, uzolahlekelwa idatha embalwa noma yiyo yonke."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ungabethela ama-akhawunti wakho, izilungiselelo, ulande izinhlelo zokusebenza nedatha yazo, imidiya, namanye amafayela. Uma usubethele ikhompyutha yakho, udinga ukuthayipha i-PIN yenombolo noma iphasiwedi ukususa ukubhala ngekhodi ngaso isikathi ukhanyisa: awukwazi ukususa ukubhala ngakhodi ikhompyutha yakho ngaphandle kokwenza kabusha idatha yakho yenkampani, sula yonke idatha yakho."\n\n"Ukubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhtri elishajiwe futhi ugcine ikhompyutha yakho iplakiwe kuze kuphele ukubethela. Uma uphazamisa inqubo yokubethela, uzolahlekelwa enye noma yonke idatha yakho."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ungabhala ngakhodi ama-akhawunti wakho, izilungiselelo, ulande ama-apps nedatha yawo, imidiya namanye amafayela. Uma usubhale ngekhodi ucingo lakho, udinga ukuthayipha i-PIN yezinombolo noma iphasiwedi ukususa ukubhala ngakhodi ngaso sonke isikhathi uma uyikhanyisa: awukwazi ukususa ukubhala ngekhodi ucingo lakho ngaphandle kokwenza ukusetha kabusha idatha yenkampani, ususe yonke idatha yakho."\n\n"Ukubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhitri elishajiwe futhi ugcine ucingo lakho luplakiwe kuze ukubhala ngekhodi kuqedele. Uma uphazamisa inqubo yokubhala ngekhodi, uzolahlekelwa enye noma yonke idatha yakho."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Bethela ithebhulethi"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Bethela ifoni"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Sicela ushaje ibhetri yakho bese uzama futhi."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sicela uxhume ishaja yakho bese uzama futhi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ayikho i-PIN yokuvala isikrini noma iphasiwedi"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Kumele umise ukuvala i-PIN yesikrini noma iphasiwedi ngaphambi kokuqalisa umbhalo wemfihlo."</string>
-    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Qinisekisa umbhalo wemfihlo"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Bethela ithebhulethi? Lo msebenzi awushintsheki futhi uma uwuphazamaisa, uzolahlekelwa idatha. Ukubhala ngemfihlo kuthatha ihora noma ngaphezulu, phakathi nalapho ithebhulethi izoqalisa phansi izikhathi ezimbalwa."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Bethela ifoni? Lo msebenzi awushintsheki futhi uma uwuphazamisa, uzolahlekelwa idatha. Ukubhala ngemfihlo kuthatha ihora noma ngaphezulu, phakathi nalapho ifoni izo qala phansi izikhathi ezimbalwa."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Udinga ukusetha i-PIN yokukhiya isikrini noma iphasiwedi ngaphambi kokuqala ukubhala ngakhodi."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Bhala ngekhodi?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Umsebenzi wokubhala ngekhodi awubuyiseleki emuva futhi uma uwuphazamisa, uzolahlekelwa idatha. Ukubhala ngekhodi kuthatha ihora noma ngaphezulu, phakathi kwesikhathi lapho ikhomyutha izoqala kabusha kambalwa."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Umsebenzi wokubhala ngekhodi awubuyiseleki emuva futhi uma uwuphazamisa, uzolahlekelwa idatha. Ukubhala ngekhodi kuthatha ihora noma ngaphezulu, phakathi kwesikhathi lapho ucingo lizoqala kabusha kambalwa."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Iyabethelwa"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Sicela ulinde ngenkathi ithebhulethi yakho ibhalwa ngemfihlo. <xliff:g id="PERCENT">^1</xliff:g>% okuphelile."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Sicela ulinde ngenkathi ifoni ihlelwa ngokubhala ngokufihlekileyo <xliff:g id="PERCENT">^1</xliff:g> % iqedile."</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zama futhi emasekhondini angu-<xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Thayipha iphasiwedi yakho"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Ubhala ngokufihlekileyo akuphumelelanga"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="6891198717505120682">"Ukubethela kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha ekuthebhulethi yakho. "\n\n"Ukuze uphinde usebenzise ithebhulethi yakho, kufanele isethwe kabusha. Uma ususetha ithebhulethi yakho emuva kokuba isethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1341912405353765293">"Ukubhelake bumfihlo kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha esocingweni lwakho. "\n\n"Ukuze uphinde usebenzise ucingo lwakho, kufanele lusethwe kabusha endaweni yokukhanda. Uma ususetha ucingo lwakho emva kokuba lusethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
-    <string name="lock_settings_picker_title" msgid="3332098786253116023">"Khetha ukukhiya isikrini"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Ukubethela kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha ekuthebhulethi yakho. "\n\n"Ukuze uphinde usebenzise ithebhulethi yakho, kufanele isethwe kabusha. Uma ususetha ithebhulethi yakho emuva kokuba isethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google.."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Ukubhelake bumfihlo kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha esocingweni lwakho. "\n\n"Ukuze uphinde usebenzise ucingo lwakho, kufanele lusethwe kabusha endaweni yokukhanda. Uma ususetha ucingo lwakho emva kokuba lusethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Shintsha indlela yokufaka"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Khetha isivali sesikrini"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Khetha ukukhiywa kokulondoloza"</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>
@@ -348,9 +353,9 @@
     <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_biometric_weak" msgid="3008473624490350142">"I-Face Unlock"</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_set_unlock_mode_pattern" msgid="7837270780919299289">"Iphathini"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Iphasiwedi"</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>
@@ -362,44 +367,44 @@
     <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>
-    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Iphasiwedi kumele ibe ngaphansi ngezinhlamvu ezingu-<xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"I-PIN kumele ibe ngaphansi ngamadijithi angu0-<xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <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>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Iphasiwedi kumele ibe ngaphansi ngezinhlamvu ezingu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"I-PIN kumele ibe ngaphansi ngamadijithi angu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"I-PIN kumele ibe namadijithi kuphela asuka ku- 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"Umqondisi wedivayisi akavumeli ukusebenzisa i-PIN yakamuva."</string>
+    <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Iphasiwedi inohlamvu olungekho emthethweni."</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"Iphasiwedi kumele okungenani ibe nohlamvu olulodwa"</string>
+    <string name="lockpassword_password_requires_digit" msgid="3958033271435659825">"Iphasiwedi kumele okungenani ibe nenombolo eyodwa."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="7226621405629726899">"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>
+    <item quantity="one" msgid="3063853802158131458">"Iphasiwedi okungenani kumele ibe negama elingu-1"</item>
+    <item quantity="other" msgid="8186027808415585970">"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>
+    <item quantity="one" msgid="5583986519662091001">"Iphasiwedi kumele okungenani ibe negama lombhalo elingafelebisiwe elingu-1"</item>
+    <item quantity="other" msgid="2693910942679679225">"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>
+    <item quantity="one" msgid="2611909966725502768">"Iphasiwedi kumele ibe okungenani negama lofeleba olungu-1"</item>
+    <item quantity="other" msgid="3030801209112209245">"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>
+    <item quantity="one" msgid="3820355568839621231">"Iphasiwedi kumele okungenani ibe nedijithi yenombolo engu-1"</item>
+    <item quantity="other" msgid="4703982391407595924">"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>
+    <item quantity="one" msgid="8456579939292408631">"Iphasiwedi kumele okungenani ibe nohlamvu olukhethekile olungu-1."</item>
+    <item quantity="other" msgid="1221290525051187757">"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>
+    <item quantity="one" msgid="4594051152085925921">"Iphasiwedi kumele okungenani ibe nohlamvu olungelona igama olungu-1"</item>
+    <item quantity="other" msgid="3952508584649046404">"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_password_recently_used" msgid="6098087796784262081">"Umqondisi wedivayisi akavumeli 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="lock_setup" msgid="1759001157415978959">"Ukumisa kuqediwe"</string>
+    <string name="lock_setup" msgid="3355847066343753943">"Ukusetha kuphelile."</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>
@@ -413,8 +418,8 @@
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Ukuze ubhangqe ne-:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Uhlobo lwamadivayisi adinga isihluthulelo sokungena:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Iphinikhodi iqukethe amaletha namasimbui"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Ngokuvamile 0000 noma 1234"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Kungenzeka futhi udinge ukufaka le-PIN kwenye idivaysi."</string>
-    <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Kungadingeka ufake lokhiye wokudlula kwenye idivayisi."</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Kungenzeka futhi udinge ukufaka le-PIN kwenye idivaysi."</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Kungadingeka ufake lokhiye wokudlula kwenye idivayisi."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Ukuhambisa ngokubili:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Qinisekisa ukuthi ibonisa ukhiye wokungena:&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">"Kusuka ku:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Beka eceleni namanye amadivayisi?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Ukubhangqa ne:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Thayipha kuyona:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, bese ucindezela inkinobho uBuyisela noma uNgena."</string>
@@ -425,7 +430,7 @@
     <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Ayikwazanga ukumataniswa ne <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngenxa ye-PIN noma isihluthulelo sokungena okungafanele."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ayaikwazi ukuxhumana 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_connecting_error_message" msgid="229861986106185022">"Ayikwazanga ukuxhuma ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Skena amadivaysi"</string>
     <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Sesha amadivayisi"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Iyacinga..."</string>
@@ -478,19 +483,23 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Komculo nemidiya"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Khumbula izilungiselelo"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"i-NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="5237208142892767592">"Vumela ukushintshanisa kwe-data uma ucingo luthinta enye idivayisi"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Vumela ukushintshanisa kwedatha uma ithebhulethi ithinta enye idivayisi"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Vumela ukushintshanisa kwe-data uma ucingo luthinta enye idivayisi"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"i-Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Ilungele ukudlulisa insiza nge-NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Valiwe"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ayitholakali ngoba i-NFC icishiwe"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"i-Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Uma kuvulwe lesi sici, ungadlulisa okuqukethwe okusetshenziswayo kwenye ikhebuli ye-NFC ngokumisa amadivayisi enye eduze kwenye. Isibonelo ungahlanganisa amakhasi Esiphequluli, amavidiyo ka-YouTube, kwezokuxhumana nabantu, kanye nokunye."\n\n"Hlanganisa amadivayisi ndawonye (ngokujwayelekile enye ngemuva kwenye) bese uthinta isikrini sakho. Uhlelo lokusebenza luyathola ukuthi yini ezoba-beamed."</string>
+    <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Ukutholwa kwesevisi yenethiwekhi"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Vumela izinhlelo zokusebenza kwamanye amadivayisi ukuthola izinhlelo zokusebenza kule divayisi"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Vula i-Wi-Fi"</string>
     <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Izilungiselelo ze-Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Hlela, uphathe izindawo zokungena ezingenantambo"</string>
+    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Khetha i-Wi-Fi"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"Ivula i-Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="244864762599017659">"Ivala Ukuxhumana kengenazintambo"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Iphutha"</string>
@@ -498,25 +507,38 @@
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ayikwazi ukuhlola amanethiwekhi"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Isaziso senethiwekhi"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Ngazise lapho inethiwekhi evulekile itholakala"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Gwema uxhumo olubi"</string>
-    <string name="wifi_enable_watchdog_service_summary" msgid="4227430628962787616">"Ungasebenzisi inethiwekhi ye-Wi-Fi ngaphandle uma inoxhumano lwe-inthanethi olukahle."</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Gwema uxhumo olubi"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Ungasebenzisi inethiwekhi ye-Wi-Fi ngaphandle kokuthi inoxhumano lwe-intanethi olukahle."</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Gcina i-Wi-Fi isebenza ngenkathi ilele"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kube khona inkinga yokushintsha ilungiselelo"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Yengeza inethiwekhi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Amanethiwekhi e-Wi-Fi"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Inkinobho yokuphusha ye-WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Ukufakwa kwe-PIN ye-WPS"</string>
+    <string name="wifi_menu_p2p" msgid="2575893749303670353">"I-WiFi Eqondile"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skena"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Thuthukisiwe"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Xhuma kwinethiwekhi"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Khohlwa inethiwekhi"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Guqula inethiwekhi"</string>
     <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ukubona amanethiwekhi atholakalayo, vula i-WiFi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Isesha amanethiwekhi e-Wi-Fi…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Enye inethiwekhi…"</string>
+    <string name="wifi_more" msgid="3195296805089107950">"Okunye"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Ukusetha okuzenzakalelayo (WPS)"</string>
     <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="8242979682530043184">"Thayipha i-PIN kusuka kwindayo yokungena"</string>
-    <string name="wifi_wps_setup_title" msgid="2301524571580808871">"Ukuhlela i-WPS"</string>
-    <string name="wifi_wps_pin_output" msgid="7773693032190962123">"Faka i-pin <xliff:g id="WPS_PIN">%1$s</xliff:g> kwindawo yokungena"</string>
-    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"I-WPS isivele iqhubeka futhi ingase ithathe amasekhondi ambalwa ukuqeda"</string>
-    <string name="wifi_wps_failed" msgid="1648418410092969300">"Yehlulekile ukuqalisa i-WPS, zama futhi."</string>
+    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ukusethwa Okuvikelwe kwe-Wi-Fi"</string>
+    <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iqala i-WPS…"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Cindezela inkinobho Wi-Fi Protected Setup kumzila wakho. Ingahle ibizwe nge-\"WPS\" noma iqukathe lolu phawu:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Faka i-pin <xliff:g id="NUMBER">%1$s</xliff:g> ku-Wi-Fi router yakho. Ukusetha kungathatha kufika emaminithini amabili ukuqedela."</string>
+    <string name="wifi_wps_complete" msgid="2388138550456729134">"I-WPS iphumelele. Ixhuma kunethiwekhi…"</string>
+    <string name="wifi_wps_connected" msgid="5754399645462924103">"Ixhunywe kwinethiwekhi ye-Wi-Fi i-<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="2944576520214787628">"I-WPS isivele iyaqhubeka futhi ingathatha kufika kumaminithi amabili ukuqedela"</string>
+    <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"I-WPS yehlulekile. Sicela uzame futhi emaminithini ambalawa."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Izilungiselelo zokuphepha zendlela engenazintambo (WEP) azisekelwe"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Izilungiselelo zokuphepha zendlela engenazintambo (TKIP) azisekelwe"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ukwehluleka kokugunyazwa. Sicela uzame futhi."</string>
+    <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Esinye isikhathi se-WPS sitholiwe. Sicela uzame futhi emaminithini ambalwa."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"i-SSID Yenethiwekhi"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ukuphepha"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Amandla esiginali"</string>
@@ -537,20 +559,20 @@
     <string name="wifi_remembered" msgid="4955746899347821096">"Kulondoloziwe"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Akusebenzi"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Kugwenyiwe ukungaxhumeki kahle"</string>
-    <string name="wifi_disabled_heading" msgid="1428050635183875599"></string>
-    <string name="wifi_disabled_help" msgid="5416325603334140666">"Inethiwekhi igwenyiwe ngenx yokuxhumaniseka okubi. Cisha lokhu Ezisethweni &gt; Iskrini se-Wi-Fi, into ekwimenyu ejulile."</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="3538912605343585226">"Kutholakala uhlelo loxhumano oluvikelekile"</string>
-    <string name="wifi_wps_available_second_item" msgid="6121307881706347616">" (kutholakala uhlelo lokuxhumana oluvikeliwe)"</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_failed_connect_message" msgid="8491902558970292871">"Yehlulekile ukuxhuma kunethiwekhi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Khohlwa"</string>
+    <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Yehlulekile ukukhohlwa inethiwekhi"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Londoloza"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"Yehlulekile ukulondoloza inethiwekhi"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Khansela"</string>
-    <string name="wifi_wps_overlap_error" msgid="3352261777053283320">"Kutholwe olunye uhlelo lwesikhathi se-WiFi esivikelekile. Zama futhi emizuzwini embalwa."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Ukuxhumana kungenazintambo okuphambili"</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>
@@ -568,33 +590,34 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Indlela yokuphuma"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Ubude begama eliqalayo lenethiwekhi"</string>
-    <string name="wifi_p2p_settings_title" msgid="5933614000444751775">"I-WiFi Eqondile"</string>
-    <string name="wifi_p2p_settings_summary" msgid="6653169526746701975">"Setha uhleloxhumano lwe- peer-to-peer"</string>
+    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"I-WiFi Eqondile"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Imininingwane yedivayisi"</string>
-    <string name="wifi_p2p_wps_setup" msgid="1780420204385670531">"Isethaphu Evikelwe Yokuxhumana kungenazintamnbo"</string>
-    <string name="wifi_p2p_wps_pin" msgid="6025317359151049787">"Thayipha iphinikhodi"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Khumbula lokuxhumana"</string>
-    <string name="wifi_p2p_menu_search" msgid="7189970585393813135">"Sesha"</string>
-    <string name="wifi_p2p_menu_create_group" msgid="7595229161883902082">"Dala isigcawu"</string>
-    <string name="wifi_p2p_menu_remove_group" msgid="4844634506540667517">"Susa iqoqo"</string>
-    <string name="wifi_p2p_menu_advanced" msgid="2578792521809265949">"Okuthuthukisiwe"</string>
-    <string name="wifi_p2p_available_devices" msgid="5943352520059654483">"Amadivayisi atholakalayo"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Sesha amadivayisi"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Iyasesha..."</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Qamba kabusha idivayisi"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Hlanganisa amadivayisi"</string>
+    <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Ayikwazanga ukuxhuma."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Yehlulekile ukuqamba kabusha idivayisi."</string>
+    <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Nqamula?"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Uma unqamula, ukuxhumana kwakho ne-<xliff:g id="PEER_NAME">%1$s</xliff:g> kuzophela."</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Uma unqamula, ukuxhumana kwakho ne-<xliff:g id="PEER_NAME">%1$s</xliff:g> kanye namanye amadivayisi angu-<xliff:g id="PEER_COUNT">%2$s</xliff:g> kuzophela."</string>
+    <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Khansela isimemo?"</string>
+    <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ingabe ufuna ukukhansela isimemo ukuze uxhume ne-<xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Indawo ephathekayo ye-Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Indawo ephathekayo <xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Iphutha lendawo le-Wi-Fi ephathekayo"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Misa indawo ye-Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Setha i-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> 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">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
-    <string name="silent_mode_title" msgid="3181479108593217704">"Imodi ethulile"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Iringithoni yefoni"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Amavolumu"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Imphumelo Yomculo"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ivolumu yesikhali"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Idlidliza uma ithulile"</string>
-    <string name="vibrate_on_ring_title" msgid="40343855247989536">"Dlidlizisa futhi kukhale"</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>
@@ -614,6 +637,11 @@
     <string name="volume_ring_description" msgid="5936851631698298989">"Iringithoni; nezaziso"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Izaziso"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Ama-alamu"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Thulisa ithoni yokukhala &amp; izaziso"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Thulisa umculo &amp; enye imidiya"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Thulisa izaziso"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Thulisa i-alamu"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Dlidlizisa uma ikhala"</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>
@@ -623,14 +651,14 @@
     <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="9015625921245904495">"Kumele wenze i-dock ye-tablet yakho ukuze usethe i-dock audio."</string>
-    <string name="dock_not_found_text" product="default" msgid="3882255773040651831">"Kumele wenze i-dock yeselula yakho ukuze usethe i-dock audio."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Udinga ukufaka idoki kukhompyutha yakho ngaphambi kokusetha umsindo wedoki"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Udinga ukungenisa edokini ucingo ngaphambi kokusetha umsindo wedoki."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"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; ukuvumelanisa"</string>
+    <string name="account_settings" msgid="6403589284618783461">"Ama-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">"Ukubukeka"</string>
@@ -702,7 +730,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Inombolo yami yocingo"</string>
     <string name="status_min_number" msgid="3519504522179420597">"Okuncane"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="8499039751817386529">"Inguqulo ye-PRL"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"Inguqulo ye-PRL"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"I-MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Uhlobo lwenethiwekhi yeselula"</string>
@@ -824,7 +852,7 @@
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Susa yonkr imininingwane yomuntu kanye nezinhlelo zokusebenza ezilayishiwe? Ngeke ukwazi ukuguqula lokhu!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Sula yonke into"</string>
     <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>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Udinga ukudweba iphethini yakho yokuvula ukuqinisekisa ukwenza kabusha idatha yonkampani."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Akukho ukusetha kabusha okwenziwe ngoba isevisi Yokwesula Isistimu ayitholakali."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Setha kabusha"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Sula isitoreji se-USB"</string>
@@ -839,8 +867,8 @@
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"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>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuthi ufuna ukusula isitoreji se-USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuba ufuna ukusula ikhadi le-SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Izilungiselelo zekholi"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Hlela ivoyisimeyili, ukudlulisa ikholi, ikholi elindile, i-ID yomshayeli"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Imodemu nge-USB"</string>
@@ -871,7 +899,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Amanethiwekhi eselula"</string>
     <string name="location_title" msgid="1029961368397484576">"Indawo Yami"</string>
     <string name="location_network_based" msgid="5569673665032992664">"Isevisi yakwa-Google yokuthola indawo"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"Yenza insiza isebenzise i-data esuka emithonjeni enjenge-Wi-Fi kanye nokuxhumaniseka komakhalekhukhwini ukuze kuhlonzeke ukuthi cishe ukephi nendawo"</string>
+    <string name="location_neighborhood_level" msgid="2948129720516513300">"Vumela idatha yendawo engaziwa ukuthunelwa ku-Google. Futhi vumela izinhlelo zokusebenza ezivumelekile ukusebenzisa idatha kusuka kumithombo efana ne-Wi-Fi namanethiwekhi eselula ukucacisa cishe indawo yakho."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Indawo itholwe i-Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"amasethalayithi e-GPS"</string>
     <string name="location_street_level" msgid="4244496898967415234">"Vumela i-GPS ukubonisa indawo yakho"</string>
@@ -916,7 +944,7 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Chofoza Imenyu ukuthola usizo."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Dedela umunwe uma usuqedile."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Xhuma okungenani <xliff:g id="NUMBER">%d</xliff:g> amachashazi. Zama futhi:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Iphathini irekhodiwe!"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Iphathini irekhodiwe."</string>
     <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Dweba iphathini futhi ukuqinisekisa:"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Iphethini yakho entsha yokuvula:"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Qinisekisa"</string>
@@ -938,7 +966,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Okulandelayo"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Ivikela ithebhulethi yakho"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Ukuphepha kwefoni yakho"</string>
-    <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Vikela ithebhulethi yakho ekusetshenzisweni okungavumelekile ngokwenza iphathini yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma amachashazi nganoma yikuphi ukuhleleka kwsikrini esilandelayo. Kumele uxhume okungenani amachashazi amane. "\n\n"Ukulungele ukuqalisa? Thinta \"Okulandelayo\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Vikela ithebhulethi yakho ekusetshenzisweni okungavumelekile ngokwenza iphathini yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma amachashazi nganoma yikuphi ukuhleleka kwsikrini esilandelayo. Kumele uxhume okungenani amachashazi amane. "\n\n"Ukulungele ukuqalisa? Thinta \"Okulandelayo\"."</string>
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Vikela ifoni yakho ekusetshenzisweni okungemthotho ngokwakha iphethini yakho siqu yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma okungenani amadothi amane kusikrini sombhalo. "\n\n"Usukulungele ukuqala? Thinta Okulandelayo."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Phatha izinhlelo zokusebenza"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Phatha futhi ukhiphe izinhlelo zokusebenza ezifakiwe"</string>
@@ -946,7 +974,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Phatha izinhlelo zokusebenza, hlela izinqamuleli zokuqalisa okusheshayo"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Izilungiselelo zohlelo lokusebenza"</string>
     <string name="install_applications" msgid="4872012136210802181">"Imithombo engaziwa"</string>
-    <string name="install_unknown_applications" msgid="8149117044297868948">"Vumela ukufaka izinhlelo zokusebenza ezingezona eze-Market."</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Vumela ukufaka kwezinhlelo zokusebenza kusuka emithonjeni engaziwa"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"I-tablet kanye nemininingo yakho kusengozini yokuthi kuhlaselwe yizinhlelo zokusebenza ezivela kwimithombo eengaziwa. Uyavuma ukuthi uwena wedwa onesibophezelo sanoma yikuphi ukulimala kwe-tablet yakho noma ukulahleka kwemininingo okungabangelwa ukusetshenziswa kwalezi zinhlelo."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Iselula yakho kanye nemininingo yakho uqobo kusengozini yokuhlaselwa yizinhlelo zokusebenza ezivela kwimithombo engaziwa. Uyavuma ukuthi nguwe wedwa onesibophezelo sanoma yikuphi okulimele noma ukulahleka kwemininingo okungab umphumela wokusebenzisa lezi zinhlelo zokusebenza."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Izilungiselelo ezithuthukisiwe"</string>
@@ -954,6 +982,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Ulwazi lohlelo lokusebenza"</string>
     <string name="storage_label" msgid="8700867073480107253">"Isitoreji"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Qalisa ngokuzenzakalelayo"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Okuzenzekalelayo"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Ukufaneleka kwesikrini"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Izimvume"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Isilondolozi sesikhashana"</string>
@@ -973,6 +1002,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Sula idatha"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Khipha izibuyekezo"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Ukhethe ukufaka lolu hlelo lokusebenza ngokuzenzekelayo kwezinye izinhlelo zokwenziwayo."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Uvumele loluhlelo lokusebenza ukuthi lwenze amawijethi nokuthi kufinyelelwe kwidatha yawo."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Akukho okuzenzakalelayo okusethiwe."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Sula okuzenzakalelayo"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Lolu hlelo lokusebenza kungenzeka aludalelwanga isikrini sakho; ungaphatha ukuthi ima kanjani esikrinini sakho lana."</string>
@@ -983,6 +1013,10 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Hlunga ngosayizi"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Bonisa amasevisi asebenzayo"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Bonisa izinqubo zokulondoloza kwesikhashana"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Setha kabusha izintandokazi zezinhlelo zokusebenza"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setha kabusha izintandokazi zohlelo lokusebenza?"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Lokhu kuzosetha kabusha zonke izintandokazi ze:"\n\n" "<li>"Izinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izaziso zezinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izinhlelo zokusebenza zokuzenzakalelayo zezenzo"</li>\n" "<li>"Idatha yangokwasemuva yezinhlelo zokusebenza"</li>\n\n" Ngeke ulahlekelwe idatha yohlelo lokusebenza."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Setha kabusha izinhlelo zokusebenza"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Lawula isikhala"</string>
     <string name="filter" msgid="2018011724373033887">"Hlunga"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Khetha okukhethwa kukho kokuhlunga"</string>
@@ -1011,7 +1045,7 @@
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Lolu hlelo lokusebenza lungafinyelela okulandelayo kwi-tablet yakho"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"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="invalid_size_value" msgid="7563537715280712285">"Ayikwazanga ukubala usayizi wephakeji."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"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>
@@ -1033,6 +1067,8 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Shintsha indawo yokufaka efiswayo yezinhlelo zokusebenza ezintsha"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Khubeza uhlelo lokusebenza olakhelwe"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Uma uyekisa ukusebenza uhlelo lokusebenza olufakwe ngaphakathi, ezinye izinhlelo zokusebenza kungenzeka ukuthi zingenzi kahle."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Cima izaziso?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Uma ucima izaziso kulolu hlelo lokusebenza, ungageja izaziso nezibuyekezo ezibalulekile."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ukusetshensiswa kwesitoreji"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Buka okokulonda okusetshenziswa izinsiza"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Amasevisi asebenzayo"</string>
@@ -1049,9 +1085,9 @@
     <!-- 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_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> namasevisi"</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="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> namasevisi"</string>
     <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Uhlelo lokusebenza olusebenzayo"</string>
     <string name="no_services" msgid="7133900764462288263">"Akusebenzi"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Amasevisi"</string>
@@ -1063,7 +1099,7 @@
     <string name="background_process_stop_description" msgid="5034773197139654588">"Lolu uhlelo lohlelo lokusebenza oludala olusasebenza ukulungiselela mhla ludingeka futhi. Ngokujwayelekile asibikhona isidingo sokulumisa."</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="1130702347066340890">"Inqubo eyinhloko esetshenziswayo."</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_service_in_use_description" msgid="8993335064403217080">"Isevisi <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="3371302398335665793">"Uqinisekile ukuthi ufuna ukumisa le sevisi yesistimu? Uma kunjalo, ezinyeizici zethebhulethi yakho zingase ziyeke ukusebenza kahle kuze kube yilapho uyivala noma uyivula futhi."</string>
@@ -1085,19 +1121,38 @@
     <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"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>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Lokhu okuhlola ukupela kungenzeka ukuthi kuthole yonke imibhalo oyibhalayo, okuhlanganisa imininingo yakho efana naphasiwedi kanye nezinombolo ze-credit card. Kuqhamuka kuhlelo lokusebenza <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Ngabe kungasetshenziswa okuhlola ukupela?"</string>
+    <string name="spellchecker_quick_settings" msgid="246728645150092058">"Izilungiselelo"</string>
+    <string name="spellchecker_language" msgid="6041050114690541437">"Ulimi"</string>
+    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Yehlulekile ukuvula izilungiselelo ze-<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"Igunane/isiqeshana sokuhambisa iminwe"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Ijubane lesikhombi"</string>
+    <string name="game_controller_settings_category" msgid="8794508575329923718">"Isilawuli somdlalo"</string>
+    <string name="vibrate_input_devices" msgid="2599591466928793082">"Sebenzisa ukudlidliza"</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Qondisa kabusha ukudlidliza esilawulini somdlalo uma uxhumekile."</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Khetha isendlalelo sekhibhodi"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Setha izendlalelo zamakhibhodi"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Ukuze ushintshe, cindezela u-Control-Spacebar"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Okuzenzakalelayo"</string>
+    <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Izendlalelo zekhibhodi"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Sebenzisa isichazamazwi"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"Isichazamazwi sakho"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Izichazamazwi eziqondene nawe"</string>
     <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_add_screen_title" msgid="742580720124344291">"Umshwana"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Izinketho eziningi"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Izinketho ezincane"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"KULUNGILE"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Igama:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Isinqamulelo:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Ulimi:"</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>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"Awunawo amagama kwisichazamazwi somsebenzisi. Ungafaka igama ngokuthinta Faka (+) inkinobho."</string>
-    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Zonke izilimi"</string>
+    <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Kwezilimi"</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Izilimi eziningi…"</string>
     <string name="testing" msgid="6584352735303604146">"Iyahlola"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Ulwazi lethebhulethi"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Ulwazi lwefoni"</string>
@@ -1134,16 +1189,27 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Setha okukhethwayo kwentuthuko yohlelo lokusebenza"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Ukulungisa iphutha le-USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Lungisa iphutha lemodi lapho i-USB ixhunyiwe"</string>
-    <string name="verifier_device_identifier" msgid="5079997701152411060">"I-ID yedivayisi yokuthuthukisa"</string>
-    <string name="verifier_device_identifier_not_available" msgid="1272065992066977324">"Ulwazi lwe-device alutholakali"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Hlala uphapheme"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Isikrini asisoze salala ngenkathi sishaja"</string>
     <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="7316799925425402244">"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="dev_settings_warning_title" msgid="7244607768088540165">"Vumele izilungiselelo zokuthuthukisa?"</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"Lezi zilungiselelo zenzelwe ukusetshenziswa ukuthuthukisa kuphela. Zingadala ukuthi idivayisi yakho kanye nensiza ekuyona ukuthi iphuke noma iziphathe kabi."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Vikela isilondolozi se-USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Izinhlelo zokusebenza kufanele zicele imvume yokufunda isilondolozi se-USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vikela isilondolozi se-USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Uma isilondolozi se-USB sivikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha kusuka kwisilondolozi sangaphandle."\n\n"Ezinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
+    <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Vikela ikhadi le-SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Izinhlelo zokusebenza kufanele zicele imvume yokufunda ikhadi le-SD"</string>
+    <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vikela ikhadi le-SD?"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Uma ikhadi le-SD livikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha ngesilondolozi sangaphandle."\n\n"Ezinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Khetha igajethi"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Khetha iwijethi"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Yenza iwijethi bese uvumela ukufinyeleleka?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Emva kokuba wenze iwijethi, u-<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> angafinyelela kuyo yonke idatha eyivezayo."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Ivumele njalo u-<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ukuthi enze amawijethi bese efinyelela kwidatha yawo"</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>
@@ -1161,12 +1227,9 @@
     <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Umbalo omkhulu"</string>
     <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Inkinobho yamandla imisa ikholi"</string>
     <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Memeza iphasiwedi"</string>
-    <string name="accessibility_touch_exploration_title" msgid="4171477646863806078">"Hlaziya ngokuthinta"</string>
-    <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>
     <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Ukulibaziseka uma uthinta, ubamba"</string>
-    <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Faka imibhalo yewebhu"</string>
+    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Engeza ukufinyelela kwewebhu"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Izilungiselelo"</string>
-    <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Okokufundisa"</string>
     <string name="accessibility_service_state_on" msgid="8791337599927106344">"Vuliwe"</string>
     <string name="accessibility_service_state_off" msgid="2458594460762620776">"Valiwe"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Kuvumelekile"</string>
@@ -1181,14 +1244,12 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ayikho isevisi efakiwe"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Udinga isifundi skrini?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"I-TalkBack inikeza usizo lokuphendula kwezi ukuze kusizakale abangaboni kanye nalabo ababona kancane. Ingabe uyafuna ukuyifaka mahhala uyithola Emaketheni ye-Android?"</string>
-    <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"Faka imibhalo yewebhu"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Ingabe ukuthi insiza ifake imibhalo ye-Google ezokwenza ukuthi okuqukethwe kwabo kutholakale kalula?"</string>
-    <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="1072730037861494125">"Akukho ncazelo enikeziwe."</string>
     <string name="settings_button" msgid="3006713718908152930">"Izilungiselelo"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Ibhetri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Yini ekade isebenzisa ibhetri"</string>
-    <string name="power_usage_not_available" msgid="3583407442633768046">"Idatha yokusebenzisa ibhetri ayitholakali"</string>
+    <string name="power_usage_not_available" msgid="3214000535532434353">"Idatha esebenzisa ibhethri ayitholakali."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ukusebenzisa ibhetri kusukela inqamuliwe"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Ukusebenzisa ibhetri kusukela ekuhleleni futhi"</string>
@@ -1286,7 +1347,7 @@
     <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" msgid="3305141107104670703">"Injini oyikhethile ayikwazi ukusebenza."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Misa"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"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>
@@ -1302,7 +1363,7 @@
     <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_notif_engine_install_message" msgid="7250804349781973329">"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>
@@ -1319,6 +1380,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Susa zonke izitifiketi"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Izifakazeli ezithenjwayo"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Bonisa izitifiketi ze-CA ezithenjwayo"</string>
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dweba iphethini yakho yokuvula"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukufakwa kwezincwadi ezichaza ngomuntu."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Thayipha iphasiwedi yokulondoloza ukufakazela ubuqiniso"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Iphasiwedi yamanje:"</string>
@@ -1330,7 +1393,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Isitoreji sokuqinisekisa sisuliwe."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Ukulonda kokuqinisekia akwazanga ukusulwa."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Isitoreji sokuqinisekisa sivunyelwe."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Kumele usethe iphinikhodi noma iphasiwedi yokukhiya isikrini ngaphambi kokusebenzisa ukugcina kokuqinisekisa."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kumele usethe iphinikhodi noma iphasiwedi yokukhiya isikrini ngaphambi kokusebenzisa ukugcina kokuqinisekisa."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ithoni ephuthumayo"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Hlela ukuziphatha lapho ikholi oluphuthumayo lwenziwa"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sekela ngokulondoloza usethe kabusha"</string>
@@ -1344,8 +1407,8 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Ukubuyisela esimweni okuzenzakalelayo"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Uma ufaka futhi uhlelo lokusebenza, buyisela okuhlelwe ukusebenza kwezipele kanye nemininingo"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Iphasiwedi yokusekela ngokulondoloza ye-Desktop"</string>
-    <string name="local_backup_password_summary_none" msgid="4780151366296088113">"Ukusekela ngokulondoloza okugcwele kwe-Desktop akuvikelekile okwamanje."</string>
-    <string name="local_backup_password_summary_change" msgid="3615162467655442441">"Khetha ukushintsha noma ukususa iphasiwedi yokwenziwa kwezipele ngokugcwele kwideskithophu"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Ukusekela ngokulondoloza okugcwele kwe-Desktop akuvikelekile okwamanje."</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Khetha ukushintsha noma ukususa iphasiwedi yokwenziwa kwezipele ngokugcwele kwideskithophu"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Yeka ukulondoloza amaphasiwedi akho e-Wi-Fi, amabhukumaka, ezinye izilungiselelo, kanye nemininingwne yensinhlelo zokusebenza, uphinde ususe wonke amakhophi kwiseva ye-Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Izilungiselelo zomphathi wedivaysi"</string>
@@ -1360,9 +1423,9 @@
     <string name="device_admin_status" msgid="4252975713178851910">"Lo mphathi 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="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ithoni yokukhala yekholi nokudlidliza"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"Isistimu"</string>
     <string name="wifi_setup_title" msgid="661074868726906436">"Ukumisa i-Wi-Fi"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Xhuma kwinethiwekhi ye-Wi-Fi<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Ixhuma kwinethiwekhi ye-Wi-Fi<xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1379,7 +1442,7 @@
     <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="5317003416385428036">"Iskena uhleloxhumano..."</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Iskenela 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>
@@ -1394,7 +1457,9 @@
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Ukunika amandla kuvumelanisiwe"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Ukuvumelanisa kukhubaziwe"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Iphutha lokuvumelanisa."</string>
-    <string name="account_sync_settings_title" msgid="4578227872921044660">"Vumelanisa izilungiselelo"</string>
+    <string name="sync_failed" msgid="1696499856374109647">"Ukuvumelanisa kwehlulekile"</string>
+    <string name="sync_active" msgid="8476943765960863040">"Ukuvumelanisa kuyasebenza"</string>
+    <string name="account_sync_settings_title" msgid="5131314922423053588">"Vumelanisa"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Ukuvumelanisa okwamanje kubhekene nenkinga. Izobuya maduze."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Yengeza  i-akhawunti"</string>
     <string name="background_data" msgid="5779592891375473817">"Idatha yasemuva"</string>
@@ -1405,6 +1470,8 @@
     <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="last_synced" msgid="4242919465367022234">"Ukuvumelanisa kokugcina <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Vumelanisa manje"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Sekela ngokulondoloza izilungiselelo"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Sekela ngokulondoloza izilungiselelo zami"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Vumelanisa manje"</string>
@@ -1414,7 +1481,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Ikhalenda"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Othintana nabo"</string>
-    <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="sync_plug" msgid="3905078969081888738"><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="6205903695598000286">"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>
@@ -1428,7 +1495,8 @@
     <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Le akhawunti ifunwa ngezinye izinhlelo zokusebenza. Ungakwazi ukukususa kuphela ngokuthi ulungise kabusha i-tablet ibuyele kulokho okwakwenziwe lapho yakhiwe khona (okususa yonke imininingo yomuntu) Kokuhlelelwe ukusebenza &gt; Isipele &amp; lungisa kabusha."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Le akhawunti ifunwa ngezinye izinhlelo zokusebenza. Ungakwazi ukukususa kuphela ngokuthi ulungise kabusha i-tablet ibuyele kulokho okwakwenziwe lapho yakhiwe khona (okususa yonke imininingo yomuntu) Kokuhlelelwe ukusebenza &gt; Isipele &amp; lungisa kabusha."</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>
+    <!-- no translation found for sync_item_title (4782834606909853006) -->
+    <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Ayikwazi ukuvumelanisa ngesandla"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ukuvumelanisa kwalentwana kuvimbelwe okwamanje. Ukushintsha okukhethwayo kwakho, vula idatha yasemuva nokuvumelanisa okuzenzakalelayo."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Izilungiselelo ze-4G"</string>
@@ -1436,7 +1504,6 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Ikheli le-4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Faka iphasiwedi ukuze ususe okufakwe kwindawo yokugcina"</string>
     <string name="try_again" msgid="4272075051293936921">"Zama futhi."</string>
-    <string name="service_busy" msgid="2325014135156127705">"Insizakalo ayitholakali. Zama futhi."</string>
     <string name="delete" msgid="4219243412325163003">"Susa"</string>
     <string name="misc_files" msgid="6720680815969643497">"Amafayela axubene"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"kukhethwe <xliff:g id="NUMBER">%1$d</xliff:g> kokuyi <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -1444,21 +1511,45 @@
     <string name="select_all" msgid="1562774643280376715">"Khetha konke"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Ihlola i-HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Hlela ukuhlola ukuziphatha kwe-HDCP"</string>
-    <string name="debug_ui_category" msgid="9023948280291055349">"Isixhumi esinonakalayo"</string>
+    <string name="debug_debugging_category" msgid="6781250159513471316">"Ilungisa inkinga"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Khetha uhlelo lokusebenza lokulungisa inkinga"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"Alukho uhlelo lokusebenza lokulungisa inkinga olusethiwe"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Uhlelo lokusebenza lokulungisa inkinga: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"Khetha uhlelo lokusebenza"</string>
+    <string name="no_application" msgid="2813387563129153880">"Lutho"</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Linda isilungisi senkinga"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Uhlelo lokusebenza olulungiswe inkinga lulinda isilungisi senkinga ukuba sinamathisele ngaphambi kokuphuma"</string>
+    <string name="debug_input_category" msgid="1811069939601180246">"Okufakwayo"</string>
+    <string name="debug_drawing_category" msgid="6755716469267367852">"Umdwebo"</string>
+    <string name="debug_monitoring_category" msgid="7640508148375798343">"Ukwengamela"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Imodi eqinile ivumelwe"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Ukuphazimisa isikrini uma izinhlelo zokusebenza ziyenza umsebenzi ngesikhathi eside kuchungechunge olukhulu"</string>
     <string name="pointer_location" msgid="6084434787496938001">"Isikhombi sendawo"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Imbondela yesikrini ibonisa idatha yokuthinta yamanje"</string>
     <string name="show_touches" msgid="1356420386500834339">"Khombisa okuthintiwe"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Khombisa umbiko obonwayo wokuthintiwe"</string>
-    <string name="show_screen_updates" msgid="8282711794220426931">"Bonisa izibuyekezo zesikrini"</string>
-    <string name="show_screen_updates_summary" msgid="1716122382094924596">"Khanyisa izindawo zesikrini uma ubuyekeza"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Buka izibuyekezo ezibonakalayo"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Khanyisa ukubonakala kwalo lonke iwindi uma libuyekezwa"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Buka izibuyekezo ze-GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Ukubuka okukhanyayo phakathi kwamawindi uma kudwetshwe nge-GPU"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Khubaza izimbondela ze-HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Njalo sebenzisa i-GPU ukwakha isikrini"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Nika amandla ukuthola"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Khetha ukunika amandla ukuthola"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Akukho ukuthola okwamanje okunikwe amandla"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Ukuthola okungu-<xliff:g id="NUM">%1$d</xliff:g> okwamanje kunikwe amandla"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Konke ukuthola okwamanje kunikwe amandla"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Khombisa imingcele yokumiseka"</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Bonisa imikhawulo, imiphetho, njll, yesiqeshana."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Bonisa ukusebenzisa i-CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Imbondela yesikrini ibonisa ukusetshenziswa kwe-CPU okwamanje"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Phoqa ukunikeza i-GPU"</string>
-    <string name="force_hw_ui_summary" msgid="8642000962902609976">"Sebenzisa i-2D hardware yokusheshisa izicelo"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Phoqelela ukusetshenziswa kwe-GPU ngomdwebo we-2d"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Iphrofayela ye-GPU iyasebenzeka"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Kala isikhathi sokusebenzeka ngama-adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Iwindi yesilinganisi sesithombe esinyakazayo"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Isilinganiso sesithombe soku"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Isilinganiso sobude besikhathi somenzi womfanekiso onyakazayo"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Izinhlelo zokusebenza"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ungagcini imisibenzi"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Phihliza zonke izenzo ngokushesha ngemva kokuna umsebenzisi awuyeka"</string>
@@ -1472,13 +1563,14 @@
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Ukusetshenziswa okuseceleni kwe-4G"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Bonisa ukusebenza kwe-WiFi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Bonisa ukusebenza kwe-Ethernet"</string>
+    <string name="data_usage_menu_metered" msgid="5056695223222541863">"Izindawo ezikudonsela kuzo zeselula"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Vumelanisa ngokuzenzakalela idatha"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Shintsha umjikelezo"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Usuku lwenyanga lokusetha kabusha ukusebenza kwedatha:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"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>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Ikalwe ikhompyutha yakho yepeni. I-akhawuntingi Yokusetshenziswa kwe-data kwesiphathi sakho ingehluka."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Ikalwe ucingo lwakho. I-akhawuntingi Yokusetshenziswa kwe-data kwesiphathi sakho ingehluka."</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"kuvinjelwe"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Khubaza idatha yeselula?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Setha umkhawulo wedatha yeselula"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Setha umkhawulo wedatha ye-4G"</string>
@@ -1489,33 +1581,45 @@
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Iselula"</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">"Iselula"</string>
-    <string name="data_usage_list_none" msgid="2899530183512542206">"Lutho"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Iselula"</string>
+    <string name="data_usage_list_none" msgid="3933892774251050735">"Lutho"</string>
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Idatha yeselula"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"idatha ye-2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"idatha ye-4G"</string>
     <string name="data_usage_app_settings" msgid="8430240158135453271">"Buka izilungiselelo zohlelo lokusebenza"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Gwema ukusetshenziswa kwedatha ngemuva?"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="6236080762898226645">"Yekisa ukusebenza imininingo engemuva yohlelo lokusebenza lwemininingo yeselula kuphela. Kuzosetshenziswa ukuxhumana kungenazintambo uma kutholakala."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Khubaza idatha yokwangasemuva kumanethiwekhi eselula. Amanethiwekhi okungewona eselula azosetshenziswa uma etholakala."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Ukuze ubeke umkhawulo wezisetshenziswa zangemuva zalesi sisetshenziswa, qala ulungise umkhawulo wemininingo yeselula."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Beka isivimbelo kwimininingo yemininingo egciniwe?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="5651588785118290771">"Lento ingadala ukuthi izinsiza ezincike emininingwaneni engemuva iyeke ukusebenza uma kungatholakali ukuxhumana okungenazintambo."\n\n"Ungathola okunye ukusetshenziswa kwe-ata okufanele ezisethweni ezitholakala ensizeni."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Lesi sici singahle sibangele uhlelo lokusebenza olukhosele kudatha yokwangasemuva ukungasasebenzi uma amanethiwekhi kuphela eselula atholakala."\n\n"Ungathola ukulawula kokusetshenziswa kwedatha okufanele kuzilungiselelo ezitholakalayo ngaphakathi kohlelo lokusebenza."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Imininingo yangemuva engavumelekile itholakala kuphela uma ubeke umkhawulo wemininingo yeselula."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Khanyisa ukuvumelanisa idatha ngokuzenzakalelayo?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Noma iziphi izinguquko ozenzayo kuma-akhawunti wakho kuwebhu zizokopishelwa ngokuzenzakalela efonini yakho."\n\n"Amanye ama-akhawunti angakopisha ngokuzenzakalela noma iziphi izinguquko ozenzayo kuthebulethi kuya kuwebhu. I-akhawunti yakwa-Google isebenza ngale ndlela."\n\n"Ukuze ukhethe ukuthi uluphi uhlobo lolwazi ongaluvumelanisa ngaphakathi kwe-akhawunti ngayinye, iya kuzilungiselelo &gt; ama-akhawunti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Noma iziphi izinguquko ozenzayo kuma-akhawunti wakho kuwebhu zizokopishelwa ngokuzenzakalela efonini yakho."\n\n"Amanye ama-akhawunti angakopisha ngokuzenzakalela noma iziphi izinguquko ozenzayo efonini kuya kuwebhu. I-akhawunti yakwa-Google isebenza ngale ndlela."\n\n"Ukuze ukhethe ukuthi uluphi uhlobo lolwazi ongaluvumelanisa ngaphakathi kwe-akhawunti ngayinye, iya kuzilungiselelo &gt; ama-akhawunti."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Cima ukuvumelanisa idatha ngokuzanzakalela?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Lokhu kuzokonga ukusetshenziswa kwedatha nebhethri, kepha uzodinga ukuvumelanisa i-akhawunti ngayinye ngokwenza ukuze uqoqe ulwazi lakamuva. Futhi ngeke uthole izaziso uma izibuyekezo zivela."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Usuku lokuhlela kabusha umjikelezo wokusebenza"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Idethi yenyanga ngayinye:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Hlela"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setha isexwayiso sokusebenziseka kwedatha"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setha umkhawulo wokusetshenziswa kwedatha"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ilinganisela ukusebenza kwedatha"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Uku <xliff:g id="NETWORKS">%1$s</xliff:g> xhumaniseka kwakho kwi-data kuyonqanyulwa uma ufika emkhawulweni obaluliwe. "\n\n"Njengoba ukusetshenziswa kwe-data kukalwa ngekhompyutha yakho yepeni, kanti nomgodla wakho ungabhekana nokusetshenziswa ngokwehlukile, kucabange ukusebenzisa umkhawulo olandelanayo."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Uku <xliff:g id="NETWORKS">%1$s</xliff:g> xhumaniseka kwakho kwi-data kuyonqanyulwa uma ufika emkhawulweni obaluliwe. "\n\n"Njengoba ukusetshenziswa kwe-data kukalwa ngocingo lwakho, kanti nomgodla wakho ungabhekana nokusetshenziswa ngokwehlukile, kucabange ukusebenzisa umkhawulo olandelanayo."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Uxhumo lwedatha yakho yeselula luzokhubazwa uma uma umkhawulo ocacisiwe usufinyelelwe."\n\n"Njengoba ukusetshenziswa kwedatha kukalwa ngethebulethi yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, naka ukusebenzisa umkhawulo olandelanayo."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Uxhumo lwedatha yakho yeselula luzokhubazwa uma umkhawulo ocacisiwe usufinyelelwe."\n\n"Njengoba ukusetshenziswa kwedatha kukalwa ngefoni yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, naka ukusebenzisa umkhawulo olandelanayo."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Gwema ukusebenza kwedatha yangemuva?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Uma ugwema ukusetshenziswa kwedatha yangemuva kuselula, ezinye izinhlelo zokusebenza kanye namasevisi ngeke kusebense ngaphandle uma uxhumaniseke enethiwekhini ye-Wifi."</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">"isexwayiso"</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">"umkhawulo"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Izinhlelo zokusebenza zisusiwe"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> itholiwe, <xliff:g id="SENT">%2$s</xliff:g> ithunyelwe"</string>
-    <string name="data_usage_total_during_range" msgid="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: cishe kusetshenziswe okungu-<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: cishe kusetshenziswe okungu-<xliff:g id="TOTAL">%1$s</xliff:g>."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: cishe kusetshenziswe okungu-<xliff:g id="TOTAL">%1$s</xliff:g>, njengoba kulinganiswe ithebhulethi yakho. Ukusetshenziswa kwedatha yenkampani yenethiwekhi yakho kungahluka."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: cishe kusetshenziswe okungu-<xliff:g id="TOTAL">%1$s</xliff:g>, njengoba kulinganiswe ifoni yakho. Ukusetshenziswa kwedatha yenkampani yenethiwekhi yakho kungahluka."</string>
+    <string name="data_usage_metered_title" msgid="6204750602856383278">"Izindawo ezikudonsela kuzo zeselula"</string>
+    <string name="data_usage_metered_body" msgid="2446827764036316131">"Khetha amanethiwekhi e-Wi-Fi ayizindawo ezidonsela kuzo zeselula. Izinhlelo zokusebenza zingakhawulelwa ekusebenziseni lawo manethiwekhi uma angasemuva. Izinhlelo zokusebenza futhi zingahle zexwayise ngaphambi kokusebenzisa lawo manethiwekhi ngokulanda okukhulu."</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Amanethiwekhi eselula"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Amanethiwekhi e-Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Ukuze ukhethe izindawo ezikudonsela kuzo zeselula, khanyisa i-Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ikholi ephuthmayo"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Buyela ekholini"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Igama"</string>
@@ -1536,17 +1640,19 @@
     <string name="vpn_password" msgid="6756043647233596772">"Iphasiwedi"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Lolondoloza ulwazi lwe-akhawunti"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ayisetshenziswa)"</string>
-    <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ungaqinisekisi isiphakeli)"</string>
+    <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(ungaqinisekisi iseva)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(itholakale kwi-server)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Khansela"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Londoloza"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Xhuma kwi-inthanethi"</string>
-    <string name="vpn_edit" msgid="1111459297288136079">"Hlela inethiwekhi ye-VPN"</string>
-    <string name="vpn_connect_to" msgid="7328758950427515753">"Xhuma kwi-<xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Hlela iphrofayela ye-VPN"</string>
+    <string name="vpn_connect_to" msgid="5965299358485793260">"Xhuma ku-<xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"I-VPN"</string>
-    <string name="vpn_create" msgid="8966010925994175306">"Engeza inethiwekhi ye-VPN"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Hlela inethiwekhi"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Susa inethiwekhi"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Engeza iphrofayela ye-VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Hlela iphrofayela"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Susa iphrofayela"</string>
+    <string name="vpn_no_network" msgid="3050233675132726155">"Alukho uxhumo lenethiwekhi. Sicela uzame futhi emva kwesikhathi."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Isitifiketi silahlekile. Sicela uhlelo iphrofayela."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Isistimu"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Umsebenzisi"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Khubaza"</string>
@@ -1555,25 +1661,7 @@
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vumela isitifiketi sesistimu se-CA?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Khubaza isitifiketi sesistimu se-CA"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Susa ngokuphelele isitifiketi se-CA somsebenzidi?"</string>
-    <string name="accessibility_tutorial_title" msgid="5163147830174854622">"Okokufundisa kokufinyelela"</string>
-    <string name="accessibility_tutorial_next" msgid="5079911515520801099">"Okulandelayo"</string>
-    <string name="accessibility_tutorial_back" msgid="2583933084111712540">"Emuva"</string>
-    <string name="accessibility_tutorial_finish" msgid="3964330895719289570">"Qeda"</string>
-    <string name="accessibility_tutorial_skip" msgid="3635250542851027317">"Yeqa okokufundisa"</string>
-    <string name="accessibility_tutorial_lesson_1_title" msgid="1358771359529627110">"Isifundo 1: Ukuhlaziya isikrini"</string>
-    <string name="accessibility_tutorial_lesson_1_text_1" msgid="477937585801538951">"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>
-    <string name="accessibility_tutorial_lesson_1_text_2_more" msgid="7849927882225521983">"Kuhle, Qhubeka nokuslayida umunwe wakho esikrinini kuze kube yilapho usuthole okungenani isithanya esisodwa"</string>
-    <string name="accessibility_tutorial_lesson_1_text_3" msgid="3973201880357468747">"Ukuze uqalise into oyithintayo. Slayida umunwe wakho uze uthole isithonjana se <xliff:g id="APP_NAME">%s</xliff:g>. Bese uthepha isithonjane kanye ukuze usiqalise."</string>
-    <string name="accessibility_tutorial_lesson_1_text_4" msgid="1032496840167920946">"Umunwe wakho uthinte <xliff:g id="APP_NAME">%s</xliff:g> isithonjana. Thepha kanye ukuvuselela isithonjana."</string>
-    <string name="accessibility_tutorial_lesson_1_text_4_exited" msgid="4950620030782545150">"Umunwe wakho uhambe phezu kwe <xliff:g id="APP_NAME">%s</xliff:g> isithonjana, bese sahamba kude. Slayida umunwe wakho esikrinini kuze kube yilapho usuthola isithonjana Sesiphequluli futhi."</string>
-    <string name="accessibility_tutorial_lesson_1_text_5" msgid="9010294007210301008">"Kuhle. ukudlulela esifundweni esilandelayo, thola eyokuqalisa <xliff:g id="NEXT">%s</xliff:g> inkinobho, engakwesokudla phansi nesikrini."</string>
-    <string name="accessibility_tutorial_lesson_2_title" msgid="5970537388562569614">"Isifundo sesi-2: Ukuphenya usebenzisa iminwe emibili"</string>
-    <string name="accessibility_tutorial_lesson_2_text_1" msgid="8764686624055084454">"Ukuze uphenye ohlwini, ungaslayida iminwe emibili esikrinini. Ngokwesibonelo, isikrini samanje siqukethe uhlu lwamagama ohlelo kusebenza angaya phansi noma phezulu. Okokuqala, zama ukuthola izintwana ezimbalwa ohlwini ngokuslayida umunwe owodwa ngapha nangapha."</string>
-    <string name="accessibility_tutorial_lesson_2_text_2_more" msgid="2052918502757226679">"Kuhle. Qhubeka nokuslayida umunwe wakho uze uthole okungenani intwana eyodwa."</string>
-    <string name="accessibility_tutorial_lesson_2_text_3" msgid="1326501593438442305">"Manje beka iminwe emibili entweni esohlwini bese uslayida yomibili iminwe phezulu. Uma ufika ngenxa kwesikrini, phakamisa iminwe yakho, uyibeke ezansi kohlu, bese uqhubeke nokuslayida."</string>
-    <string name="accessibility_tutorial_lesson_2_text_3_more" msgid="2223814499106104083">"Kuhle. Qhubeka ngokuslayida iminwe yakho ukuze uphenye ngaphezulu."</string>
-    <string name="accessibility_tutorial_lesson_2_text_4" msgid="3055831259260848004">"Uqede okokufundisa. Ukuze uphume, thola inkinobho <xliff:g id="FINISH">%s</xliff:g> yokuthepha."</string>
-    <string name="spellcheckers_settings_title" msgid="8843785708050235008">"Isilungiso sokubhala"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Umhloli wokupela"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Faka lapha iphasiwedi yakho yokusekela ngokulondoloza okugcwele"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Faka lapha iphasiwedi entsha yokusekela ngokulondoloza okugcwele"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Thayipha futhi iphasiwedi yakho yokusekela ngokulondoloza okugcwele"</string>
@@ -1581,4 +1669,22 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Khansela"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ukubuyekeza kwesistimu okwengeziwe"</string>
+    <string name="user_settings_title" msgid="5189224330534906766">"Umthetho &amp; wokuthibela wabasebenzisi"</string>
+    <string name="user_list_title" msgid="2152311434413878709">"Abasebenzisi"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Engeza umsebenzisi"</string>
+    <string name="user_details_title" msgid="3037625632127241370">"Hlela imininingwane"</string>
+    <string name="user_information_heading" msgid="8728151075759863162">"Ulwazo lomsebenzisi"</string>
+    <string name="user_name_title" msgid="7563724675699398319">"Igama"</string>
+    <string name="user_restrictions_heading" msgid="4426403050397418553">"Imikhakhawulo yokuqukethwe"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"Idinga iphinikhodi"</string>
+    <string name="user_max_content_rating" msgid="8297759970216482772">"Isilinganiselwa sokuqukethwe"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"Uhlelo lokusebenza lwesistimu"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"Izinhlelo zokusebenza ezifakiwe"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Lahla"</string>
+    <string name="user_remove_user_menu" msgid="3210146886949340574">"Susa umsebenzisi"</string>
+    <string name="user_new_user_name" msgid="7603010274765911161">"Ingane ye-Pesky"</string>
+    <string name="user_confirm_remove_title" msgid="3856148232937245711">"Susa umsebenzisi?"</string>
+    <string name="user_confirm_remove_message" msgid="5284111415714437285">"Ingabe unesiqinisekiso sokuthi ufuna ukususa umsebenzisi nayo yonke idatha ephathelene kusuka kudivayisi?"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"Bonisa izaziso"</string>
+    <string name="help_label" msgid="1107174367904110532">"Usizo"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 80cb2cf..3367a57 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -237,6 +237,10 @@
         <item>Disconnected</item>
         <!-- Status message of Wi-Fi when it is a failure. -->
         <item>Unsuccessful</item>
+        <!-- Status message of Wi-Fi when it is blocked. -->
+        <item>Blocked</item>
+        <!-- Status message of Wi-Fi when connectiong is being verified. -->
+        <item>Temporarily avoiding poor connection</item>
     </string-array>
 
     <!-- Match this with the order of NetworkInfo.DetailedState. --> <skip />
@@ -262,6 +266,10 @@
         <item>Disconnected</item>
         <!-- Status message of Wi-Fi when it is a failure. -->
         <item>Unsuccessful</item>
+        <!-- Status message of Wi-Fi when it is blocked. -->
+        <item>Blocked</item>
+        <!-- Status message of Wi-Fi when connectiong is being verified. -->
+        <item>Temporarily avoiding poor connection</item>
     </string-array>
 
     <!-- Match this with the constants in AccessPoint. --> <skip />
@@ -430,19 +438,6 @@
         <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">
@@ -553,20 +548,6 @@
         <item>auto</item>
     </string-array>
 
-    <!-- Silent mode options. -->
-    <string-array name="silent_mode_entries">
-        <item>Off</item>
-        <item>Vibrate</item>
-        <item>Mute</item>
-    </string-array>
-
-    <!-- Values for Silent mode. Do not translate. -->
-    <string-array name="silent_mode_values" translatable="false">
-        <item>off</item>
-        <item>vibrate</item>
-        <item>mute</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] -->
@@ -649,6 +630,28 @@
         <item>10</item>
     </string-array>
 
+    <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
+    <string-array name="animator_duration_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 animator duration scale preference. -->
+    <string-array name="animator_duration_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>
@@ -707,4 +710,22 @@
         <!-- Status message when VPN is failed. -->
         <item>Unsuccessful</item>
     </string-array>
+
+    <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
+    <string-array name="user_content_ratings_entries" translatable="false">
+        <item>Ascended being</item>
+        <item>Human</item>
+        <item>Neanderthal</item>
+        <item>Chimp</item>
+        <item>Monkey</item>
+    </string-array>
+
+    <!-- Values for user content ratings for restricted users -->
+    <string-array name="user_content_ratings_values" translatable="false">
+        <item>5</item>
+        <item>4</item>
+        <item>3</item>
+        <item>2</item>
+        <item>1</item>
+    </string-array>
 </resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 278859b..23bdf0d 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -25,4 +25,11 @@
 
     <!-- Display additional System Update menu if true -->
     <bool name="config_additional_system_update_setting_enable">false</bool>
+
+    <!-- Whether the bluetooth activation confirmation dialogs should be auto dismissed.
+         Can be overridden for specific product builds. -->
+    <bool name="auto_confirm_bluetooth_activation_dialog">false</bool>
+
+    <!-- Whether User management screen is available -->
+    <bool name="enable_user_management">false</bool>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2bba937..f81d614 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,4 +32,6 @@
 
     <color name="divider_color">#20ffffff</color>
     <color name="title_color">@android:color/holo_blue_light</color>
+    <color name="setup_divider_color">#333333</color>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index 4119b6a..557dadb 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -22,4 +22,11 @@
     <string name="additional_system_update" translatable="false"></string>
     <string name="additional_system_update_menu" translatable="false"></string>
 
+    <!-- TODO: This is purely enforced by the interface, and does not affect what
+         strings may be inserted into the actual content provider.
+         With the addition of shortcuts, it seems more likely that users will
+         find this limiting; it would be good to have the interface work with
+         very long strings too. -->
+    <integer name="maximum_user_dictionary_word_length" translatable="false">48</integer>
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9649ed3..9335788 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -23,10 +23,11 @@
     <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="bind_app_widget_dialog_checkbox_bottom_padding">16dip</dimen>
+    <dimen name="installed_app_details_bullet_offset">8dip</dimen>
 
     <dimen name="data_usage_chart_height">252dip</dimen>
     <dimen name="data_usage_chart_optimalWidth">440dip</dimen>
@@ -34,4 +35,20 @@
     <dimen name="volume_seekbar_side_margin">8dip</dimen>
 
     <dimen name="crypt_clock_size">100sp</dimen>
+
+    <item type="dimen" name="setup_title_height">15%</item>
+    <item type="dimen" name="setup_border_width">5%</item>
+    <dimen name="setup_margin_bottom">0dip</dimen>
+    <dimen name="setup_title_size">25sp</dimen>
+    <dimen name="setup_button_size">32dip</dimen>
+    <dimen name="setup_item_margin">16dip</dimen>
+
+    <dimen name="divider_height">3dip</dimen>
+    <dimen name="divider_margin_top">6dip</dimen>
+    <dimen name="divider_margin_bottom">7dip</dimen>
+
+    <!--  Size of icons in the top-level of settings  -->
+    <dimen name="header_icon_width">28dp</dimen>
+    <dimen name="appwidget_min_width">260dip</dimen>
+    <dimen name="appwidget_min_height">40dip</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 09677f3..91d92e8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,6 +20,9 @@
     <!-- Strings for Dialog no button -->
     <string name="no">"No"</string>
 
+    <!-- Strings for Dialog create button -->
+    <string name="create">Create</string>
+
     <!-- Device Info --> <skip />
     <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
     <string name="device_info_default">Unknown</string>
@@ -231,6 +234,10 @@
     <string name="bluetooth_devices">Bluetooth devices</string>
     <!-- Bluetooth settings screen, title for the current bluetooth name setting -->
     <string name="bluetooth_device_name">Device name</string>
+    <!-- Bluetooth settings screen, image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+    <string name="bluetooth_device_details">Device settings</string>
+    <!-- Bluetooth settings screen, image description for profile of a device details button. -->
+    <string name="bluetooth_profile_details">Profile settings</string>
     <!-- Bluetooth settings screen, summary text when there isn't a name set (for the name setting) -->
     <string name="bluetooth_name_not_set">No name set, using account name</string>
     <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
@@ -273,8 +280,6 @@
     <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">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">Touch 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 nearby Bluetooth devices were found.</string>
     <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
@@ -282,12 +287,12 @@
     <!-- 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">Touch to pair with <xliff:g id="device_name">%1$s</xliff:g></string>
+    <string name="bluetooth_notif_message">Touch 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>
+    <string name="device_picker">Bluetooth device chooser</string>
 
     <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
     <string name="bluetooth_permission_request">"Bluetooth permission request"</string>
@@ -335,7 +340,7 @@
     <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>
+    <string name="bluetooth_pb_acceptance_dialog_text">%1$s wants 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>
@@ -402,7 +407,7 @@
     <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
     <string name="proxy_error_invalid_exclusion_list">The exclusion list you typed isn\'t properly formatted. Type 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>
+    <string name="proxy_error_empty_port">You need to 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 -->
@@ -487,25 +492,25 @@
     <string name="band_mode_succeeded">Successful</string>
 
     <!-- Instructions after the user changes the mass storage settings -->
-    <string name="sdcard_changes_instructions">Changes take effect when USB cable is reconnected</string>
+    <string name="sdcard_changes_instructions">Changes take effect when USB cable is reconnected.</string>
     <!-- Enable USB mass storage mode checkbox title -->
     <string name="sdcard_settings_screen_mass_storage_text">Enable USB mass storage</string>
     <!-- The label for total bytes on SD card -->
     <string name="sdcard_settings_total_bytes_label">Total bytes:</string>
     <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
-    <string name="sdcard_settings_not_present_status" product="nosdcard">USB storage not mounted</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard">USB storage not mounted.</string>
     <!-- Message when there is no SD card present -->
-    <string name="sdcard_settings_not_present_status" product="default">No SD card</string>
+    <string name="sdcard_settings_not_present_status" product="default">No SD card.</string>
     <!-- Th label for the available (free) sapce on the SD card -->
     <string name="sdcard_settings_available_bytes_label">Available bytes:</string>
     <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard">USB storage is being used as a mass storage device</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard">USB storage is being used as a mass storage device.</string>
     <!-- Message when the SD card is being used by the computer as mass storage -->
-    <string name="sdcard_settings_mass_storage_status" product="default">SD card is being used as a mass storage device</string>
+    <string name="sdcard_settings_mass_storage_status" product="default">SD card is being used as a mass storage device.</string>
     <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
-    <string name="sdcard_settings_unmounted_status" product="nosdcard">It\'s now safe to remove the USB storage</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard">It\'s now safe to remove the USB storage.</string>
     <!-- Message when it is safe to remove the SD card -->
-    <string name="sdcard_settings_unmounted_status" product="default">It\'s now safe to remove the SD card</string>
+    <string name="sdcard_settings_unmounted_status" product="default">It\'s now safe to remove the SD card.</string>
     <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
     <string name="sdcard_settings_bad_removal_status" product="nosdcard">USB storage was removed while still in use!</string>
     <!-- Error message when the SD card was removed without properly unmounting -->
@@ -517,9 +522,9 @@
     <!-- Message when it is scanning the SD card for new files -->
     <string name="sdcard_settings_scanning_status" product="default">Scanning SD card for media\u2026</string>
     <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
-    <string name="sdcard_settings_read_only_status" product="nosdcard">USB storage mounted read-only</string>
+    <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>
+    <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. -->
@@ -583,9 +588,9 @@
     <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box -->
     <string name="roaming_turn_it_on_button">Turn it on</string>
     <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
-    <string name="roaming_warning">Allow data roaming? You may incur significant roaming charges!</string>
+    <string name="roaming_warning">When you allow data roaming, you may incur significant roaming charges!</string>
     <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
-    <string name="roaming_reenable_title">Attention</string>
+    <string name="roaming_reenable_title">Allow data roaming?</string>
     <!-- mobile network settings screen, setting option name -->
     <string name="networks">Operator selection</string>
     <!-- mobile network settings screen, setting option summary text -->
@@ -623,7 +628,7 @@
     <!-- Date & time setting screen setting option title -->
     <string name="date_time_set_date">Set date</string>
     <!-- Date & time setting screen setting option title.  This setting allows the user to choose how the date should be displayed in apps (what ordering for month and day, etc.) -->
-    <string name="date_time_date_format">Select date format</string>
+    <string name="date_time_date_format">Choose date format</string>
     <!-- Menu item on Select time zone screen -->
     <string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string>
     <!-- Menu item on Select time zone screen -->
@@ -639,6 +644,10 @@
 
     <!-- Security settings screen when using face unlock, setting option name to start an activity that allows the user to improve accuracy by adding additional enrollment faces -->
     <string name="biometric_weak_improve_matching_title">Improve face matching</string>
+<!-- On the security settings screen when using face unlock.  This checkbox is used to toggle whether liveliness detection is required.  If it is checked the user must blink during unlock to prove it's not a photo  -->
+    <string name="biometric_weak_liveliness_title">Liveness check</string>
+    <!-- On the security settings screen when using face unlock.  The summary of the liveliness checkbox -->
+    <string name="biometric_weak_liveliness_summary" msgid="7980026533493781616">Require eye blink while unlocking</string>
 
     <!-- Security settings screen, setting option name to change screen timeout -->
     <string name="lock_after_timeout">Automatically lock</string>
@@ -685,8 +694,8 @@
     <!-- 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 apps 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
+    media, and other files. Once you encrypt your tablet, you need to type a numeric PIN
+    or password to decrypt it each time you power it on. You can\'t decrypt 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
@@ -694,8 +703,8 @@
     <!-- 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 apps 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
+    media, and other files. Once you encrypt your phone, you need to type a numeric PIN or
+    password to decrypt it each time you power it on. You can\'t decrypt 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
@@ -714,19 +723,19 @@
     <!-- 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
+    <string name="crypt_keeper_dialog_need_password_message">You need to 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>
+    <string name="crypt_keeper_confirm_title">Encrypt?</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.
+    The encryption operation is irreversible and if you interrupt it, you\'ll 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.
+    The encryption operation is irreversible and if you interrupt it, you\'ll lose data.
     Encryption takes an hour or more, during which the phone will restart several times.
     </string>
 
@@ -754,7 +763,7 @@
       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.
+      To resume using your tablet, you need to 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>
@@ -763,16 +772,19 @@
     <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.
+      \n\nTo resume using your phone, you need to 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>
 
+    <!-- Image button description to switch input method -->
+    <string name="crypt_keeper_switch_input_method">Switch input method</string>
+
     <!-- Unlock Picker Settings --><skip />
 
     <!-- Security Picker --><skip />
     <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
-    <string name="lock_settings_picker_title">Select screen lock</string>
+    <string name="lock_settings_picker_title">Choose screen lock</string>
 
     <!--  Title for security picker when choosing a facelock's backup unlock method: Pattern/PIN [CHAR LIMIT=22] -->
     <string name="backup_lock_settings_picker_title">Choose backup lock</string>
@@ -833,11 +845,11 @@
     <!-- Summary for "Configure lockscreen" when security biometric weak is enabled [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_biometric_weak">Face Unlock</string>
     <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_mode_pattern">Secured with pattern</string>
+    <string name="unlock_set_unlock_mode_pattern">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>
+    <string name="unlock_set_unlock_mode_pin">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>
+    <string name="unlock_set_unlock_mode_password">Password</string>
 
     <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
     <string name="unlock_disable_lock_title">Turn off screen lock</string>
@@ -868,66 +880,66 @@
     <string name="lockpassword_continue_label">Continue</string>
 
     <!-- Error shown in popup when password is too long -->
-    <string name="lockpassword_password_too_long">Password must be fewer than <xliff:g id="number" example="17">%d</xliff:g> characters</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 must be fewer than <xliff:g id="number" example="17">%d</xliff:g> 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>
+    <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>
+    <string name="lockpassword_pin_recently_used">Device administrator doesn\'t allow 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>
+    <string name="lockpassword_illegal_character">Password contains an illegal character.</string>
 
     <!-- Error shown when in PASSWORD mode and password is all digits -->
-    <string name="lockpassword_password_requires_alpha">Password must contain at least one letter</string>
+    <string name="lockpassword_password_requires_alpha">Password must contain at least one letter.</string>
 
     <!-- Error shown when in PASSWORD mode and password doesn't contain any digits -->
-    <string name="lockpassword_password_requires_digit">Password must contain at least one digit</string>
+    <string name="lockpassword_password_requires_digit">Password must contain at least one digit.</string>
 
     <!-- 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>
+    <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+    <string name="lockpassword_password_recently_used">Device administrator doesn\'t allow using a recent password.</string>
 
     <!-- Label for ChoosePassword/PIN OK button -->
     <string name="lockpassword_ok_label">OK</string>
@@ -942,7 +954,7 @@
     <string name="lockpattern_tutorial_continue_label">Next</string>
 
     <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
-    <string name="lock_setup" msgid="5507462851158901718">Setup complete</string>
+    <string name="lock_setup" msgid="5507462851158901718">Setup is complete.</string>
 
     <!-- In the security screen, the header title for settings related to device admins -->
     <string name="device_admin_title">Device administration</string>
@@ -987,9 +999,9 @@
     <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>
+    <string name="bluetooth_enter_pin_other_device">You may also need to type 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>
+    <string name="bluetooth_enter_passkey_other_device">You may also need to type 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>
@@ -1018,7 +1030,7 @@
     <string name="bluetooth_pairing_rejected_error_message">Pairing rejected by <xliff:g id="device_name">%1$s</xliff:g>.</string>
 
     <!-- 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>
+    <string name="bluetooth_connecting_error_message">Couldn\'t connect to <xliff:g id="device_name">%1$s</xliff:g>.</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>
@@ -1137,8 +1149,11 @@
     <!-- NFC settings -->
     <!-- Used in the 1st-level settings screen to turn on NFC -->
     <string name="nfc_quick_toggle_title">NFC</string>
-    <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
-    <string name="nfc_quick_toggle_summary">Allow data exchange when the phone touches another device</string>
+    <!-- Description of NFC in the 1st level settings screen, for a tablet. [CHAR LIMIT=NONE] -->
+    <string name="nfc_quick_toggle_summary" product="tablet">Allow data exchange when the tablet touches another device</string>
+    <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
+    <string name="nfc_quick_toggle_summary" product="default">Allow data exchange when the phone touches another device</string>
+
     <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
     <string name="android_beam_settings_title">Android Beam</string>
     <!-- Used to describe the on state of the Android Beam feature [CHAR LIMIT=NONE] -->
@@ -1152,6 +1167,12 @@
     <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
     <string name="android_beam_explained">When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam Browser pages, YouTube videos, People contacts, and more.\n\nJust bring the devices together (typically back to back) and then touch your screen. The app determines what gets beamed.</string>
 
+    <!-- Network service discovery settings -->
+    <!-- Used in the 1st-level settings screen to turn on NSD -->
+    <string name="nsd_quick_toggle_title">Network service discovery</string>
+    <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
+    <string name="nsd_quick_toggle_summary">Allow apps on other devices to discover apps on this device</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>
@@ -1165,6 +1186,8 @@
     <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>
+    <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->
+    <string name="wifi_setup_wizard_title">Select Wi-Fi</string>
     <!-- Summary text when turning Wi-Fi or bluetooth on -->
     <string name="wifi_starting">Turning Wi-Fi on\u2026</string>
     <!-- Summary text when turning Wi-Fi or bluetooth off -->
@@ -1179,10 +1202,10 @@
     <string name="wifi_notify_open_networks">Network notification</string>
     <!-- Checkbox summary for option to notify user when open networks are nearby -->
     <string name="wifi_notify_open_networks_summary">Notify me when an open network is available</string>
-    <!-- Checkbox title for option to toggle wifi watchdog service -->
-    <string name="wifi_enable_watchdog_service">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 good Internet connection</string>
+    <!-- Checkbox title for option to toggle poor network detection -->
+    <string name="wifi_poor_network_detection">Avoid poor connections</string>
+    <!-- Checkbox summary for option to toggle poor network detection -->
+    <string name="wifi_poor_network_detection_summary">Don\'t use a Wi-Fi network unless it has a good Internet connection</string>
     <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
     <string name="wifi_setting_sleep_policy_title">Keep Wi-Fi on during sleep</string>
     <!-- Generic error message when the sleep policy could not be set. -->
@@ -1191,6 +1214,12 @@
     <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 do WPS Push Button [CHAR LIMIT=25]-->
+    <string name="wifi_menu_wps_pbc">WPS Push Button</string>
+    <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
+    <string name="wifi_menu_wps_pin">WPS Pin Entry</string>
+    <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
+    <string name="wifi_menu_p2p">Wi-Fi Direct</string>
     <!-- Menu option to scan Wi-Fi networks -->
     <string name="wifi_menu_scan">Scan</string>
     <!-- Menu option to Wi-Fi advanced settings -->
@@ -1204,23 +1233,41 @@
     <!-- Wi-Fi settings. text displayed when Wi-Fi 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>
     <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
-    <string name="wifi_empty_list_wifi_on">Wi-Fi on, but no Wi-Fi networks around.</string>
+    <string name="wifi_empty_list_wifi_on">Searching for Wi-Fi networks\u2026</string>
+    <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
+    <string name="wifi_other_network">Other network\u2026</string>
+    <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+    <string name="wifi_more">More</string>
+    <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
+    <string name="wifi_setup_wps">Automatic setup (WPS)</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">Type 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">Type 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>
+    <string name="wifi_wps_setup_title">Wi-Fi Protected Setup</string>
+    <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
+    <string name="wifi_wps_setup_msg">Starting WPS\u2026</string>
+    <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
+    <string name="wifi_wps_onstart_pbc">Press the Wi-Fi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol:</string>
+    <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
+    <string name="wifi_wps_onstart_pin">Enter pin <xliff:g id="number">%1$s</xliff:g> on your Wi-Fi router. The setup can take upto two minutes to complete.</string>
+    <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
+    <string name="wifi_wps_complete">WPS succeeded. Connecting to the network\u2026</string>
+    <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
+    <string name="wifi_wps_connected">Connected to Wi-Fi network <xliff:g id="network_name">%s</xliff:g></string>
+    <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
+    <string name="wifi_wps_in_progress">WPS is already in progress and can take upto two minutes to complete</string>
+    <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+    <string name="wifi_wps_failed_generic">WPS failed. Please try again in a few minutes.</string>
+    <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
+    <string name="wifi_wps_failed_wep">The wireless router security setting (WEP) is not supported</string>
+     <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
+    <string name="wifi_wps_failed_tkip">The wireless router security setting (TKIP) is not supported</string>
+     <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
+    <string name="wifi_wps_failed_auth">Authentication failure. Please try again.</string>
+     <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
+    <string name="wifi_wps_failed_overlap">Another WPS session was detected. Please try again in a few minutes.</string>
     <!-- Label for the SSID of the network -->
     <string name="wifi_ssid">Network SSID</string>
     <!-- Label for the security of the connection -->
@@ -1263,21 +1310,17 @@
     <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"></string>
-    <!-- Detailed message in Wi-Fi dialog when we disable Wi-Fi due to DNS failure. -->
-    <string name="wifi_disabled_help">The network was avoided due to poor connection. Turn off this behavior from the Settings &gt; Wi-Fi screen, Advanced menu item.</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>
     <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
-         string is listed first -->
-    <string name="wifi_wps_available_first_item">Protected network available</string>
+         string is listed first [CHAR LIMIT=20]-->
+    <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(protected network available)</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>
@@ -1317,17 +1360,19 @@
 
     <!-- Button label to connect to a Wi-Fi network -->
     <string name="wifi_connect">Connect</string>
+    <!-- Failured notification for connect -->
+    <string name="wifi_failed_connect_message">Failed to connect to network</string>
     <!-- Button label to delete a Wi-Fi network -->
     <string name="wifi_forget">Forget</string>
+    <!-- Failured notification for forget -->
+    <string name="wifi_failed_forget_message">Failed to forget network</string>
     <!-- Button label to save a Wi-Fi network configuration -->
     <string name="wifi_save">Save</string>
+    <!-- Failured notification for save -->
+    <string name="wifi_failed_save_message">Failed to save network</string>
     <!-- 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 Wi-Fi protected session was detected. Try again 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 Wi-Fi</string>
@@ -1377,23 +1422,31 @@
 
     <!-- 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">Set up peer-to-peer connectivity</string>
+    <string name="wifi_p2p_settings_title">Wi-Fi Direct</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">Type 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 remove a group-->
-    <string name="wifi_p2p_menu_remove_group">Remove group</string>
-    <!-- Menu option to Wi-Fi p2p advanced settings -->
-    <string name="wifi_p2p_menu_advanced">Advanced</string>
+    <string name="wifi_p2p_menu_search">Search for devices</string>
+    <!-- Menu option when discovery is in progress [CHAR LIMIT=25] -->
+    <string name="wifi_p2p_menu_searching">Searching\u2026</string>
+    <!-- Menu option to Rename-->
+    <string name="wifi_p2p_menu_rename">Rename device</string>
     <!-- Title for available p2p devices -->
-    <string name="wifi_p2p_available_devices">Available devices</string>
+    <string name="wifi_p2p_peer_devices">Peer devices</string>
+    <!-- Toast text for a failed connection initiation -->
+    <string name="wifi_p2p_failed_connect_message">Couldn\'t connect.</string>
+    <!-- Message text for failure to rename -->
+    <string name="wifi_p2p_failed_rename_message">Failed to rename device.</string>
+    <!-- Title for disconnect dialog -->
+    <string name="wifi_p2p_disconnect_title">Disconnect?</string>
+    <!-- Message text for disconnection from one device-->
+    <string name="wifi_p2p_disconnect_message">If you disconnect, your connection with <xliff:g id="peer_name">%1$s</xliff:g> will end.</string>
+    <!-- Message text for disconnection from multiple devices-->
+    <string name="wifi_p2p_disconnect_multiple_message">If you disconnect, your connection with <xliff:g id="peer_name">%1$s</xliff:g> and <xliff:g id="peer_count">%2$s</xliff:g> other devices will end.</string>
+    <!-- Title for cancel connect dialog -->
+    <string name="wifi_p2p_cancel_connect_title">Cancel invitation?</string>
+    <!-- Message text for disconnection from one device-->
+    <string name="wifi_p2p_cancel_connect_message">Do you want to cancel invitation to connect with <xliff:g id="peer_name">%1$s</xliff:g>?</string>
 
     <!-- Wifi AP settings-->
     <!-- Label for wifi tether checkbox. Toggles Access Point on/off -->
@@ -1403,7 +1456,7 @@
     <!-- Subtext for wifi tether checkbox on failure -->
     <string name="wifi_tether_failed_subtext">Portable Wi-Fi hotspot error</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>
+    <string name="wifi_tether_configure_ap_text">Set up Wi-Fi hotspot</string>
     <!-- Subtext on configuration preference to indicate SSID and security chosen -->
     <string name="wifi_tether_configure_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> portable Wi-Fi hotspot</string>
     <!-- Default access point SSID used for tethering -->
@@ -1498,8 +1551,6 @@
     <string name="display_settings_title">Display</string>
     <!-- Sound settings screen heading -->
     <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 name to pick ringtone (a list dialog comes up)-->
     <string name="ringtone_title">Phone ringtone</string>
     <!-- Sound settings screen, setting option summary text -->
@@ -1512,8 +1563,6 @@
     <string name="ring_volume_title">Ringer volume</string>
     <!-- Sound settings screen, setting option name checkbox -->
     <string name="vibrate_in_silent_title">Vibrate when silent</string>
-    <!-- Sound settings screen, setting option name checkbox -->
-    <string name="vibrate_on_ring_title">Vibrate and ring</string>
     <!-- Sound settings screen, setting option name -->
     <string name="notification_sound_title">Default notification</string>
     <!-- Sound settings screen, notification light repeat pulsing title -->
@@ -1553,6 +1602,17 @@
     <string name="volume_notification_description">Notifications</string>
     <!-- Volume description for alarm volume -->
     <string name="volume_alarm_description">Alarms</string>
+    <!-- Image description for ringer volume mute button. -->
+    <string name="volume_ring_mute">Mute ringtone &amp; notifications</string>
+    <!-- Image description for media volume mute button. -->
+    <string name="volume_media_mute">Mute music &amp; other media</string>
+    <!-- Image description for notification volume mute button. -->
+    <string name="volume_notification_mute">Mute notifications</string>
+    <!-- Image description for alarm volume mute button. -->
+    <string name="volume_alarm_mute">Mute alarms</string>
+    <!-- Sound settings screen, setting option name checkbox. About vibration setting
+         during incoming calls. [CHAR LIMIT=30] -->
+    <string name="vibrate_when_ringing_title">Vibrate when ringing</string>
 
     <!-- Dock settings title, top level -->
     <string name="dock_settings">Dock</string>
@@ -1573,9 +1633,9 @@
     <!-- 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" product="tablet">You must dock the tablet before setting up dock audio.</string>
+    <string name="dock_not_found_text" product="tablet">You need to dock the tablet before setting up dock audio.</string>
     <!-- Dock not found dialog text -->
-    <string name="dock_not_found_text" product="default">You must dock the phone before setting up dock audio.</string>
+    <string name="dock_not_found_text" product="default">You need to dock the phone before setting up dock audio.</string>
     <!-- Dock settings screen, dock events SFX setting check box label -->
     <string name="dock_sounds_enable_title">Dock insert sound</string>
     <!-- Dock settings screen, setting option summary text when check box is selected -->
@@ -1587,8 +1647,8 @@
     <!-- 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 title. This screen will list the different accounts (mail, gmail...) used on that phone and their sync settings -->
-    <string name="sync_settings">Accounts &amp; sync</string>
+    <!-- Account settings header. [CHAR LIMIT=30] -->
+    <string name="account_settings">Accounts</string>
 
     <!-- Main Settings screen, setting option name to go into search settings -->
     <string name="search_settings">Search</string>
@@ -1746,7 +1806,7 @@
     <!-- 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>
+    <string name="status_prl_version">PRL version</string>
     <!-- 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] -->
@@ -1786,7 +1846,7 @@
     <!-- 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>
+    <string name="memory_calculating_size">Calculating\u2026</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">Apps</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] -->
@@ -1860,6 +1920,7 @@
 
     <!-- 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]-->
@@ -1995,8 +2056,8 @@
     <string name="master_clear_final_button_text">Erase everything</string>
     <!-- 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 factory data reset.</string>
+    <!-- Explanation of drawing unlock pattern to reset phone -->
+    <string name="master_clear_gesture_explanation">You need to 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 isn\'t available.</string>
     <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
@@ -2028,9 +2089,9 @@
     <!-- Message to draw an unlock pattern before clearing the device -->
     <string name="media_format_gesture_prompt">Draw your unlock pattern</string>
     <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
-    <string name="media_format_gesture_explanation" product="nosdcard">You must draw your unlock pattern to confirm that you want to erase the USB storage.</string>
+    <string name="media_format_gesture_explanation" product="nosdcard">You need to draw your unlock pattern to confirm that you want to erase the USB storage.</string>
     <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
-    <string name="media_format_gesture_explanation" product="default">You must draw your unlock pattern to confirm that you want to erase the SD card.</string>
+    <string name="media_format_gesture_explanation" product="default">You need to draw your unlock pattern to confirm that you want to erase the SD card.</string>
 
     <!-- Main settings screen, Call settings title for item to go into the call settings -->
     <string name="call_settings_title">Call settings</string>
@@ -2100,7 +2161,7 @@
     <!-- [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\'s location service</string>
     <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
-    <string name="location_neighborhood_level">Let apps use data from sources such as Wi-Fi and mobile networks to determine your approximate location</string>
+    <string name="location_neighborhood_level">Allow anonymous location data to be sent to Google. Also allow permitted apps to use data from sources such as Wi-Fi and mobile networks to determine your approximate location.</string>
     <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
     <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 -->
@@ -2206,7 +2267,7 @@
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
     <string name="lockpattern_recording_incorrect_too_short">Connect at least <xliff:g id="number">%d</xliff:g> dots. Try again:</string>
     <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
-    <string name="lockpattern_pattern_entered_header">Pattern recorded!</string>
+    <string name="lockpattern_pattern_entered_header">Pattern recorded.</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
     <string name="lockpattern_need_to_confirm">Draw pattern again to confirm:</string>
     <string name="lockpattern_pattern_confirmed_header">Your new unlock pattern:</string>
@@ -2251,7 +2312,7 @@
     <!-- ChooseLockPatternTutorial, tutorial screen title -->
     <string name="lock_title" product="default">Securing your phone</string>
     <!-- ChooseLockPatternTutorial, tutorial screen text -->
-    <string name="lock_intro_message" product="tablet">Protect your tablet from unauthorized use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen.  You must connect at least four dots.
+    <string name="lock_intro_message" product="tablet">Protect your tablet from unauthorized use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen.  You need to connect at least four dots.
         \n\nReady to start? Touch Next.
     </string>
     <!-- ChooseLockPatternTutorial, tutorial screen text -->
@@ -2273,7 +2334,7 @@
     <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
     <string name="install_applications">Unknown sources</string>
     <!-- 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 apps</string>
+    <string name="install_unknown_applications">Allow installation of apps from unknown sources</string>
     <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
     <string name="install_all_warning" product="tablet">Your tablet and personal data are more vulnerable to attack by apps
  from unknown sources. You agree that you are solely responsible for any
@@ -2294,6 +2355,8 @@
     <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 whether this app is the default for some actions *and* whether the app was given permission by the user to create widgets -->
+    <string name="auto_launch_label_generic">Defaults</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. -->
@@ -2332,6 +2395,8 @@
     <string name="app_factory_reset">Uninstall updates</string>
     <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
     <string name="auto_launch_enable_text">You\'ve chosen to launch this app by default for some actions.</string>
+    <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
+    <string name="always_allow_bind_appwidgets_text">You\'ve chosen to allow this app to create widgets and access their data.</string>
     <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
     <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.  -->
@@ -2353,6 +2418,19 @@
     <string name="show_running_services">Show running services</string>
     <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
     <string name="show_background_processes">Show cached processes</string>
+    <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
+    <string name="reset_app_preferences">Reset app preferences</string>
+    <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
+    <string name="reset_app_preferences_title">Reset app preferences?</string>
+    <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Body of dialog to confirm resetting user's app preferences. -->
+    <string name="reset_app_preferences_desc">This will reset all preferences for:\n\n
+        <li>Disabled apps</li>\n
+        <li>Disabled app notifications</li>\n
+        <li>Default applications for actions</li>\n
+        <li>Background data restrictions for apps</li>\n\n
+        You will not lose any app data.</string>
+    <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Confirmation button of dialog to confirm resetting user's app preferences. -->
+    <string name="reset_app_preferences_button">Reset apps</string>
     <!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
     <string name="manage_space_text">Manage space</string>
     <!-- Text for menu option in ManageApps screen to present various menu options -->
@@ -2397,8 +2475,7 @@
     <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
     <string name="app_not_found_dlg_title"></string>
     <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-    <string name="app_not_found_dlg_text"> The app wasn\'t
-found in the list of installed apps.</string>
+    <string name="app_not_found_dlg_text"> The app wasn\'t found in the list of installed apps.</string>
     <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
     <string name="clear_data_failed">Couldn\'t clear app data.</string>
     <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2414,7 +2491,7 @@
     <!-- 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 app 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 name="invalid_size_value">Couldn\'t compute package size.</string>
     <!-- String displayed when list is empty -->
     <string name="empty_list_msg">You don\'t have any third-party apps installed.</string>
     <!-- Manage applications, version string displayed in app snippet -->
@@ -2456,6 +2533,12 @@
     <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
     <string name="app_disable_dlg_text">If you disable a built-in app, other apps
         may misbehave.</string>
+    <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
+    <string name="app_disable_notifications_dlg_title">Turn off notifications?</string>
+    <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
+    <string name="app_disable_notifications_dlg_text">
+        If you turn off notifications for this app, you may miss important alerts and updates.
+    </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>
@@ -2586,11 +2669,39 @@
     card numbers.  It comes from the app
     <xliff:g id="spellchecker_application_name">%1$s</xliff:g>.
     Use this spell checker?</string>
+    <!-- Image button description for spell checker quick settings. -->
+    <string name="spellchecker_quick_settings">Settings</string>
+    <!-- Image button description for spell checker language. -->
+    <string name="spellchecker_language">Language</string>
+    <!-- Toast that settings for an application is failed to open. -->
+    <string name="failed_to_open_app_settings_toast">Failed to open settings for <xliff:g id="spell_application_name">%1$s</xliff:g></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>
 
+    <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
+    <string name="game_controller_settings_category">Game Controller</string>
+    <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
+    <string name="vibrate_input_devices">Use vibrator</string>
+    <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
+    <string name="vibrate_input_devices_summary">Redirect vibrator to game controller when connected.</string>
+
+    <!-- Keyboard Layout Preference Dialog --> <skip />
+    <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
+    <string name="keyboard_layout_dialog_title">Choose keyboard layout</string>
+    <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
+    <string name="keyboard_layout_dialog_setup_button">Set up keyboard layouts</string>
+    <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
+    <string name="keyboard_layout_dialog_switch_hint">To switch, press Control-Spacebar</string>
+    <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
+    <string name="keyboard_layout_default_label">Default</string>
+
+    <!-- Keyboard Layout Picker --> <skip />
+    <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
+    <string name="keyboard_layout_picker_title">Keyboard layouts</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>
@@ -2602,8 +2713,22 @@
     <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. -->
     <string name="user_dict_settings_add_menu_title">Add</string>
-    <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. -->
+    <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
     <string name="user_dict_settings_add_dialog_title">Add to dictionary</string>
+    <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
+    <string name="user_dict_settings_add_screen_title">Phrase</string>
+    <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
+    <string name="user_dict_settings_add_dialog_more_options">More options</string>
+    <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
+    <string name="user_dict_settings_add_dialog_less_options">Less options</string>
+    <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
+    <string name="user_dict_settings_add_dialog_confirm">OK</string>
+    <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] -->
+    <string name="user_dict_settings_add_word_option_name">Word:</string>
+    <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
+    <string name="user_dict_settings_add_shortcut_option_name">Shortcut:</string>
+    <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
+    <string name="user_dict_settings_add_locale_option_name">Language:</string>
     <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
     <string name="user_dict_settings_edit_dialog_title">Edit word</string>
     <!-- User dictionary settings. The title of the context menu item to edit the current word -->
@@ -2612,8 +2737,10 @@
     <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  [CHAR LIMIT=200] -->
     <string name="user_dict_settings_empty_text">You don\'t have any words in the user dictionary. 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>
+    <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
+    <string name="user_dict_settings_all_languages">For all languages</string>
+    <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
+    <string name="user_dict_settings_more_languages">More 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>
@@ -2692,12 +2819,6 @@
     <string name="enable_adb">USB debugging</string>
     <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
     <string name="enable_adb_summary">Debug mode when USB is connected</string>
-    <!-- Development settings: title for the field that shows the "App ID" development identifier
-         for this device. [CHAR LIMIT=40] -->
-    <string name="verifier_device_identifier">Development device ID</string>
-    <!-- Development settings: a string to show when the "App ID" development identifier for this
-         device cannot be read from internal settings. [CHAR LIMIT=60] -->
-    <string name="verifier_device_identifier_not_available">Device information not available</string>
     <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
     <string name="keep_screen_on">Stay awake</string>
     <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
@@ -2710,6 +2831,28 @@
     <string name="adb_warning_title">Allow USB debugging?</string>
     <!-- Warning text to user about the implications of enabling USB debugging -->
     <string name="adb_warning_message">USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification, and read log data.</string>
+    <!-- Title of warning dialog about the implications of enabling developer settings -->
+    <string name="dev_settings_warning_title">Allow development settings?</string>
+    <!-- Warning text to user about the implications of enabling USB debugging -->
+    <string name="dev_settings_warning_message">These settings are intended for development use only.  They can cause your device and the applications on it to break or misbehave.</string>
+
+    <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+    <string name="enforce_read_external_title" product="nosdcard">Protect USB storage</string>
+    <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+    <string name="enforce_read_external_summary" product="nosdcard">Apps must request permission to read USB storage</string>
+    <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+    <string name="enforce_read_external_confirm_title" product="nosdcard">Protect USB storage?</string>
+    <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+    <string name="enforce_read_external_confirm_message" product="nosdcard">When USB storage is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
+
+    <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+    <string name="enforce_read_external_title" product="default">Protect SD card</string>
+    <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+    <string name="enforce_read_external_summary" product="default">Apps must request permission to read SD card</string>
+    <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+    <string name="enforce_read_external_confirm_title" product="default">Protect SD card?</string>
+    <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+    <string name="enforce_read_external_confirm_message" product="default">When SD card is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
 
     <!-- Title for the screen that lets the user choose a gadget to add to the home screen
          (or other screens that can host gadgets).  Note to translators: we're still determining
@@ -2721,6 +2864,15 @@
          the final name for Gadgets/Widgets, so please translate both for now. -->
     <string name="widget_picker_title">Choose widget</string>
 
+    <!-- Title in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+    <string name="allow_bind_app_widget_activity_allow_bind_title">Create widget and allow access?</string>
+
+    <!-- Message in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+    <string name="allow_bind_app_widget_activity_allow_bind">After you create the widget, <xliff:g id="widget_host_name">%1$s</xliff:g> can access all data it displays.</string>
+
+    <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+    <string name="allow_bind_app_widget_activity_always_allow_bind">Always allow <xliff:g id="widget_host_name">%1$s</xliff:g> to create widgets and access their data</string>
+
     <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
     <string name="battery_history_days"><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>
 
@@ -2766,20 +2918,13 @@
     <string name="accessibility_power_button_ends_call_title">Power button ends call</string>
     <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
     <string name="accessibility_speak_password_title">Speak passwords</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 web scripts</string>
+    <string name="accessibility_script_injection_title">Enhance web accessibility</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>
@@ -2834,17 +2979,11 @@
          help blind and low-vision users. Do you want to install it for free from 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=50] -->
-    <string name="accessibility_script_injection_security_warning_title">Install web 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 apps to
         install scripts from Google that make their web 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 accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
     <string name="accessibility_service_default_description">No description provided.</string>
 
@@ -2859,7 +2998,7 @@
     <!-- 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>
+    <string name="power_usage_not_available">Battery usage data isn\'t available.</string>
     <!-- Display the battery level and status [CHAR_LIMIT=30] -->
     <string name="power_usage_level_and_status"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="status">%2$s</xliff:g></string>
     <!-- Battery usage since unplugged -->
@@ -3072,7 +3211,7 @@
     <!-- 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 -->
-    <string name="tts_engine_error">The engine you selected is unable to run</string>
+    <string name="tts_engine_error">The engine you chose can\'t run.</string>
     <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
     <string name="tts_engine_error_config">Configure</string>
     <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
@@ -3114,7 +3253,7 @@
     <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine,
          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>
+    <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>
@@ -3152,6 +3291,11 @@
     <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
     <string name="trusted_credentials_summary">Display trusted CA certificates</string>
 
+    <!-- Message to draw an unlock pattern when installing credentials -->
+    <string name="credentials_install_gesture_prompt">Draw your unlock pattern</string>
+    <!-- Explanation of drawing unlock pattern to install credentials -->
+    <string name="credentials_install_gesture_explanation">You need to draw your unlock pattern to confirm credential installation.</string>
+
     <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
     <string name="credentials_unlock"></string>
     <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
@@ -3174,7 +3318,7 @@
     <!-- Toast message [CHAR LIMIT=30] -->
     <string name="credentials_enabled">Credential storage is enabled.</string>
     <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_configure_lock_screen_hint">You must set a lock screen PIN or password before you can use credential storage.</string>
+    <string name="credentials_configure_lock_screen_hint">You need to set a lock screen PIN or password before you can use credential storage.</string>
 
     <!-- Sound settings screen, setting check box label -->
     <string name="emergency_tone_title">Emergency tone</string>
@@ -3206,9 +3350,9 @@
     <!-- 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 aren\'t currently protected.</string>
+    <string name="local_backup_password_summary_none">Desktop full backups aren\'t 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>
+    <string name="local_backup_password_summary_change">Touch 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"></string>
@@ -3246,9 +3390,15 @@
     <string name="untitled_apn">Untitled</string>
 
     <string name="sound_category_sound_title">General</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">System</string>
+
+    <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+    <string name="sound_category_call_ringtone_vibrate_title">Call ringtone &amp; vibrate</string>
+
+    <!-- Category title for system-wide notification and feedback settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+    <string name="sound_category_system_title">System</string>
 
     <!-- Wifi Setup For Setup Wizard with XL screen -->
     <!-- Title shown in Wifi Setup Wizard with XL screen -->
@@ -3358,9 +3508,13 @@
     <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>
+    <!-- Image description for the sync failed icon. -->
+    <string name="sync_failed">Sync failed</string>
+    <!-- Animation description for the sync active icon. -->
+    <string name="sync_active">Sync active</string>
 
     <!-- Account specific sync settings title [CHAR LIMIT=35] -->
-    <string name="account_sync_settings_title">Sync settings</string>
+    <string name="account_sync_settings_title">Sync</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] -->
@@ -3383,6 +3537,10 @@
     <string name="sync_disabled">Sync is OFF</string>
     <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
     <string name="sync_error">Sync error</string>
+    <!-- Last synced date/time for accounts that synced [CHAR LIMIT=none] -->
+    <string name="last_synced">Last synced <xliff:g id="last_sync_time">%1$s</xliff:g></string>
+    <!-- Sync status shown when sync is disabled [CHAR LIMIT=30] -->
+    <string name="sync_in_progress">Syncing now\u2026</string>
 
     <!-- Data synchronization settings screen, setting option name -->
     <string name="settings_backup">Back up settings</string>
@@ -3402,7 +3560,7 @@
     <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.
+    \nA Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.
     </string>
 
     <!-- Header title for those settings relating to application syncing. -->
@@ -3433,7 +3591,7 @@
     <!-- 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>
+    <string name="sync_item_title"><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">Can\'t manually sync</string>
     <!-- Messaage shown in dialog when you can't manually sync -->
@@ -3446,8 +3604,6 @@
     <string name="enter_password">Type password to decrypt storage</string>
     <!-- This is displayed when the password is entered incorrectly -->
     <string name="try_again">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">The service is busy. Try again.</string>
 
     <!-- the following are for Settings Storage screen -->
     <!-- Menu item/button 'delete' -->
@@ -3466,8 +3622,35 @@
     <!-- 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>
+    <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] -->
+    <string name="debug_debugging_category">Debugging</string>
+
+    <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] -->
+    <string name="debug_app">Select debug app</string>
+    <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] -->
+    <string name="debug_app_not_set">No debug application set</string>
+    <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] -->
+    <string name="debug_app_set">Debugging application: <xliff:g id="app_name">%1$s</xliff:g></string>
+
+    <!-- UI debug setting: title for app picker dialog [CHAR LIMIT=50] -->
+    <string name="select_application">Select application</string>
+    <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
+    <string name="no_application">Nothing</string>
+
+    <!-- UI debug setting: wait for debugger to attach to debugging process? [CHAR LIMIT=50] -->
+    <string name="wait_for_debugger">Wait for debugger</string>
+    <!-- UI debug setting: wait for debugger to attach to debugging process summary [CHAR LIMIT=500] -->
+    <string name="wait_for_debugger_summary">Debugged application waits for debugger to
+            attach before executing</string>
+
+    <!-- Preference category for input debugging development settings. [CHAR LIMIT=25] -->
+    <string name="debug_input_category">Input</string>
+
+    <!-- Preference category for drawing debugging development settings. [CHAR LIMIT=25] -->
+    <string name="debug_drawing_category">Drawing</string>
+
+    <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] -->
+    <string name="debug_monitoring_category">Monitoring</string>
 
     <!-- UI debug setting: always enable strict mode? [CHAR LIMIT=25] -->
     <string name="strict_mode">Strict mode enabled</string>
@@ -3485,10 +3668,37 @@
     <!-- 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 where surface updates happen? [CHAR LIMIT=25] -->
+    <string name="show_screen_updates">Show surface updates</string>
+    <!-- UI debug setting: show surface updates summary [CHAR LIMIT=50] -->
+    <string name="show_screen_updates_summary">Flash entire window surfaces when they update</string>
+
+    <!-- UI debug setting: show where window updates happen with GPU rendering? [CHAR LIMIT=25] -->
+    <string name="show_hw_screen_updates">Show GPU view updates</string>
+    <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
+    <string name="show_hw_screen_updates_summary">Flash views inside windows when drawn with the GPU</string>
+
+    <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
+    <string name="disable_overlays">Disable HW overlays</string>
+    <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
+    <string name="disable_overlays_summary">Always use GPU for screen compositing</string>
+
+    <!-- UI debug setting: enable low-level traces? [CHAR LIMIT=25] -->
+    <string name="enable_traces_title">Enable traces</string>
+    <!-- UI debug setting: title for dialog to enable low-level traces [CHAR LIMIT=25] -->
+    <string name="enable_traces_dialog_title">Select enabled traces</string>
+
+    <!-- UI debug setting: enable low-level traces, none enabled summary [CHAR LIMIT=NONE] -->
+    <string name="enable_traces_summary_none">No traces currently enabled</string>
+    <!-- UI debug setting: enable low-level traces, some number enabled summary [CHAR LIMIT=NONE] -->
+    <string name="enable_traces_summary_num"><xliff:g id="num">%1$d</xliff:g> traces currently enabled</string>
+    <!-- UI debug setting: enable low-level traces, all enabled summary [CHAR LIMIT=NONE] -->
+    <string name="enable_traces_summary_all">All traces currently enabled</string>
+
+    <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
+    <string name="debug_layout">Show layout bounds</string>
+    <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
+    <string name="debug_layout_summary">Show clip bounds, margins, etc.</string>
 
     <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
     <string name="show_cpu_usage">Show CPU usage</string>
@@ -3498,7 +3708,12 @@
     <!-- UI debug setting: force hardware acceleration to render apps [CHAR LIMIT=25] -->
     <string name="force_hw_ui">Force GPU rendering</string>
     <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->
-    <string name="force_hw_ui_summary">Use 2D hardware acceleration in applications</string>
+    <string name="force_hw_ui_summary">Force use of GPU for 2d drawing</string>
+
+    <!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
+    <string name="track_frame_time">Profile GPU rendering</string>
+    <!-- UI debug setting: profile hardware acceleration summary [CHAR LIMIT=50] -->
+    <string name="track_frame_time_summary">Measure rendering time in adb shell dumpsys gfxinfo</string>
 
     <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
     <string name="window_animation_scale_title">Window animation scale</string>
@@ -3506,6 +3721,9 @@
     <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] -->
     <string name="transition_animation_scale_title">Transition animation scale</string>
 
+    <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
+    <string name="animator_duration_scale_title">Animator duration scale</string>
+
     <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
     <string name="debug_applications_category">Apps</string>
 
@@ -3528,16 +3746,21 @@
     <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] -->
+    <!-- Title for checkbox menu option to enable mobile data when roaming. [CHAR LIMIT=26] -->
     <string name="data_usage_menu_roaming">Data roaming</string>
-    <!-- Title for checkbox menu option to restrict background data usage. [CHAR LIMIT=20] -->
+    <!-- Title for checkbox menu option to restrict background data usage. [CHAR LIMIT=26] -->
     <string name="data_usage_menu_restrict_background">Restrict background data</string>
-    <!-- Title for checkbox menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=32] -->
+    <!-- Title for checkbox menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=26] -->
     <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] -->
+    <!-- Title for checkbox menu option to show Wi-Fi data usage. [CHAR LIMIT=26] -->
     <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] -->
+    <!-- Title for checkbox menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
     <string name="data_usage_menu_show_ethernet">Show Ethernet usage</string>
+    <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
+    <string name="data_usage_menu_metered">Mobile hotspots</string>
+    <!--  Title for menu option to enable global auto-sync of account data -->
+    <string name="data_usage_menu_auto_sync">Auto-sync data</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] -->
@@ -3549,20 +3772,18 @@
     <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
     <string name="data_usage_label_background">Background</string>
 
-    <!-- Disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
-    <string name="data_usage_disclaimer" product="tablet">Measured by your tablet. Your carrier\'s data usage accounting may differ.</string>
-    <!-- Disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
-    <string name="data_usage_disclaimer" product="default">Measured by your phone. Your carrier\'s data usage accounting may differ.</string>
+    <!-- Label for application which has its data usage restricted. [CHAR LIMIT=16] -->
+    <string name="data_usage_app_restricted">restricted</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] -->
+    <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
     <string name="data_usage_disable_mobile_limit">Set mobile data limit</string>
-    <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
+    <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
     <string name="data_usage_disable_4g_limit">Set 4G data limit</string>
-    <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
+    <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
     <string name="data_usage_disable_3g_limit">Set 2G-3G data limit</string>
-    <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
+    <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
     <string name="data_usage_disable_wifi_limit">Set Wi-Fi data limit</string>
 
     <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
@@ -3577,9 +3798,9 @@
     <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>
+    <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>
+    <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>
@@ -3593,15 +3814,25 @@
     <!-- 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 mobile data network only. Wi-Fi will be used if available.</string>
+    <string name="data_usage_app_restrict_background_summary">Disable background data on mobile networks. Non-mobile networks will be used if available.</string>
     <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=64] -->
     <string name="data_usage_app_restrict_background_summary_disabled">To restrict background data for this app, first set a mobile data limit.</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 cause an app that depends on background data to stop working when Wi-Fi isn\'t available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
+    <string name="data_usage_app_restrict_dialog">This feature may cause an app that depends on background data to stop working when only mobile networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
     <!-- Body of dialog shown when user attempts to restrict background data before a network data limit has been set. [CHAR LIMIT=NONE] -->
     <string name="data_usage_restrict_denied_dialog">Restricting background data is possible only when you\'ve set a mobile data limit.</string>
+    <!--  Title of dialog shown when user enables global auto sync [CHAR LIMIT=32] -->
+    <string name="data_usage_auto_sync_on_dialog_title">Turn auto-sync data on?</string>
+    <!--  Body of dialog shown when user enables global auto sync, for tablet [CHAR LIMIT=none] -->
+    <string name="data_usage_auto_sync_on_dialog" product="tablet">Any changes you make to your accounts on the web will be automatically copied to your tablet.\n\nSome accounts may also automatically copy any changes you make on the tablet to the web. A Google Account works this way.\n\nTo choose which kinds of information to sync within each account, go to Settings &gt; Accounts.</string>
+    <!--  Body of dialog shown when user enables global auto sync [CHAR LIMIT=none] -->
+    <string name="data_usage_auto_sync_on_dialog" product="default">Any changes you make to your accounts on the web will be automatically copied to your phone.\n\nSome accounts may also automatically copy any changes you make on the phone to the web. A Google Account works this way.\n\nTo choose which kinds of information to sync within each account, go to Settings &gt; Accounts.</string>
+    <!--  Title of dialog shown when user disables global auto sync [CHAR LIMIT=32] -->
+    <string name="data_usage_auto_sync_off_dialog_title">Turn auto-sync data off?</string>
+    <!--  Body of dialog shown when user disables global auto sync [CHAR LIMIT=none] -->
+    <string name="data_usage_auto_sync_off_dialog">This will conserve data and battery usage, but you\'ll need to sync each account manually to collect recent information. And you won\'t receive notifications when updates occur.</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>
@@ -3618,9 +3849,9 @@
     <!-- 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" product="tablet">Your <xliff:g id="networks" example="mobile">%1$s</xliff:g> data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your tablet, and your carrier may account for usage differently, consider using a conservative limit.</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet">Your mobile data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your tablet, and your carrier may account for usage differently, consider using a conservative limit.</string>
     <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
-    <string name="data_usage_limit_dialog" product="default">Your <xliff:g id="networks" example="mobile">%1$s</xliff:g> data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your phone, and your carrier may account for usage differently, consider using a conservative limit.</string>
+    <string name="data_usage_limit_dialog_mobile" product="default">Your mobile data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your phone, and your carrier may account for usage differently, consider using a conservative limit.</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>
@@ -3637,73 +3868,94 @@
     <!-- 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>: about <xliff:g id="total" example="128KB">%1$s</xliff:g> used</string>
+    <string name="data_usage_total_during_range"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: about <xliff:g id="total" example="128KB">%1$s</xliff:g> used.</string>
+
+    <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+    <string name="data_usage_total_during_range_mobile" product="tablet"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: about <xliff:g id="total" example="128KB">%1$s</xliff:g> used, as measured by your tablet. Your carrier\'s data usage accounting may differ.</string>
+    <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+    <string name="data_usage_total_during_range_mobile" product="default"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: about <xliff:g id="total" example="128KB">%1$s</xliff:g> used, as measured by your phone. Your carrier\'s data usage accounting may differ.</string>
+
+    <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
+    <string name="data_usage_metered_title">Mobile hotspots</string>
+    <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_metered_body">Select the Wi-Fi networks which are mobile hotspots.  Apps can be restricted from using these networks when in the background.  Apps may also warn before using these networks for large downloads.</string>
+    <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+    <string name="data_usage_metered_mobile">Mobile networks</string>
+    <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
+    <string name="data_usage_metered_wifi">Wi-Fi networks</string>
+    <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
+    <string name="data_usage_metered_wifi_disabled">To select mobile hotspots, turn Wi-Fi on.</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] -->
+    <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_name">Name</string>
-    <!-- Input label for the type of a VPN network. [CHAR LIMIT=40] -->
+    <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_type">Type</string>
-    <!-- Input label for the server address of a VPN network. [CHAR LIMIT=40] -->
+    <!-- Input label for the server address of a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_server">Server address</string>
-    <!-- Checkbox label to enable PPP encryption for a VPN network. [CHAR LIMIT=40] -->
+    <!-- Checkbox label to enable PPP encryption for a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_mppe">PPP encryption (MPPE)</string>
-    <!-- Input label for the L2TP secret of a VPN network. [CHAR LIMIT=40] -->
+    <!-- Input label for the L2TP secret of a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_l2tp_secret">L2TP secret</string>
-    <!-- Input label for the IPSec identifier of a VPN network. [CHAR LIMIT=40] -->
+    <!-- Input label for the IPSec identifier of a VPN profile. [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] -->
+    <!-- Input label for the IPSec pre-shared key of a VPN profile. [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] -->
+    <!-- Selection label for the IPSec user certificate of a VPN profile. [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] -->
+    <!-- Selection label for the IPSec CA certificate of a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_ipsec_ca_cert">IPSec CA certificate</string>
-    <!-- Selection label for the IPSec server certificate of a VPN network. [CHAR LIMIT=40] -->
+    <!-- Selection label for the IPSec server certificate of a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_ipsec_server_cert">IPSec server certificate</string>
-    <!-- Checkbox label to show advanced options of a VPN network. [CHAR LIMIT=40] -->
+    <!-- Checkbox label to show advanced options of a VPN profile. [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] -->
+    <!-- Input label for the DNS search domains of a VPN profile. [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] -->
+    <!-- Input label for the DNS servers of a VPN profile. [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] -->
+    <!-- Input label for the forwarding routes of a VPN profile. [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] -->
+    <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_username">Username</string>
-    <!-- Input label for the password of a VPN network. [CHAR LIMIT=40] -->
+    <!-- Input label for the password of a VPN profile. [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] -->
+    <!-- Checkbox label to save the username and the password in a VPN profile. [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] -->
+    <!-- Hint for not using an optional feature in a VPN profile. [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">(don\'t verify server)</string>
     <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
     <string name="vpn_no_server_cert">(received from server)</string>
 
-    <!-- Button label to cancel chaning a VPN network. [CHAR LIMIT=40] -->
+    <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_cancel">Cancel</string>
-    <!-- Button label to save a VPN network. [CHAR LIMIT=40] -->
+    <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_save">Save</string>
-    <!-- Button label to connect to a VPN network. [CHAR LIMIT=40] -->
+    <!-- Button label to connect to a VPN profile. [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>
+    <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_edit">Edit VPN profile</string>
+    <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_connect_to">Connect to <xliff:g id="profile" 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>
+    <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_create">Add VPN profile</string>
+    <!-- Menu item to edit a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_menu_edit">Edit profile</string>
+    <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_menu_delete">Delete profile</string>
+
+    <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
+    <string name="vpn_no_network">There is no network connection. Please try again later.</string>
+    <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
+    <string name="vpn_missing_cert">A certificate is missing. Please edit the profile.</string>
 
     <!-- Tab label for built-in system CA certificates. -->
     <string name="trusted_credentials_system_tab">System</string>
@@ -3722,47 +3974,8 @@
     <!-- 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 app 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 app 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 touch 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>
+    <!--  Title for spell checker settings -->
+    <string name="spellcheckers_settings_title">Spell checker</string>
 
     <!-- Prompt for the user to enter their current full-backup password -->
     <string name="current_backup_pw_prompt">Type your current full backup password here</string>
@@ -3784,4 +3997,72 @@
     "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>
 
+    <!-- User settings -->
+    <skip/>
+
+    <!-- User settings screen title [CHAR LIMIT=25] -->
+    <string name="user_settings_title">Users &amp; restrictions</string>
+    <!-- User settings user list section header [CHAR LIMIT=30] -->
+    <string name="user_list_title">Users</string>
+    <!-- User settings add user menu [CHAR LIMIT=20] -->
+    <string name="user_add_user_menu">Add user</string>
+
+    <!-- User details -->
+    <skip/>
+
+    <!-- User details screen title [CHAR LIMIT=25] -->
+    <string name="user_details_title">Edit details</string>
+    <!-- User information section title [CHAR LIMIT=30] -->
+    <string name="user_information_heading">User information</string>
+    <!-- User name title [CHAR LIMIT=25] -->
+    <string name="user_name_title">Name</string>
+    <!-- User restrictions section title [CHAR LIMIT=30] -->
+    <string name="user_restrictions_heading">Content restrictions</string>
+    <!-- User restrictions, does market require PIN protection [CHAR LIMIT=30] -->
+    <string name="user_market_requires_pin">Require PIN</string>
+    <!-- User restrictions, maximum content rating for apps [CHAR LIMIT=25] -->
+    <string name="user_max_content_rating">Content rating</string>
+    <!-- Section title for list of system apps [CHAR LIMIT=30] -->
+    <string name="user_system_apps_heading">System apps</string>
+    <!-- Section title for list of downloaded apps [CHAR LIMIT=30] -->
+    <string name="user_market_apps_heading">Installed apps</string>
+    <!-- User details discard user menu [CHAR LIMIT=20] -->
+    <string name="user_discard_user_menu">Discard</string>
+    <!-- User details remove user menu [CHAR LIMIT=20] -->
+    <string name="user_remove_user_menu">Remove user</string>
+    <!-- User details new user name [CHAR LIMIT=30] -->
+    <string name="user_new_user_name">Pesky kid</string>
+    <!-- User removal confirmation title [CHAR LIMIT=25] -->
+    <string name="user_confirm_remove_title">Remove user?</string>
+    <!-- User removal confirmation message [CHAR LIMIT=none] -->
+    <string name="user_confirm_remove_message">Are you sure you want to remove the user and all associated data from the device?</string>
+
+    <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
+    <string name="app_notifications_switch_label">Show notifications</string>
+
+    <!--  Help URLs for some screens. Not specified here. Specified in product overlays --><skip/>
+    <!-- Help menu label [CHAR LIMIT=20] -->
+    <string name="help_label">Help</string>
+    <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
+    <string name="help_url_wifi" translatable="false"></string>
+    <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
+    <string name="help_url_bluetooth" translatable="false"></string>
+    <!-- Help URL, Data usage [DO NOT TRANSLATE] -->
+    <string name="help_url_data_usage" translatable="false"></string>
+    <!-- Help URL, More [DO NOT TRANSLATE] -->
+    <string name="help_url_more_networks" translatable="false"></string>
+    <!-- Help URL, Vpn [DO NOT TRANSLATE] -->
+    <string name="help_url_vpn" translatable="false"></string>
+    <!-- Help URL, Sound [DO NOT TRANSLATE] -->
+    <string name="help_url_sound" translatable="false"></string>
+    <!-- Help URL, Battery [DO NOT TRANSLATE] -->
+    <string name="help_url_battery" translatable="false"></string>
+    <!-- Help URL, Accounts [DO NOT TRANSLATE] -->
+    <string name="help_url_accounts" translatable="false"></string>
+    <!-- Help URL, Choose lockscreen [DO NOT TRANSLATE] -->
+    <string name="help_url_choose_lockscreen" translatable="false"></string>
+    <!-- Help URL, Backup & reset [DO NOT TRANSLATE] -->
+    <string name="help_url_backup_reset" translatable="false"></string>
+    <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
+    <string name="help_url_tether" translatable="false"></string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 32e0a48..42f2837 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -82,8 +82,32 @@
     <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
     </style>
 
+    <style name="setup_wizard_theme" parent="android:Theme.Holo.NoActionBar">
+        <item name="android:windowSoftInputMode">adjustPan</item>
+    </style>
+
+    <!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
+         be consistent with ProgressBar -->
+    <style name="TopDivider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/divider_height</item>
+        <item name="android:background">@color/setup_divider_color</item>
+        <item name="android:focusable">false</item>
+        <item name="android:clickable">false</item>
+        <item name="android:layout_marginTop">@dimen/divider_margin_top</item>
+        <item name="android:layout_marginBottom">@dimen/divider_margin_bottom</item>
+    </style>
+
+    <style name="SetupTitle">
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:textSize">@dimen/setup_title_size</item>
+        <item name="android:textColor">@color/title_color</item>
+        <item name="android:clickable">false</item>
+        <item name="android:longClickable">false</item>
+    </style>
+
     <style name="wifi_item">
-        <item name="android:layout_width">200dip</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">8dip</item>
         <item name="android:layout_marginLeft">16dip</item>
@@ -158,37 +182,12 @@
         <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 name="TextAppearance.Switch" parent="@*android:style/TextAppearance.Holo.Widget.Switch">
+        <item name="android:textAllCaps">true</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 name="TextAppearance.PagerTabs" parent="@android:style/TextAppearance.DeviceDefault.Small">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textStyle">bold</item>
     </style>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 2103de1..b5f8f64 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,7 +19,4 @@
     <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/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 90bdfd9..bf93eb5 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -30,57 +30,43 @@
         <CheckBoxPreference
                 android:key="toggle_large_text_preference"
                 android:title="@string/accessibility_toggle_large_text_title"
-                android:persistent="false"
-                android:order="1"/>
+                android:persistent="false"/>
 
         <CheckBoxPreference
                 android:key="toggle_power_button_ends_call_preference"
                 android:title="@string/accessibility_power_button_ends_call_title"
-                android:persistent="false"
-                android:order="2"/>
+                android:persistent="false"/>
 
         <CheckBoxPreference
-                android:key="toggle_auto_rotate_screen_preference"
+                android:key="toggle_lock_screen_rotation_preference"
                 android:title="@string/accelerometer_title"
-                android:persistent="false"
-                android:order="3"/>
+                android:persistent="false"/>
 
         <CheckBoxPreference
                 android:key="toggle_speak_password_preference"
                 android:title="@string/accessibility_speak_password_title"
-                android:persistent="false"
-                android:order="4"/>
+                android:persistent="false"/>
 
-        <PreferenceScreen
-                android:key="toggle_touch_exploration_preference"
-                android:title="@string/accessibility_touch_exploration_title"
-                android:fragment="com.android.settings.AccessibilitySettings$ToggleTouchExplorationFragment"
-                android:order="5" >
-                <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>
+        <PreferenceScreen android:key="tts_settings"
+                android:fragment="com.android.settings.tts.TextToSpeechSettings"
+                android:title="@string/tts_settings_title" />
 
         <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"
-                android:order="6"/>
+                android:persistent="false"/>
 
+        <!-- We want a dialog with no title, so use an empty string to avoid a fall back to the preference title. -->
         <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:dialogTitle=""
                 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"
-                android:order="7"/>
+                android:persistent="false"/>
 
     </PreferenceCategory>
 
diff --git a/res/xml/account_sync_settings.xml b/res/xml/account_sync_settings.xml
index ff49c9c..0ec46b7 100644
--- a/res/xml/account_sync_settings.xml
+++ b/res/xml/account_sync_settings.xml
@@ -16,7 +16,4 @@
 
 <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/appwidget_info.xml b/res/xml/appwidget_info.xml
index dc90d4e..2d8c81e 100644
--- a/res/xml/appwidget_info.xml
+++ b/res/xml/appwidget_info.xml
@@ -15,8 +15,8 @@
 -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="260dip"
-    android:minHeight="40dip"
+    android:minWidth="@dimen/appwidget_min_width"
+    android:minHeight="@dimen/appwidget_min_height"
     android:previewImage="@drawable/preview"
     android:initialLayout="@layout/widget"
     >
diff --git a/res/xml/data_usage_metered_prefs.xml b/res/xml/data_usage_metered_prefs.xml
new file mode 100644
index 0000000..a0c6df4
--- /dev/null
+++ b/res/xml/data_usage_metered_prefs.xml
@@ -0,0 +1,42 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <Preference
+        android:summary="@string/data_usage_metered_body"
+        android:persistent="false"
+        android:selectable="false" />
+
+    <PreferenceCategory
+        android:key="mobile"
+        android:title="@string/data_usage_metered_mobile"
+        android:persistent="false" />
+
+    <PreferenceCategory
+        android:key="wifi"
+        android:title="@string/data_usage_metered_wifi"
+        android:persistent="false">
+
+        <Preference
+            android:key="wifi_disabled"
+            android:summary="@string/data_usage_metered_wifi_disabled"
+            android:persistent="false"
+            android:selectable="false" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 68e24c4..6cb8238 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -16,36 +16,6 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/development_settings_title">
-        
-    <CheckBoxPreference 
-        android:key="enable_adb" 
-        android:title="@string/enable_adb" 
-        android:summary="@string/enable_adb_summary"/>
-
-    <Preference
-        android:key="verifier_device_identifier"
-        style="?android:attr/preferenceInformationStyle"
-        android:title="@string/verifier_device_identifier"
-        android:summary="@string/verifier_device_identifier_not_available"
-        android:persistent="false" />
-
-    <CheckBoxPreference 
-        android:key="keep_screen_on" 
-        android:title="@string/keep_screen_on" 
-        android:summary="@string/keep_screen_on_summary"/>
-
-    <CheckBoxPreference 
-        android:key="allow_mock_location" 
-        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"
@@ -57,18 +27,48 @@
                 android:targetClass="com.android.settings.SetFullBackupPassword" />
     </PreferenceScreen>
 
-    <PreferenceCategory android:key="debug_ui_category"
-            android:title="@string/debug_ui_category">
+    <CheckBoxPreference 
+        android:key="keep_screen_on" 
+        android:title="@string/keep_screen_on" 
+        android:summary="@string/keep_screen_on_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" />
+
+    <CheckBoxPreference
+        android:key="enforce_read_external"
+        android:title="@string/enforce_read_external_title"
+        android:summary="@string/enforce_read_external_summary" />
+
+    <PreferenceCategory android:key="debug_debugging_category"
+            android:title="@string/debug_debugging_category">
 
         <CheckBoxPreference
-            android:key="strict_mode"
-            android:title="@string/strict_mode"
-            android:summary="@string/strict_mode_summary"/>
+            android:key="enable_adb"
+            android:title="@string/enable_adb"
+            android:summary="@string/enable_adb_summary"/>
 
         <CheckBoxPreference
-            android:key="pointer_location"
-            android:title="@string/pointer_location"
-            android:summary="@string/pointer_location_summary"/>
+            android:key="allow_mock_location"
+            android:title="@string/allow_mock_location"
+            android:summary="@string/allow_mock_location_summary"/>
+
+        <PreferenceScreen android:key="debug_app"
+                android:title="@string/debug_app" />
+
+        <CheckBoxPreference
+            android:key="wait_for_debugger"
+            android:title="@string/wait_for_debugger"
+            android:summary="@string/wait_for_debugger_summary"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_input_category"
+            android:title="@string/debug_input_category">
 
         <CheckBoxPreference
             android:key="show_touches"
@@ -76,20 +76,30 @@
             android:summary="@string/show_touches_summary"/>
 
         <CheckBoxPreference
+            android:key="pointer_location"
+            android:title="@string/pointer_location"
+            android:summary="@string/pointer_location_summary"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_drawing_category"
+            android:title="@string/debug_drawing_category">
+
+        <CheckBoxPreference
+            android:key="debug_layout"
+            android:title="@string/debug_layout"
+            android:summary="@string/debug_layout_summary"/>
+
+        <CheckBoxPreference
+            android:key="show_hw_screen_udpates"
+            android:title="@string/show_hw_screen_updates"
+            android:summary="@string/show_hw_screen_updates_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"/>
-
-        <CheckBoxPreference
-            android:key="force_hw_ui"
-            android:title="@string/force_hw_ui"
-            android:summary="@string/force_hw_ui_summary"/>
-
         <ListPreference
             android:key="window_animation_scale"
             android:title="@string/window_animation_scale_title"
@@ -104,6 +114,48 @@
             android:entries="@array/transition_animation_scale_entries"
             android:entryValues="@array/transition_animation_scale_values" />
 
+        <ListPreference
+            android:key="animator_duration_scale"
+            android:title="@string/animator_duration_scale_title"
+            android:persistent="false"
+            android:entries="@array/animator_duration_scale_entries"
+            android:entryValues="@array/animator_duration_scale_values" />
+
+        <CheckBoxPreference
+            android:key="disable_overlays"
+            android:title="@string/disable_overlays"
+            android:summary="@string/disable_overlays_summary"/>
+
+        <CheckBoxPreference
+            android:key="force_hw_ui"
+            android:title="@string/force_hw_ui"
+            android:summary="@string/force_hw_ui_summary"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_monitoring_category"
+            android:title="@string/debug_monitoring_category">
+
+        <CheckBoxPreference
+            android:key="strict_mode"
+            android:title="@string/strict_mode"
+            android:summary="@string/strict_mode_summary"/>
+
+        <CheckBoxPreference
+            android:key="show_cpu_usage"
+            android:title="@string/show_cpu_usage"
+            android:summary="@string/show_cpu_usage_summary"/>
+
+        <CheckBoxPreference
+            android:key="track_frame_time"
+            android:title="@string/track_frame_time"
+            android:summary="@string/track_frame_time_summary"/>
+
+        <MultiCheckPreference
+            android:key="enable_traces"
+            android:title="@string/enable_traces_title"
+            android:dialogTitle="@string/enable_traces_dialog_title" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_applications_category"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index d6ffc6c..b5f072f 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -40,6 +40,11 @@
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
 
+        <PreferenceScreen
+                android:key="screensaver"
+                android:title="@string/screensaver_settings_title"
+                android:fragment="com.android.settings.DreamSettings" />
+
         <ListPreference
                 android:key="font_size"
                 android:title="@string/title_font_size"
diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml
new file mode 100644
index 0000000..6569bc7
--- /dev/null
+++ b/res/xml/dream_settings.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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/screensaver_settings_title"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+    <com.android.settings.DreamComponentPreference
+            android:key="screensaver_component"
+            android:title="@string/screensaver_component_title"
+            android:persistent="false"
+            />
+
+    <com.android.settings.DreamTesterPreference
+            android:key="test"
+            android:title="@string/screensaver_test"
+            android:persistent="false"
+            />
+
+    <CheckBoxPreference
+            android:key="activate_on_dock"
+            android:persistent="false"
+            android:title="@string/screensaver_activate_on_dock_title"
+            android:defaultValue="true" />
+
+</PreferenceScreen>
diff --git a/res/xml/hard_keyboard_settings.xml b/res/xml/hard_keyboard_settings.xml
deleted file mode 100644
index d09522e..0000000
--- a/res/xml/hard_keyboard_settings.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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/language_settings.xml b/res/xml/language_settings.xml
index fbfb3d7..f001486 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -36,27 +36,34 @@
         <PreferenceScreen android:key="current_input_method"
                 android:title="@string/current_input_method" />
     </PreferenceCategory>
+
     <PreferenceCategory
             android:key="hard_keyboard"
             android:title="@string/builtin_keyboard_settings_title"
             android:persistent="false">
+        <!-- Additional preference screens are inserted here programmatically
+             with low order values to set the key map of each attached keyboard. -->
+
         <CheckBoxPreference
                 android:key="auto_replace"
                 android:title="@string/auto_replace"
                 android:summaryOn="@string/auto_replace_summary"
                 android:summaryOff="@string/auto_replace_summary"
+                android:order="1000"
                 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:order="1001"
                 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:order="1002"
                 android:persistent="false"/>
     </PreferenceCategory>
 
@@ -85,4 +92,14 @@
                 android:title="@string/pointer_speed"
                 android:dialogTitle="@string/pointer_speed" />
     </PreferenceCategory>
+
+    <PreferenceCategory android:key="game_controller_settings_category"
+            android:title="@string/game_controller_settings_category">
+        <CheckBoxPreference
+                android:key="vibrate_input_devices"
+                android:title="@string/vibrate_input_devices"
+                android:summaryOn="@string/vibrate_input_devices_summary"
+                android:summaryOff="@string/vibrate_input_devices_summary"
+                android:persistent="false"/>
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/manage_accounts_settings.xml b/res/xml/manage_accounts_settings.xml
index 0ec46b7..810fa7a 100644
--- a/res/xml/manage_accounts_settings.xml
+++ b/res/xml/manage_accounts_settings.xml
@@ -15,5 +15,5 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
+    <PreferenceCategory android:title="@string/account_settings" />
 </PreferenceScreen>
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 080fbc9..6593f07 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -31,6 +31,11 @@
             android:title="@string/biometric_weak_improve_matching_title"/>
 
         <CheckBoxPreference
+           android:key="biometric_weak_liveliness"
+           android:title="@string/biometric_weak_liveliness_title"
+           android:summary="@string/biometric_weak_liveliness_summary"/>
+
+        <CheckBoxPreference
             android:key="visiblepattern"
             android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
 
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 0f4dbb3..2089bac 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -106,14 +106,12 @@
     <!-- 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. -->
+    <!-- Manage users -->
     <header
-        android:fragment="com.android.settings.accounts.ManageAccountsSettings"
+        android:fragment="com.android.settings.users.UserSettings"
         android:icon="@drawable/ic_settings_sync"
-        android:title="@string/sync_settings"
-        android:id="@+id/sync_settings" />
+        android:title="@string/user_settings_title"
+        android:id="@+id/user_settings" />
 
     <!-- Location -->
     <header
@@ -143,6 +141,18 @@
         android:title="@string/privacy_settings"
         android:id="@+id/privacy_settings" />
 
+    <!--  ACCOUNTS section -->
+    <header
+            android:id="@+id/account_settings"
+            android:title="@string/account_settings" />
+
+    <header
+            android:id="@+id/account_add"
+            android:title="@string/add_account_label"
+            android:icon="@drawable/ic_menu_add">
+        <intent
+            android:action="android.settings.ADD_ACCOUNT_SETTINGS"/>
+    </header>
 
     <!-- SYSTEM -->
     <header android:title="@string/header_category_system" />
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index a61e0e1..6da9734 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -26,12 +26,6 @@
             android:persistent="false"
             android:streamType="ring" />
 
-    <ListPreference
-            android:key="silent_mode"
-            android:title="@string/silent_mode_title"
-            android:entries="@array/silent_mode_entries"
-            android:entryValues="@array/silent_mode_values" />
-
     <Preference
             android:key="musicfx"
             android:title="@string/musicfx_title">
@@ -41,7 +35,7 @@
 
     <PreferenceCategory
             android:key="category_calls_and_notification"
-            android:title="@string/sound_category_calls_and_notification_title"/>
+            android:title="@string/sound_category_call_ringtone_vibrate_title"/>
 
     <!-- Do not nest these, or removals in code will break -->
     <com.android.settings.DefaultRingtonePreference
@@ -51,6 +45,16 @@
             android:persistent="false"
             android:ringtoneType="ringtone" />
 
+    <CheckBoxPreference
+         android:key="vibrate_when_ringing"
+         android:title="@string/vibrate_when_ringing_title"
+         android:persistent="false" />
+
+    <PreferenceCategory
+            android:title="@string/sound_category_system_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"
@@ -59,16 +63,6 @@
             android:ringtoneType="notification" />
 
     <CheckBoxPreference
-            android:key="vibrate_on_ring"
-            android:title="@string/vibrate_on_ring_title"
-            android:defaultValue="false" />
-
-    <PreferenceCategory
-            android:title="@string/sound_category_feedback_title"/>
-
-    <!-- Do not nest these, or removals in code will break -->
-
-    <CheckBoxPreference
             android:key="dtmf_tone"
             android:title="@string/dtmf_tone_enable_title"
             android:defaultValue="true" />
diff --git a/res/values-sw600dp/themes.xml b/res/xml/sync_settings.xml
similarity index 69%
copy from res/values-sw600dp/themes.xml
copy to res/xml/sync_settings.xml
index 22cf17e..530f4ab 100644
--- a/res/values-sw600dp/themes.xml
+++ b/res/xml/sync_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- 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.
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<resources>
-
-    <style name="Theme.AccessibilityTutorialActivity" parent="@android:style/Theme.Holo.NoActionBar">
-    </style>
-</resources>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <CheckBoxPreference
+        android:key="sync_switch"
+        android:title="@string/sync_automatically" />
+</PreferenceScreen>
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 6c1fa37..81f6f3a 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -36,9 +36,4 @@
         android:title="@string/bluetooth_tether_checkbox_text"
         android:persistent="false" />
 
-    <PreferenceScreen
-        android:key="tethering_help"
-        android:title="@string/tethering_help_button_text" >
-    </PreferenceScreen>
-
 </PreferenceScreen>
diff --git a/res/xml/user_details.xml b/res/xml/user_details.xml
new file mode 100644
index 0000000..257eee4
--- /dev/null
+++ b/res/xml/user_details.xml
@@ -0,0 +1,62 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/user_details_title">
+
+    <PreferenceCategory
+            android:key="information_category"
+            android:title="@string/user_information_heading">
+        <EditTextPreference
+                android:key="user_name"
+                android:title="@string/user_name_title"
+                android:persistent="false"
+                />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:key="restrictions_category"
+            android:title="@string/user_restrictions_heading">
+        <CheckBoxPreference
+                android:key="market_requires_pin"
+                android:title="@string/user_market_requires_pin"
+                android:persistent="false"
+                android:enabled="false"
+                />
+        <ListPreference
+                android:key="content_rating"
+                android:title="@string/user_max_content_rating"
+                android:entries="@array/user_content_ratings_entries"
+                android:entryValues="@array/user_content_ratings_values"
+                android:persistent="false"
+                android:enabled="false"
+                />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:key="system_apps_category"
+            android:title="@string/user_system_apps_heading">
+        <!-- Dynamically added content -->
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:key="market_apps_category"
+            android:title="@string/user_market_apps_heading">
+        <!-- Dynamically added content -->
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
new file mode 100644
index 0000000..95bc703
--- /dev/null
+++ b/res/xml/user_settings.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/user_settings_title">
+
+    <PreferenceCategory
+            android:key="user_list"
+            android:title="@string/user_list_title">
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index d500ff2..3000666 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -34,9 +34,9 @@
 
     <!-- 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:key="wifi_poor_network_detection"
+            android:title="@string/wifi_poor_network_detection"
+            android:summary="@string/wifi_poor_network_detection_summary"
             android:persistent="false" />
 
     <ListPreference
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 20ffd8e..866a617 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -54,18 +54,6 @@
         android:key="android_beam_settings"
         android:title="@string/android_beam_settings_title" />
 
-    <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"
@@ -73,9 +61,15 @@
         <intent
             android:action="android.intent.action.MAIN"
             android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.Settings" />
+            android:targetClass="com.android.phone.MobileNetworkSettings" />
     </PreferenceScreen>
 
+    <CheckBoxPreference
+        android:key="toggle_nsd"
+        android:title="@string/nsd_quick_toggle_title"
+        android:summary="@string/nsd_quick_toggle_summary"
+        android:persistent="false" />
+
     <PreferenceScreen
         android:fragment="com.android.settings.ProxySelector"
         android:key="proxy_settings"
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 827af13..6167f78 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -30,12 +30,12 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.content.res.Configuration;
+import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -46,15 +46,12 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.text.TextUtils.SimpleStringSplitter;
-import android.util.Log;
 import android.view.Gravity;
-import android.view.IWindowManager;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.Surface;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
@@ -63,6 +60,7 @@
 import android.widget.TextView;
 
 import com.android.internal.content.PackageMonitor;
+import com.android.internal.view.RotationPolicy;
 import com.android.settings.AccessibilitySettings.ToggleSwitch.OnBeforeCheckedChangeListener;
 
 import java.util.HashMap;
@@ -76,8 +74,6 @@
  */
 public class AccessibilitySettings extends SettingsPreferenceFragment implements DialogCreatable,
         Preference.OnPreferenceChangeListener {
-    private static final String TAG = "AccessibilitySettings";
-
     private static final String DEFAULT_SCREENREADER_MARKET_LINK =
         "market://search?q=pname:com.google.android.marvin.talkback";
 
@@ -92,9 +88,6 @@
 
     private static final char ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR = ':';
 
-    private static final String KEY_ACCESSIBILITY_TUTORIAL_LAUNCHED_ONCE =
-        "key_accessibility_tutorial_launched_once";
-
     private static final String KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE =
         "key_install_accessibility_service_offered_once";
 
@@ -106,12 +99,10 @@
     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_LOCK_SCREEN_ROTATION_PREFERENCE =
+        "toggle_lock_screen_rotation_preference";
     private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =
         "toggle_speak_password_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 =
@@ -154,15 +145,22 @@
         }
     };
 
+    private final RotationPolicy.RotationPolicyListener mRotationPolicyListener =
+            new RotationPolicy.RotationPolicyListener() {
+        @Override
+        public void onChange() {
+            updateLockScreenRotationCheckbox();
+        }
+    };
+
     // Preference controls.
     private PreferenceCategory mServicesCategory;
     private PreferenceCategory mSystemsCategory;
 
     private CheckBoxPreference mToggleLargeTextPreference;
     private CheckBoxPreference mTogglePowerButtonEndsCallPreference;
-    private CheckBoxPreference mToggleAutoRotateScreenPreference;
+    private CheckBoxPreference mToggleLockScreenRotationPreference;
     private CheckBoxPreference mToggleSpeakPasswordPreference;
-    private Preference mToggleTouchExplorationPreference;
     private ListPreference mSelectLongPressTimeoutPreference;
     private AccessibilityEnableScriptInjectionPreference mToggleScriptInjectionPreference;
     private Preference mNoServicesMessagePreference;
@@ -184,12 +182,16 @@
         if (mServicesCategory.getPreference(0) == mNoServicesMessagePreference) {
             offerInstallAccessibilitySerivceOnce();
         }
-        mSettingsPackageMonitor.register(getActivity(), false);
+        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        RotationPolicy.registerRotationPolicyListener(getActivity(),
+                mRotationPolicyListener);
     }
 
     @Override
     public void onPause() {
         mSettingsPackageMonitor.unregister();
+        RotationPolicy.unregisterRotationPolicyListener(getActivity(),
+                mRotationPolicyListener);
         super.onPause();
     }
 
@@ -213,8 +215,8 @@
         } else if (mTogglePowerButtonEndsCallPreference == preference) {
             handleTogglePowerButtonEndsCallPreferenceClick();
             return true;
-        } else if (mToggleAutoRotateScreenPreference == preference) {
-            handleToggleAutoRotateScreenPreferenceClick();
+        } else if (mToggleLockScreenRotationPreference == preference) {
+            handleLockScreenRotationPreferenceClick();
             return true;
         } else if (mToggleSpeakPasswordPreference == preference) {
             handleToggleSpeakPasswordPreferenceClick();
@@ -239,18 +241,9 @@
                         : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
     }
 
-    private void handleToggleAutoRotateScreenPreferenceClick() {
-        try {
-            IWindowManager wm = IWindowManager.Stub.asInterface(
-                    ServiceManager.getService(Context.WINDOW_SERVICE));
-            if (mToggleAutoRotateScreenPreference.isChecked()) {
-                wm.thawRotation();
-            } else {
-                wm.freezeRotation(Surface.ROTATION_0);
-            }
-        } catch (RemoteException exc) {
-            Log.w(TAG, "Unable to save auto-rotate setting");
-        }
+    private void handleLockScreenRotationPreferenceClick() {
+        RotationPolicy.setRotationLockForAccessibility(getActivity(),
+                !mToggleLockScreenRotationPreference.isChecked());
     }
 
     private void handleToggleSpeakPasswordPreferenceClick() {
@@ -275,17 +268,14 @@
             mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
         }
 
-        // Auto-rotate screen
-        mToggleAutoRotateScreenPreference =
-            (CheckBoxPreference) findPreference(TOGGLE_AUTO_ROTATE_SCREEN_PREFERENCE);
+        // Lock screen rotation.
+        mToggleLockScreenRotationPreference =
+            (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
 
         // Speak passwords.
         mToggleSpeakPasswordPreference =
             (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
 
-        // Touch exploration enabled.
-        mToggleTouchExplorationPreference = findPreference(TOGGLE_TOUCH_EXPLORATION_PREFERENCE);
-
         // Long press timeout.
         mSelectLongPressTimeoutPreference =
             (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
@@ -352,7 +342,7 @@
             }
 
             preference.setOrder(i);
-            preference.setFragment(ToggleAccessibilityServiceFragment.class.getName());
+            preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
             preference.setPersistent(true);
 
             Bundle extras = preference.getExtras();
@@ -360,7 +350,7 @@
             extras.putBoolean(EXTRA_CHECKED, serviceEnabled);
             extras.putString(EXTRA_TITLE, title);
 
-            String description = info.getDescription();
+            String description = info.loadDescription(getPackageManager());
             if (TextUtils.isEmpty(description)) {
                 description = getString(R.string.accessibility_service_default_description);
             }
@@ -438,34 +428,13 @@
         }
 
         // Auto-rotate screen
-        final boolean autoRotationEnabled = Settings.System.getInt(getContentResolver(),
-                Settings.System.ACCELEROMETER_ROTATION, 0) != 0;
-        mToggleAutoRotateScreenPreference.setChecked(autoRotationEnabled);
+        updateLockScreenRotationCheckbox();
 
         // Speak passwords.
         final boolean speakPasswordEnabled = Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
         mToggleSpeakPasswordPreference.setChecked(speakPasswordEnabled);
 
-        // Touch exploration enabled.
-        if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {
-            mSystemsCategory.addPreference(mToggleTouchExplorationPreference);
-            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);
-            }
-
-        } else {
-            mSystemsCategory.removePreference(mToggleTouchExplorationPreference);
-        }
-
         // Long press timeout.
         final int longPressTimeout = Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
@@ -479,6 +448,14 @@
         mToggleScriptInjectionPreference.setInjectionAllowed(scriptInjectionAllowed);
     }
 
+    private void updateLockScreenRotationCheckbox() {
+        Context context = getActivity();
+        if (context != null) {
+            mToggleLockScreenRotationPreference.setChecked(
+                    !RotationPolicy.isRotationLocked(context));
+        }
+    }
+
     private void offerInstallAccessibilitySerivceOnce() {
         // There is always one preference - if no services it is just a message.
         if (mServicesCategory.getPreference(0) != mNoServicesMessagePreference) {
@@ -632,79 +609,8 @@
         }
     }
 
-    public static class ToggleAccessibilityServiceFragment extends TogglePreferenceFragment {
-        @Override
-        public void onPreferenceToggled(String preferenceKey, boolean enabled) {
-            // Parse the enabled services.
-            Set<ComponentName> enabledServices = getEnabledServicesFromSettings(getActivity());
-
-            // Determine enabled services and accessibility state.
-            ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
-            final boolean accessibilityEnabled;
-            if (enabled) {
-                // Enabling at least one service enables accessibility.
-                accessibilityEnabled = true;
-                enabledServices.add(toggledService);
-            } else {
-                // Check how many enabled and installed services are present.
-                int enabledAndInstalledServiceCount = 0;
-                Set<ComponentName> installedServices = sInstalledServices;
-                for (ComponentName enabledService : enabledServices) {
-                    if (installedServices.contains(enabledService)) {
-                        enabledAndInstalledServiceCount++;
-                    }
-                }
-                // Disabling the last service disables accessibility.
-                accessibilityEnabled = enabledAndInstalledServiceCount > 1
-                    || (enabledAndInstalledServiceCount == 1
-                            && !installedServices.contains(toggledService));
-                enabledServices.remove(toggledService);
-            }
-
-            // Update the enabled services setting.
-            StringBuilder enabledServicesBuilder = new StringBuilder();
-            // Keep the enabled services even if they are not installed since we have
-            // no way to know whether the application restore process has completed.
-            // In general the system should be responsible for the clean up not settings.
-            for (ComponentName enabledService : enabledServices) {
-                enabledServicesBuilder.append(enabledService.flattenToString());
-                enabledServicesBuilder.append(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
-            }
-            final int enabledServicesBuilderLength = enabledServicesBuilder.length();
-            if (enabledServicesBuilderLength > 0) {
-                enabledServicesBuilder.deleteCharAt(enabledServicesBuilderLength - 1);
-            }
-            Settings.Secure.putString(getContentResolver(),
-                    Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
-                    enabledServicesBuilder.toString());
-
-            // Update accessibility enabled.
-            Settings.Secure.putInt(getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_ENABLED, accessibilityEnabled ? 1 : 0);
-        }
-    }
-
-    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 {
+    public static class ToggleAccessibilityServicePreferenceFragment
+            extends SettingsPreferenceFragment implements DialogInterface.OnClickListener {
 
         private static final int DIALOG_ID_ENABLE_WARNING = 1;
         private static final int DIALOG_ID_DISABLE_WARNING = 2;
@@ -717,6 +623,7 @@
         private CharSequence mEnableWarningMessage;
         private CharSequence mDisableWarningTitle;
         private CharSequence mDisableWarningMessage;
+
         private Preference mSummaryPreference;
 
         private CharSequence mSettingsTitle;
@@ -782,7 +689,54 @@
             super.onDestroyView();
         }
 
-        public abstract void onPreferenceToggled(String preferenceKey, boolean value);
+        public void onPreferenceToggled(String preferenceKey, boolean enabled) {
+             // Parse the enabled services.
+            Set<ComponentName> enabledServices = getEnabledServicesFromSettings(getActivity());
+
+            // Determine enabled services and accessibility state.
+            ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
+            final boolean accessibilityEnabled;
+            if (enabled) {
+                // Enabling at least one service enables accessibility.
+                accessibilityEnabled = true;
+                enabledServices.add(toggledService);
+            } else {
+                // Check how many enabled and installed services are present.
+                int enabledAndInstalledServiceCount = 0;
+                Set<ComponentName> installedServices = sInstalledServices;
+                for (ComponentName enabledService : enabledServices) {
+                    if (installedServices.contains(enabledService)) {
+                        enabledAndInstalledServiceCount++;
+                    }
+                }
+                // Disabling the last service disables accessibility.
+                accessibilityEnabled = enabledAndInstalledServiceCount > 1
+                    || (enabledAndInstalledServiceCount == 1
+                            && !installedServices.contains(toggledService));
+                enabledServices.remove(toggledService);
+            }
+
+            // Update the enabled services setting.
+            StringBuilder enabledServicesBuilder = new StringBuilder();
+            // Keep the enabled services even if they are not installed since we have
+            // no way to know whether the application restore process has completed.
+            // In general the system should be responsible for the clean up not settings.
+            for (ComponentName enabledService : enabledServices) {
+                enabledServicesBuilder.append(enabledService.flattenToString());
+                enabledServicesBuilder.append(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
+            }
+            final int enabledServicesBuilderLength = enabledServicesBuilder.length();
+            if (enabledServicesBuilderLength > 0) {
+                enabledServicesBuilder.deleteCharAt(enabledServicesBuilderLength - 1);
+            }
+            Settings.Secure.putString(getContentResolver(),
+                    Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
+                    enabledServicesBuilder.toString());
+
+            // Update accessibility enabled.
+            Settings.Secure.putInt(getContentResolver(),
+                    Settings.Secure.ACCESSIBILITY_ENABLED, accessibilityEnabled ? 1 : 0);
+        }
 
         @Override
         public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
diff --git a/src/com/android/settings/AccessibilityTutorialActivity.java b/src/com/android/settings/AccessibilityTutorialActivity.java
deleted file mode 100644
index 206aa94..0000000
--- a/src/com/android/settings/AccessibilityTutorialActivity.java
+++ /dev/null
@@ -1,698 +0,0 @@
-/*
- * 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;
-
-        /** Handler for sending accessibility events after the current UI action. */
-        private InstructionHandler mHandler = new InstructionHandler();
-
-        /**
-         * 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 = mContext.getString(resId, formatArgs);
-            mHandler.addInstruction(text);
-        }
-
-        private void addInstructionSync(CharSequence text) {
-            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);
-        }
-
-        private class InstructionHandler extends Handler {
-            private static final int ADD_INSTRUCTION = 1;
-
-            @Override
-            public void handleMessage(Message msg) {
-                switch (msg.what) {
-                    case ADD_INSTRUCTION:
-                        final String text = (String) msg.obj;
-                        addInstructionSync(text);
-                        break;
-                }
-            }
-
-            public void addInstruction(String text) {
-                obtainMessage(ADD_INSTRUCTION, text).sendToTarget();
-            }
-        }
-    }
-
-    /**
-     * 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
index 824420d..2cc013c 100644
--- a/src/com/android/settings/AccountPreference.java
+++ b/src/com/android/settings/AccountPreference.java
@@ -20,7 +20,6 @@
 
 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;
@@ -36,25 +35,28 @@
     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
+    public static final int SYNC_IN_PROGRESS = 3; // currently syncing
     private int mStatus;
     private Account mAccount;
     private ArrayList<String> mAuthorities;
-    private Drawable mProviderIcon;
     private ImageView mSyncStatusIcon;
-    private ImageView mProviderIconView;
+    private boolean mShowTypeIcon;
 
     public AccountPreference(Context context, Account account, Drawable icon,
-            ArrayList<String> authorities) {
+            ArrayList<String> authorities, boolean showTypeIcon) {
         super(context);
         mAccount = account;
         mAuthorities = authorities;
-        mProviderIcon = icon;
-        setWidgetLayoutResource(R.layout.account_preference);
+        mShowTypeIcon = showTypeIcon;
+        if (showTypeIcon) {
+            setIcon(icon);
+        } else {
+            setIcon(getSyncStatusIcon(SYNC_DISABLED));
+        }
         setTitle(mAccount.name);
         setSummary("");
         setPersistent(false);
-        setSyncStatus(SYNC_DISABLED);
-        setIcon(mProviderIcon);
+        setSyncStatus(SYNC_DISABLED, false);
     }
 
     public Account getAccount() {
@@ -68,25 +70,22 @@
     @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);
+        if (!mShowTypeIcon) {
+            mSyncStatusIcon = (ImageView) view.findViewById(android.R.id.icon);
+            mSyncStatusIcon.setImageResource(getSyncStatusIcon(mStatus));
+            mSyncStatusIcon.setContentDescription(getSyncContentDescription(mStatus));
         }
     }
 
-    public void setSyncStatus(int status) {
+    public void setSyncStatus(int status, boolean updateSummary) {
         mStatus = status;
-        if (mSyncStatusIcon != null) {
+        if (!mShowTypeIcon && mSyncStatusIcon != null) {
             mSyncStatusIcon.setImageResource(getSyncStatusIcon(status));
+            mSyncStatusIcon.setContentDescription(getSyncContentDescription(mStatus));
         }
-        setSummary(getSyncStatusMessage(status));
+        if (updateSummary) {
+            setSummary(getSyncStatusMessage(status));
+        }
     }
 
     private int getSyncStatusMessage(int status) {
@@ -101,6 +100,9 @@
             case SYNC_ERROR:
                 res = R.string.sync_error;
                 break;
+            case SYNC_IN_PROGRESS:
+                res = R.string.sync_in_progress;
+                break;
             default:
                 res = R.string.sync_error;
                 Log.e(TAG, "Unknown sync status: " + status);
@@ -120,6 +122,9 @@
             case SYNC_ERROR:
                 res = R.drawable.ic_sync_red_holo;
                 break;
+            case SYNC_IN_PROGRESS:
+                res = R.drawable.ic_sync_green_holo;
+                break;
             default:
                 res = R.drawable.ic_sync_red_holo;
                 Log.e(TAG, "Unknown sync status: " + status);
@@ -140,13 +145,4 @@
                 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/AllowBindAppWidgetActivity.java b/src/com/android/settings/AllowBindAppWidgetActivity.java
new file mode 100644
index 0000000..2f54f8e
--- /dev/null
+++ b/src/com/android/settings/AllowBindAppWidgetActivity.java
@@ -0,0 +1,130 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import android.app.AlertDialog;
+import android.appwidget.AppWidgetManager;
+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.os.Bundle;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.widget.CheckBox;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+
+/**
+ * This activity is displayed when an app launches the BIND_APPWIDGET intent. This allows apps
+ * that don't have the BIND_APPWIDGET permission to bind specific widgets.
+ */
+public class AllowBindAppWidgetActivity extends AlertActivity implements
+        DialogInterface.OnClickListener {
+
+    private CheckBox mAlwaysUse;
+    private int mAppWidgetId;
+    private ComponentName mComponentName;
+    private String mCallingPackage;
+    private AppWidgetManager mAppWidgetManager;
+
+    // Indicates whether this activity was closed because of a click
+    private boolean mClicked;
+
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == AlertDialog.BUTTON_POSITIVE) {
+            // By default, set the result to cancelled
+            setResult(RESULT_CANCELED);
+            if (mAppWidgetId != -1 && mComponentName != null && mCallingPackage != null) {
+                try {
+                    mAppWidgetManager.bindAppWidgetId(mAppWidgetId, mComponentName);
+                    Intent result = new Intent();
+                    result.putExtra("EXTRA_APPWIDGET_ID", mAppWidgetId);
+                    setResult(RESULT_OK);
+                } catch (Exception e) {
+                    Log.v("BIND_APPWIDGET", "Error binding widget with id "
+                            + mAppWidgetId + " and component " + mComponentName);
+                }
+            }
+            boolean alwaysAllowBind = mAlwaysUse.isChecked();
+            if (alwaysAllowBind != mAppWidgetManager.hasBindAppWidgetPermission(mCallingPackage)) {
+                mAppWidgetManager.setBindAppWidgetPermission(mCallingPackage, alwaysAllowBind);
+            }
+        }
+        finish();
+    }
+
+    protected void onDestroy() {
+        if (!mClicked) {
+            setResult(RESULT_CANCELED);
+            finish();
+        }
+        super.onDestroy();
+    }
+
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        CharSequence label = "";
+        if (intent != null) {
+            try {
+                mAppWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
+                mComponentName = (ComponentName)
+                        intent.getParcelableExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER);
+                mCallingPackage = getCallingPackage();
+                PackageManager pm = getPackageManager();
+                ApplicationInfo ai = pm.getApplicationInfo(mCallingPackage, 0);
+                label = pm.getApplicationLabel(ai);
+            } catch (Exception e) {
+                mAppWidgetId = -1;
+                mComponentName = null;
+                mCallingPackage = null;
+                Log.v("BIND_APPWIDGET", "Error getting parameters");
+                setResult(RESULT_CANCELED);
+                finish();
+                return;
+            }
+        }
+        AlertController.AlertParams ap = mAlertParams;
+        ap.mTitle = getString(R.string.allow_bind_app_widget_activity_allow_bind_title);
+        ap.mMessage = getString(R.string.allow_bind_app_widget_activity_allow_bind, label);
+        ap.mPositiveButtonText = getString(R.string.create);
+        ap.mNegativeButtonText = getString(android.R.string.cancel);
+        ap.mPositiveButtonListener = this;
+        ap.mNegativeButtonListener = this;
+        LayoutInflater inflater =
+                (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        ap.mView = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null);
+        mAlwaysUse = (CheckBox) ap.mView.findViewById(com.android.internal.R.id.alwaysUse);
+        mAlwaysUse.setText(getString(R.string.allow_bind_app_widget_activity_always_allow_bind, label));
+
+        mAlwaysUse.setPadding(mAlwaysUse.getPaddingLeft(),
+                mAlwaysUse.getPaddingTop(),
+                mAlwaysUse.getPaddingRight(),
+                (int) (mAlwaysUse.getPaddingBottom() +
+                        getResources().getDimension(R.dimen.bind_app_widget_dialog_checkbox_bottom_padding)));
+
+        mAppWidgetManager = AppWidgetManager.getInstance(this);
+        mAlwaysUse.setChecked(mAppWidgetManager.hasBindAppWidgetPermission(mCallingPackage));
+
+        setupAlert();
+    }
+}
diff --git a/src/com/android/settings/AppPicker.java b/src/com/android/settings/AppPicker.java
new file mode 100644
index 0000000..e58b835
--- /dev/null
+++ b/src/com/android/settings/AppPicker.java
@@ -0,0 +1,144 @@
+/*
+ * 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.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import com.android.settings.applications.AppViewHolder;
+
+import android.app.ActivityManagerNative;
+import android.app.ListActivity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Process;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+public class AppPicker extends ListActivity {
+    private AppListAdapter mAdapter;
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mAdapter = new AppListAdapter(this);
+        if (mAdapter.getCount() <= 0) {
+            finish();
+        } else {
+            setListAdapter(mAdapter);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        MyApplicationInfo app = mAdapter.getItem(position);
+        Intent intent = new Intent();
+        if (app.info != null) intent.setAction(app.info.packageName);
+        setResult(RESULT_OK, intent);
+        finish();
+    }
+
+    class MyApplicationInfo {
+        ApplicationInfo info;
+        CharSequence label;
+    }
+
+    public class AppListAdapter extends ArrayAdapter<MyApplicationInfo> {
+        private final List<MyApplicationInfo> mPackageInfoList = new ArrayList<MyApplicationInfo>();
+        private final LayoutInflater mInflater;
+
+        public AppListAdapter(Context context) {
+            super(context, 0);
+            mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            List<ApplicationInfo> pkgs = context.getPackageManager().getInstalledApplications(0);
+            for (int i=0; i<pkgs.size(); i++) {
+                ApplicationInfo ai = pkgs.get(i);
+                if (ai.uid == Process.SYSTEM_UID) {
+                    continue;
+                }
+                // On a user build, we only allow debugging of apps that
+                // are marked as debuggable.  Otherwise (for platform development)
+                // we allow all apps.
+                if ((ai.flags&ApplicationInfo.FLAG_DEBUGGABLE) == 0
+                        && "user".equals(Build.TYPE)) {
+                    continue;
+                }
+                MyApplicationInfo info = new MyApplicationInfo();
+                info.info = ai;
+                info.label = info.info.loadLabel(getPackageManager()).toString();
+                mPackageInfoList.add(info);
+            }
+            Collections.sort(mPackageInfoList, sDisplayNameComparator);
+            MyApplicationInfo info = new MyApplicationInfo();
+            info.label = context.getText(R.string.no_application);
+            mPackageInfoList.add(0, info);
+            addAll(mPackageInfoList);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            // A ViewHolder keeps references to children views to avoid unnecessary calls
+            // to findViewById() on each row.
+            AppViewHolder holder = AppViewHolder.createOrRecycle(mInflater, convertView);
+            convertView = holder.rootView;
+            MyApplicationInfo info = getItem(position);
+            holder.appName.setText(info.label);
+            if (info.info != null) {
+                holder.appIcon.setImageDrawable(info.info.loadIcon(getPackageManager()));
+                holder.appSize.setText(info.info.packageName);
+            } else {
+                holder.appIcon.setImageDrawable(null);
+                holder.appSize.setText("");
+            }
+            holder.disabled.setVisibility(View.GONE);
+            holder.checkBox.setVisibility(View.GONE);
+            return convertView;
+        }
+    }
+
+    private final static Comparator<MyApplicationInfo> sDisplayNameComparator
+            = new Comparator<MyApplicationInfo>() {
+        public final int
+        compare(MyApplicationInfo a, MyApplicationInfo b) {
+            return collator.compare(a.label, b.label);
+        }
+
+        private final Collator collator = Collator.getInstance();
+    };
+}
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index c34d212..eff5c50 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -45,6 +45,9 @@
     private int mOldAutomatic;
 
     private boolean mAutomaticAvailable;
+    private boolean mAutomaticMode;
+
+    private int mCurBrightness = -1;
 
     private boolean mRestoredOldState;
 
@@ -52,11 +55,14 @@
     // doesn't set the backlight to 0 and get stuck
     private int mScreenBrightnessDim =
 	    getContext().getResources().getInteger(com.android.internal.R.integer.config_screenBrightnessDim);
-    private static final int MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON;
+    private static final int MAXIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_ON;
+
+    private static final int SEEK_BAR_RANGE = 10000;
 
     private ContentObserver mBrightnessObserver = new ContentObserver(new Handler()) {
         @Override
         public void onChange(boolean selfChange) {
+            mCurBrightness = -1;
             onBrightnessChanged();
         }
     };
@@ -97,24 +103,26 @@
         super.onBindDialogView(view);
 
         mSeekBar = getSeekBar(view);
-        mSeekBar.setMax(MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
-        mOldBrightness = getBrightness(0);
-        mSeekBar.setProgress(mOldBrightness - mScreenBrightnessDim);
+        mSeekBar.setMax(SEEK_BAR_RANGE);
+        mOldBrightness = getBrightness();
+        mSeekBar.setProgress(mOldBrightness);
 
         mCheckBox = (CheckBox)view.findViewById(R.id.automatic_mode);
         if (mAutomaticAvailable) {
             mCheckBox.setOnCheckedChangeListener(this);
             mOldAutomatic = getBrightnessMode(0);
-            mCheckBox.setChecked(mOldAutomatic != 0);
+            mAutomaticMode = mOldAutomatic == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
+            mCheckBox.setChecked(mAutomaticMode);
+            mSeekBar.setEnabled(!mAutomaticMode);
         } else {
-            mCheckBox.setVisibility(View.GONE);
+            mSeekBar.setEnabled(true);
         }
         mSeekBar.setOnSeekBarChangeListener(this);
     }
 
     public void onProgressChanged(SeekBar seekBar, int progress,
             boolean fromTouch) {
-        setBrightness(progress + mScreenBrightnessDim);
+        setBrightness(progress, false);
     }
 
     public void onStartTrackingTouch(SeekBar seekBar) {
@@ -128,19 +136,29 @@
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         setMode(isChecked ? Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC
                 : Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
-        if (!isChecked) {
-            setBrightness(mSeekBar.getProgress() + mScreenBrightnessDim);
-        }
+        mSeekBar.setProgress(getBrightness());
+        mSeekBar.setEnabled(!mAutomaticMode);
+        setBrightness(mSeekBar.getProgress(), false);
     }
 
-    private int getBrightness(int defaultValue) {
-        int brightness = defaultValue;
-        try {
-            brightness = Settings.System.getInt(getContext().getContentResolver(),
-                    Settings.System.SCREEN_BRIGHTNESS);
-        } catch (SettingNotFoundException snfe) {
+    private int getBrightness() {
+        int mode = getBrightnessMode(0);
+        float brightness = 0;
+        if (false && mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
+            brightness = Settings.System.getFloat(getContext().getContentResolver(),
+                    Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0);
+            brightness = (brightness+1)/2;
+        } else {
+            if (mCurBrightness < 0) {
+                brightness = Settings.System.getInt(getContext().getContentResolver(),
+                        Settings.System.SCREEN_BRIGHTNESS, 100);
+            } else {
+                brightness = mCurBrightness;
+            }
+            brightness = (brightness - mScreenBrightnessDim)
+                    / (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
         }
-        return brightness;
+        return (int)(brightness*SEEK_BAR_RANGE);
     }
 
     private int getBrightnessMode(int defaultValue) {
@@ -154,13 +172,15 @@
     }
 
     private void onBrightnessChanged() {
-        int brightness = getBrightness(MAXIMUM_BACKLIGHT);
-        mSeekBar.setProgress(brightness - mScreenBrightnessDim);
+        mSeekBar.setProgress(getBrightness());
     }
 
     private void onBrightnessModeChanged() {
-        boolean checked = getBrightnessMode(0) != 0;
+        boolean checked = getBrightnessMode(0)
+                == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
         mCheckBox.setChecked(checked);
+        mSeekBar.setProgress(getBrightness());
+        mSeekBar.setEnabled(!checked);
     }
 
     @Override
@@ -170,9 +190,7 @@
         final ContentResolver resolver = getContext().getContentResolver();
 
         if (positiveResult) {
-            Settings.System.putInt(resolver,
-                    Settings.System.SCREEN_BRIGHTNESS,
-                    mSeekBar.getProgress() + mScreenBrightnessDim);
+            setBrightness(mSeekBar.getProgress(), true);
         } else {
             restoreOldState();
         }
@@ -187,30 +205,53 @@
         if (mAutomaticAvailable) {
             setMode(mOldAutomatic);
         }
-        if (!mAutomaticAvailable || mOldAutomatic == 0) {
-            setBrightness(mOldBrightness);
-        }
+        setBrightness(mOldBrightness, false);
         mRestoredOldState = true;
+        mCurBrightness = -1;
     }
 
-    private void setBrightness(int brightness) {
-        try {
-            IPowerManager power = IPowerManager.Stub.asInterface(
-                    ServiceManager.getService("power"));
-            if (power != null) {
-                power.setBacklightBrightness(brightness);
+    private void setBrightness(int brightness, boolean write) {
+        if (mAutomaticMode) {
+            if (false) {
+                float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f;
+                try {
+                    IPowerManager power = IPowerManager.Stub.asInterface(
+                            ServiceManager.getService("power"));
+                    if (power != null) {
+                        power.setAutoBrightnessAdjustment(valf);
+                    }
+                    if (write) {
+                        final ContentResolver resolver = getContext().getContentResolver();
+                        Settings.System.putFloat(resolver,
+                                Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, valf);
+                    }
+                } catch (RemoteException doe) {
+                }
             }
-        } catch (RemoteException doe) {
-            
+        } else {
+            int range = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
+            brightness = (brightness*range)/SEEK_BAR_RANGE + mScreenBrightnessDim;
+            try {
+                IPowerManager power = IPowerManager.Stub.asInterface(
+                        ServiceManager.getService("power"));
+                if (power != null) {
+                    power.setBacklightBrightness(brightness);
+                }
+                if (write) {
+                    mCurBrightness = -1;
+                    final ContentResolver resolver = getContext().getContentResolver();
+                    Settings.System.putInt(resolver,
+                            Settings.System.SCREEN_BRIGHTNESS, brightness);
+                } else {
+                    mCurBrightness = brightness;
+                }
+            } catch (RemoteException doe) {
+            }
         }
     }
 
     private void setMode(int mode) {
-        if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
-            mSeekBar.setVisibility(View.GONE);
-        } else {
-            mSeekBar.setVisibility(View.VISIBLE);
-        }
+        mAutomaticMode = mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
         Settings.System.putInt(getContext().getContentResolver(),
                 Settings.System.SCREEN_BRIGHTNESS_MODE, mode);
     }
@@ -226,6 +267,7 @@
         myState.progress = mSeekBar.getProgress();
         myState.oldAutomatic = mOldAutomatic == 1;
         myState.oldProgress = mOldBrightness;
+        myState.curBrightness = mCurBrightness;
 
         // Restore the old state when the activity or dialog is being paused
         restoreOldState();
@@ -245,7 +287,8 @@
         mOldBrightness = myState.oldProgress;
         mOldAutomatic = myState.oldAutomatic ? 1 : 0;
         setMode(myState.automatic ? 1 : 0);
-        setBrightness(myState.progress + mScreenBrightnessDim);
+        setBrightness(myState.progress, false);
+        mCurBrightness = myState.curBrightness;
     }
 
     private static class SavedState extends BaseSavedState {
@@ -254,6 +297,7 @@
         boolean oldAutomatic;
         int progress;
         int oldProgress;
+        int curBrightness;
 
         public SavedState(Parcel source) {
             super(source);
@@ -261,6 +305,7 @@
             progress = source.readInt();
             oldAutomatic = source.readInt() == 1;
             oldProgress = source.readInt();
+            curBrightness = source.readInt();
         }
 
         @Override
@@ -270,6 +315,7 @@
             dest.writeInt(progress);
             dest.writeInt(oldAutomatic ? 1 : 0);
             dest.writeInt(oldProgress);
+            dest.writeInt(curBrightness);
         }
 
         public SavedState(Parcelable superState) {
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index df421a2..0f9fcee 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -33,6 +33,8 @@
 
 import com.android.internal.widget.LockPatternUtils;
 
+import libcore.util.MutableBoolean;
+
 public class ChooseLockGeneric extends PreferenceActivity {
 
     @Override
@@ -56,6 +58,7 @@
         private static final int FALLBACK_REQUEST = 101;
         private static final String PASSWORD_CONFIRMED = "password_confirmed";
         private static final String CONFIRM_CREDENTIALS = "confirm_credentials";
+        private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";
         public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
 
         private static final boolean ALWAY_SHOW_TUTORIAL = true;
@@ -64,6 +67,7 @@
         private DevicePolicyManager mDPM;
         private KeyStore mKeyStore;
         private boolean mPasswordConfirmed = false;
+        private boolean mWaitingForConfirmation = false;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -80,20 +84,25 @@
 
             if (savedInstanceState != null) {
                 mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
+                mWaitingForConfirmation = savedInstanceState.getBoolean(WAITING_FOR_CONFIRMATION);
             }
 
-            if (!mPasswordConfirmed) {
+            if (mPasswordConfirmed) {
+                updatePreferencesOrFinish();
+            } else if (!mWaitingForConfirmation) {
                 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 {
+                    mWaitingForConfirmation = true;
                 }
-            } else {
-                updatePreferencesOrFinish();
             }
         }
 
+
+
         @Override
         public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
                 Preference preference) {
@@ -141,6 +150,7 @@
         @Override
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
             super.onActivityResult(requestCode, resultCode, data);
+            mWaitingForConfirmation = false;
             if (requestCode == CONFIRM_EXISTING_REQUEST && resultCode == Activity.RESULT_OK) {
                 mPasswordConfirmed = true;
                 updatePreferencesOrFinish();
@@ -159,6 +169,7 @@
             super.onSaveInstanceState(outState);
             // Saved so we don't force user to re-enter their password if configuration changes
             outState.putBoolean(PASSWORD_CONFIRMED, mPasswordConfirmed);
+            outState.putBoolean(WAITING_FOR_CONFIRMATION, mWaitingForConfirmation);
         }
 
         private void updatePreferencesOrFinish() {
@@ -167,23 +178,37 @@
             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);
+                MutableBoolean allowBiometric = new MutableBoolean(false);
+                quality = upgradeQuality(quality, allowBiometric);
                 final PreferenceScreen prefScreen = getPreferenceScreen();
                 if (prefScreen != null) {
                     prefScreen.removeAll();
                 }
                 addPreferencesFromResource(R.xml.security_settings_picker);
-                disableUnusablePreferences(quality);
+                disableUnusablePreferences(quality, allowBiometric);
             } else {
                 updateUnlockMethodAndFinish(quality, false);
             }
         }
 
-        private int upgradeQuality(int quality) {
+        /** increases the quality if necessary, and returns whether biometric is allowed */
+        private int upgradeQuality(int quality, MutableBoolean allowBiometric) {
             quality = upgradeQualityForDPM(quality);
-            quality = upgradeQualityForEncryption(quality);
             quality = upgradeQualityForKeyStore(quality);
-            return quality;
+            int encryptionQuality = upgradeQualityForEncryption(quality);
+            if (encryptionQuality > quality) {
+                //The first case checks whether biometric is allowed, prior to the user making
+                //their selection from the list
+                if (allowBiometric != null) {
+                    allowBiometric.value = quality <=
+                            DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK;
+                } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {
+                    //When the user has selected biometric we shouldn't change that due to
+                    //encryption
+                    return quality;
+                }
+            }
+            return encryptionQuality;
         }
 
         private int upgradeQualityForDPM(int quality) {
@@ -228,7 +253,7 @@
          *
          * @param quality the requested quality.
          */
-        private void disableUnusablePreferences(final int quality) {
+        private void disableUnusablePreferences(final int quality, MutableBoolean allowBiometric) {
             final PreferenceScreen entries = getPreferenceScreen();
             final boolean onlyShowFallback = getActivity().getIntent()
                     .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
@@ -245,7 +270,8 @@
                     } 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;
+                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK ||
+                                allowBiometric.value;
                         visible = weakBiometricAvailable; // If not available, then don't show it.
                     } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
@@ -311,7 +337,7 @@
             final boolean isFallback = getActivity().getIntent()
                 .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
 
-            quality = upgradeQuality(quality);
+            quality = upgradeQuality(quality, null);
 
             if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
                 int minLength = mDPM.getPasswordMinimumLength(null);
@@ -360,5 +386,11 @@
             }
             finish();
         }
+
+        @Override
+        protected int getHelpResource() {
+            return R.string.help_url_choose_lockscreen;
+        }
+
     }
 }
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index e246fce..c12d06c 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -25,6 +25,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.security.Credentials;
 import android.security.KeyChain.KeyChainConnection;
 import android.security.KeyChain;
 import android.security.KeyStore;
@@ -187,13 +188,38 @@
         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)) {
+
+            if (bundle.containsKey(Credentials.EXTRA_USER_PRIVATE_KEY_NAME)) {
+                String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);
+                byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
+
+                if (!mKeyStore.importKey(key, value)) {
                     Log.e(TAG, "Failed to install " + key);
                     return;
                 }
             }
+
+            if (bundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) {
+                String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
+                byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
+
+                if (!mKeyStore.put(certName, certData)) {
+                    Log.e(TAG, "Failed to install " + certName);
+                    return;
+                }
+            }
+
+            if (bundle.containsKey(Credentials.EXTRA_CA_CERTIFICATES_NAME)) {
+                String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
+                byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
+
+                if (!mKeyStore.put(caListName, caListData)) {
+                    Log.e(TAG, "Failed to install " + caListName);
+                    return;
+                }
+
+            }
+
             setResult(RESULT_OK);
         }
     }
@@ -312,8 +338,8 @@
         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));
+                                            res.getText(R.string.credentials_install_gesture_prompt),
+                                            res.getText(R.string.credentials_install_gesture_explanation));
         return launched;
     }
 
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 655d8ad..5fb72ed 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.media.AudioManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
@@ -32,12 +33,18 @@
 import android.os.ServiceManager;
 import android.os.SystemProperties;
 import android.os.storage.IMountService;
+import android.provider.Settings;
 import android.telephony.TelephonyManager;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.View.OnKeyListener;
+import android.view.View.OnTouchListener;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
@@ -48,6 +55,7 @@
 import android.widget.TextView;
 
 import com.android.internal.telephony.ITelephony;
+import com.android.internal.telephony.Phone;
 
 import java.util.List;
 
@@ -64,14 +72,19 @@
  *     -n com.android.settings/.CryptKeeper
  * </pre>
  */
-public class CryptKeeper extends Activity implements TextView.OnEditorActionListener {
+public class CryptKeeper extends Activity implements TextView.OnEditorActionListener,
+        OnKeyListener, OnTouchListener, TextWatcher {
     private static final String TAG = "CryptKeeper";
 
     private static final String DECRYPT_STATE = "trigger_restart_framework";
+    /** Message sent to us to indicate encryption update progress. */
+    private static final int MESSAGE_UPDATE_PROGRESS = 1;
+    /** Message sent to us to cool-down (waste user's time between password attempts) */
+    private static final int MESSAGE_COOLDOWN = 2;
+    /** Message sent to us to indicate alerting the user that we are waiting for password entry */
+    private static final int MESSAGE_NOTIFY = 3;
 
-    private static final int UPDATE_PROGRESS = 1;
-    private static final int COOLDOWN = 2;
-
+    // Constants used to control policy.
     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
@@ -83,18 +96,21 @@
     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";
+    private static final String FORCE_VIEW_PASSWORD = "password";
 
-    /** When encryption is detected, this flag indivates whether or not we've checked for erros. */
+    /** When encryption is detected, this flag indicates whether or not we've checked for errors. */
     private boolean mValidationComplete;
     private boolean mValidationRequested;
     /** A flag to indicate that the volume is in a bad state (e.g. partially encrypted). */
     private boolean mEncryptionGoneBad;
-
+    /** A flag to indicate when the back event should be ignored */
+    private boolean mIgnoreBack = false;
     private int mCooldown;
     PowerManager.WakeLock mWakeLock;
     private EditText mPasswordEntry;
+    /** Number of calls to {@link #notifyUser()} to ignore before notifying. */
+    private int mNotificationCountdown = 0;
 
     /**
      * Used to propagate state through configuration changes (e.g. screen rotation)
@@ -107,19 +123,26 @@
         }
     }
 
-    // This activity is used to fade the screen to black after the password is entered.
-    public static class Blank extends Activity {
+    /**
+     * Activity used to fade the screen to black after the password is entered.
+     */
+    public static class FadeToBlack extends Activity {
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             setContentView(R.layout.crypt_keeper_blank);
         }
+        /** Ignore all back events. */
+        @Override
+        public void onBackPressed() {
+            return;
+        }
     }
 
     private class DecryptTask extends AsyncTask<String, Void, Integer> {
         @Override
         protected Integer doInBackground(String... params) {
-            IMountService service = getMountService();
+            final IMountService service = getMountService();
             try {
                 return service.decryptStorage(params[0]);
             } catch (Exception e) {
@@ -135,7 +158,7 @@
                 // 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);
+                Intent intent = new Intent(CryptKeeper.this, FadeToBlack.class);
                 finish();
                 startActivity(intent);
             } else if (failedAttempts == MAX_FAILED_ATTEMPTS) {
@@ -145,10 +168,8 @@
                 mCooldown = COOL_DOWN_INTERVAL;
                 cooldown();
             } else {
-                TextView tv = (TextView) findViewById(R.id.status);
-                tv.setText(R.string.try_again);
-                tv.setVisibility(View.VISIBLE);
-
+                final TextView status = (TextView) findViewById(R.id.status);
+                status.setText(R.string.try_again);
                 // Reenable the password entry
                 mPasswordEntry.setEnabled(true);
             }
@@ -158,7 +179,7 @@
     private class ValidationTask extends AsyncTask<Void, Void, Boolean> {
         @Override
         protected Boolean doInBackground(Void... params) {
-            IMountService service = getMountService();
+            final IMountService service = getMountService();
             try {
                 Log.d(TAG, "Validating encryption state.");
                 int state = service.getEncryptionState();
@@ -190,17 +211,23 @@
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-            case UPDATE_PROGRESS:
+            case MESSAGE_UPDATE_PROGRESS:
                 updateProgress();
                 break;
 
-            case COOLDOWN:
+            case MESSAGE_COOLDOWN:
                 cooldown();
                 break;
+
+            case MESSAGE_NOTIFY:
+                notifyUser();
+                break;
             }
         }
     };
 
+    private AudioManager mAudioManager;
+
     /** @return whether or not this Activity was started for debugging the UI only. */
     private boolean isDebugView() {
         return getIntent().hasExtra(EXTRA_FORCE_VIEW);
@@ -211,12 +238,48 @@
         return viewType.equals(getIntent().getStringExtra(EXTRA_FORCE_VIEW));
     }
 
+    /**
+     * Notify the user that we are awaiting input. Currently this sends an audio alert.
+     */
+    private void notifyUser() {
+        if (mNotificationCountdown > 0) {
+            Log.d(TAG, "Counting down to notify user..." + mNotificationCountdown);
+            --mNotificationCountdown;
+        } else if (mAudioManager != null) {
+            Log.d(TAG, "Notifying user that we are waiting for input...");
+            try {
+                // Play the standard keypress sound at full volume. This should be available on
+                // every device. We cannot play a ringtone here because media services aren't
+                // available yet. A DTMF-style tone is too soft to be noticed, and might not exist
+                // on tablet devices. The idea is to alert the user that something is needed: this
+                // does not have to be pleasing.
+                mAudioManager.playSoundEffect(AudioManager.FX_KEYPRESS_STANDARD, 100);
+            } catch (Exception e) {
+                Log.w(TAG, "notifyUser: Exception while playing sound: " + e);
+            }
+        }
+        // Notify the user again in 5 seconds.
+        mHandler.removeMessages(MESSAGE_NOTIFY);
+        mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 5 * 1000);
+    }
+
+    /**
+     * Ignore back events after the user has entered the decrypt screen and while the device is
+     * encrypting.
+     */
+    @Override
+    public void onBackPressed() {
+        if (mIgnoreBack)
+            return;
+        super.onBackPressed();
+    }
+
     @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");
+        final String state = SystemProperties.get("vold.decrypt");
         if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) {
             // Disable the crypt keeper.
             PackageManager pm = getPackageManager();
@@ -234,18 +297,20 @@
             return;
         }
 
-        // Disable the status bar
+        // Disable the status bar, but do NOT disable back because the user needs a way to go
+        // from keyboard settings and back to the password screen.
         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_HOME
-                | StatusBarManager.DISABLE_RECENT
-                | StatusBarManager.DISABLE_BACK);
+                | StatusBarManager.DISABLE_RECENT);
 
+        setAirplaneModeIfNecessary();
+        mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         // Check for (and recover) retained instance data
-        Object lastInstance = getLastNonConfigurationInstance();
+        final Object lastInstance = getLastNonConfigurationInstance();
         if (lastInstance instanceof NonConfigurationInstanceState) {
             NonConfigurationInstanceState retained = (NonConfigurationInstanceState) lastInstance;
             mWakeLock = retained.wakelock;
@@ -261,7 +326,6 @@
     @Override
     public void onStart() {
         super.onStart();
-
         setupUi();
     }
 
@@ -276,11 +340,11 @@
             return;
         }
 
-        String progress = SystemProperties.get("vold.encrypt_progress");
+        final String progress = SystemProperties.get("vold.encrypt_progress");
         if (!"".equals(progress) || isDebugView(FORCE_VIEW_PROGRESS)) {
             setContentView(R.layout.crypt_keeper_progress);
             encryptionProgressInit();
-        } else if (mValidationComplete) {
+        } else if (mValidationComplete || isDebugView(FORCE_VIEW_PASSWORD)) {
             setContentView(R.layout.crypt_keeper_password_entry);
             passwordEntryInit();
         } else if (!mValidationRequested) {
@@ -293,9 +357,9 @@
     @Override
     public void onStop() {
         super.onStop();
-
-        mHandler.removeMessages(COOLDOWN);
-        mHandler.removeMessages(UPDATE_PROGRESS);
+        mHandler.removeMessages(MESSAGE_COOLDOWN);
+        mHandler.removeMessages(MESSAGE_UPDATE_PROGRESS);
+        mHandler.removeMessages(MESSAGE_NOTIFY);
     }
 
     /**
@@ -322,11 +386,13 @@
         }
     }
 
+    /**
+     * Start encrypting the device.
+     */
     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.");
@@ -335,9 +401,11 @@
             mWakeLock.acquire();
         }
 
-        ProgressBar progressBar = (ProgressBar) findViewById(R.id.progress_bar);
-        progressBar.setIndeterminate(true);
-
+        ((ProgressBar) findViewById(R.id.progress_bar)).setIndeterminate(true);
+        // Ignore all back presses from now, both hard and soft keys.
+        mIgnoreBack = true;
+        // Start the first run of progress manually. This method sets up messages to occur at
+        // repeated intervals.
         updateProgress();
     }
 
@@ -346,29 +414,29 @@
         findViewById(R.id.encroid).setVisibility(View.GONE);
 
         // Show the reset button, failure text, and a divider
-        Button button = (Button) findViewById(R.id.factory_reset);
+        final Button button = (Button) findViewById(R.id.factory_reset);
         button.setVisibility(View.VISIBLE);
         button.setOnClickListener(new OnClickListener() {
+                @Override
             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);
+        // Alert the user of the failure.
+        ((TextView) findViewById(R.id.title)).setText(R.string.crypt_keeper_failed_title);
+        ((TextView) findViewById(R.id.status)).setText(R.string.crypt_keeper_failed_summary);
 
-        tv = (TextView) findViewById(R.id.status);
-        tv.setText(R.string.crypt_keeper_failed_summary);
-
-        View view = findViewById(R.id.bottom_divider);
+        final View view = findViewById(R.id.bottom_divider);
+        // TODO(viki): Why would the bottom divider be missing in certain layouts? Investigate.
         if (view != null) {
             view.setVisibility(View.VISIBLE);
         }
     }
 
     private void updateProgress() {
-        String state = SystemProperties.get("vold.encrypt_progress");
+        final String state = SystemProperties.get("vold.encrypt_progress");
 
         if ("error_partially_encrypted".equals(state)) {
             showFactoryReset();
@@ -383,33 +451,33 @@
             Log.w(TAG, "Error parsing progress: " + e.toString());
         }
 
-        CharSequence status = getText(R.string.crypt_keeper_setup_description);
+        final 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)));
-
+        final TextView tv = (TextView) findViewById(R.id.status);
+        if (tv != null) {
+            tv.setText(TextUtils.expandTemplate(status, Integer.toString(progress)));
+        }
         // Check the progress every 5 seconds
-        mHandler.removeMessages(UPDATE_PROGRESS);
-        mHandler.sendEmptyMessageDelayed(UPDATE_PROGRESS, 5000);
+        mHandler.removeMessages(MESSAGE_UPDATE_PROGRESS);
+        mHandler.sendEmptyMessageDelayed(MESSAGE_UPDATE_PROGRESS, 5000);
     }
 
+    /** Disable password input for a while to force the user to waste time between retries */
     private void cooldown() {
-        TextView tv = (TextView) findViewById(R.id.status);
+        final TextView status = (TextView) findViewById(R.id.status);
 
         if (mCooldown <= 0) {
-            // Re-enable the password entry
+            // Re-enable the password entry and back presses.
             mPasswordEntry.setEnabled(true);
-
-            tv.setVisibility(View.GONE);
+            mIgnoreBack = false;
+            status.setText(R.string.enter_password);
         } else {
             CharSequence template = getText(R.string.crypt_keeper_cooldown);
-            tv.setText(TextUtils.expandTemplate(template, Integer.toString(mCooldown)));
-
-            tv.setVisibility(View.VISIBLE);
+            status.setText(TextUtils.expandTemplate(template, Integer.toString(mCooldown)));
 
             mCooldown--;
-            mHandler.removeMessages(COOLDOWN);
-            mHandler.sendEmptyMessageDelayed(COOLDOWN, 1000); // Tick every second
+            mHandler.removeMessages(MESSAGE_COOLDOWN);
+            mHandler.sendEmptyMessageDelayed(MESSAGE_COOLDOWN, 1000); // Tick every second
         }
     }
 
@@ -417,19 +485,45 @@
         mPasswordEntry = (EditText) findViewById(R.id.passwordEntry);
         mPasswordEntry.setOnEditorActionListener(this);
         mPasswordEntry.requestFocus();
+        // Become quiet when the user interacts with the Edit text screen.
+        mPasswordEntry.setOnKeyListener(this);
+        mPasswordEntry.setOnTouchListener(this);
+        mPasswordEntry.addTextChangedListener(this);
 
-        View imeSwitcher = findViewById(R.id.switch_ime_button);
+        // Disable the Emergency call button if the device has no voice telephone capability
+        final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+        if (!tm.isVoiceCapable()) {
+            final View emergencyCall = findViewById(R.id.emergencyCallButton);
+            if (emergencyCall != null) {
+                Log.d(TAG, "Removing the emergency Call button");
+                emergencyCall.setVisibility(View.GONE);
+            }
+        }
+
+        final 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() {
+                    @Override
                 public void onClick(View v) {
                     imm.showInputMethodPicker();
                 }
             });
         }
 
+        // We want to keep the screen on while waiting for input. In minimal boot mode, the device
+        // is completely non-functional, and we want the user to notice the device and enter a
+        // password.
+        if (mWakeLock == null) {
+            Log.d(TAG, "Acquiring wakelock.");
+            final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            if (pm != null) {
+                mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, TAG);
+                mWakeLock.acquire();
+            }
+        }
         // Asynchronously throw up the IME, since there are issues with requesting it to be shown
         // immediately.
         mHandler.postDelayed(new Runnable() {
@@ -439,6 +533,9 @@
         }, 0);
 
         updateEmergencyCallButtonState();
+        // Notify the user in 120 seconds that we are waiting for him to enter the password.
+        mHandler.removeMessages(MESSAGE_NOTIFY);
+        mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 120 * 1000);
     }
 
     /**
@@ -490,7 +587,7 @@
     }
 
     private IMountService getMountService() {
-        IBinder service = ServiceManager.getService("mount");
+        final IBinder service = ServiceManager.getService("mount");
         if (service != null) {
             return IMountService.Stub.asInterface(service);
         }
@@ -501,7 +598,7 @@
     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();
+            final String password = v.getText().toString();
 
             if (TextUtils.isEmpty(password)) {
                 return true;
@@ -510,10 +607,10 @@
             // 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.
+            // Disable the password entry and back keypress while checking the password. These
+            // we either be re-enabled if the password was wrong or after the cooldown period.
             mPasswordEntry.setEnabled(false);
+            mIgnoreBack = true;
 
             Log.d(TAG, "Attempting to send command to decrypt");
             new DecryptTask().execute(password);
@@ -523,43 +620,72 @@
         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.
-    //
+    /**
+     * Set airplane mode on the device if it isn't an LTE device.
+     * Full story: In minimal boot mode, we cannot save any state. In particular, we cannot save
+     * any incoming SMS's. So SMSs that are received here will be silently dropped to the floor.
+     * That is bad. Also, we cannot receive any telephone calls in this state. So to avoid
+     * both these problems, we turn the radio off. However, on certain networks turning on and
+     * off the radio takes a long time. In such cases, we are better off leaving the radio
+     * running so the latency of an E911 call is short.
+     * The behavior after this is:
+     * 1. Emergency dialing: the emergency dialer has logic to force the device out of
+     *    airplane mode and restart the radio.
+     * 2. Full boot: we read the persistent settings from the previous boot and restore the
+     *    radio to whatever it was before it restarted. This also happens when rebooting a
+     *    phone that has no encryption.
+     */
+    private final void setAirplaneModeIfNecessary() {
+        final boolean isLteDevice =
+                TelephonyManager.getDefault().getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE;
+        if (!isLteDevice) {
+            Log.d(TAG, "Going into airplane mode.");
+            Settings.System.putInt(getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 1);
+            final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
+            intent.putExtra("state", true);
+            sendBroadcast(intent);
+        }
+    }
 
+    /**
+     * 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);
+        final Button emergencyCall = (Button) findViewById(R.id.emergencyCallButton);
         // The button isn't present at all in some configurations.
-        if (button == null) return;
+        if (emergencyCall == null)
+            return;
 
         if (isEmergencyCallCapable()) {
-            button.setVisibility(View.VISIBLE);
-            button.setOnClickListener(new View.OnClickListener() {
+            emergencyCall.setVisibility(View.VISIBLE);
+            emergencyCall.setOnClickListener(new View.OnClickListener() {
+                    @Override
+
                     public void onClick(View v) {
                         takeEmergencyCallAction();
                     }
                 });
         } else {
-            button.setVisibility(View.GONE);
+            emergencyCall.setVisibility(View.GONE);
             return;
         }
 
-        int newState = TelephonyManager.getDefault().getCallState();
+        final int newState = TelephonyManager.getDefault().getCallState();
         int textId;
         if (newState == TelephonyManager.CALL_STATE_OFFHOOK) {
-            // show "return to call" text and show phone icon
+            // 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);
+            final int phoneCallIcon = R.drawable.stat_sys_phone_call;
+            emergencyCall.setCompoundDrawablesWithIntrinsicBounds(phoneCallIcon, 0, 0, 0);
         } else {
             textId = R.string.cryptkeeper_emergency_call;
-            int emergencyIcon = R.drawable.ic_emergency;
-            button.setCompoundDrawablesWithIntrinsicBounds(emergencyIcon, 0, 0, 0);
+            final int emergencyIcon = R.drawable.ic_emergency;
+            emergencyCall.setCompoundDrawablesWithIntrinsicBounds(emergencyIcon, 0, 0, 0);
         }
-        button.setText(textId);
+        emergencyCall.setText(textId);
     }
 
     private boolean isEmergencyCallCapable() {
@@ -575,7 +701,7 @@
     }
 
     private void resumeCall() {
-        ITelephony phone = ITelephony.Stub.asInterface(ServiceManager.checkService("phone"));
+        final ITelephony phone = ITelephony.Stub.asInterface(ServiceManager.checkService("phone"));
         if (phone != null) {
             try {
                 phone.showCallScreen();
@@ -586,9 +712,44 @@
     }
 
     private void launchEmergencyDialer() {
-        Intent intent = new Intent(ACTION_EMERGENCY_DIAL);
+        final Intent intent = new Intent(ACTION_EMERGENCY_DIAL);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
                         | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
         startActivity(intent);
     }
+
+    /**
+     * Listen to key events so we can disable sounds when we get a keyinput in EditText.
+     */
+    private void delayAudioNotification() {
+        Log.d(TAG, "User entering password: delay audio notification");
+        mNotificationCountdown = 20;
+    }
+
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        delayAudioNotification();
+        return false;
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        delayAudioNotification();
+        return false;
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        return;
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+        delayAudioNotification();
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        return;
+    }
 }
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index 41a4be5..ce3ad9d 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -159,7 +159,14 @@
      */
     private boolean runKeyguardConfirmation(int request) {
         // 1.  Confirm that we have a sufficient PIN/Password to continue
-        int quality = new LockPatternUtils(getActivity()).getActivePasswordQuality();
+        LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+        int quality = lockPatternUtils.getActivePasswordQuality();
+        if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK
+            && lockPatternUtils.isLockPasswordEnabled()) {
+            // Use the alternate as the quality. We expect this to be
+            // PASSWORD_QUALITY_SOMETHING(pattern) or PASSWORD_QUALITY_NUMERIC(PIN).
+            quality = lockPatternUtils.getKeyguardStoredPasswordQuality();
+        }
         if (quality < MIN_PASSWORD_QUALITY) {
             return false;
         }
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index a2f0c3f..13512d4 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -35,12 +35,14 @@
 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.net.NetworkTemplate.buildTemplateWifiWildcard;
+import static android.net.TrafficStats.GB_IN_BYTES;
+import static android.net.TrafficStats.MB_IN_BYTES;
 import static android.net.TrafficStats.UID_REMOVED;
 import static android.net.TrafficStats.UID_TETHERING;
+import static android.telephony.TelephonyManager.SIM_STATE_READY;
 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.internal.util.Preconditions.checkNotNull;
 import static com.android.settings.Utils.prepareCustomPreferencesList;
@@ -67,25 +69,34 @@
 import android.net.ConnectivityManager;
 import android.net.INetworkPolicyManager;
 import android.net.INetworkStatsService;
+import android.net.INetworkStatsSession;
 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.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.INetworkManagementService;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
+import android.os.UserId;
 import android.preference.Preference;
+import android.preference.PreferenceActivity;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
+import android.text.format.Time;
 import android.util.Log;
 import android.util.SparseArray;
+import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -93,7 +104,6 @@
 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;
@@ -121,6 +131,7 @@
 import com.android.settings.drawable.InsetBoundsDrawable;
 import com.android.settings.net.ChartData;
 import com.android.settings.net.ChartDataLoader;
+import com.android.settings.net.DataUsageMeteredSettings;
 import com.android.settings.net.NetworkPolicyEditor;
 import com.android.settings.net.SummaryForAllUidLoader;
 import com.android.settings.net.UidDetail;
@@ -131,7 +142,6 @@
 import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -139,8 +149,8 @@
 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}.
+ * Panel showing 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";
@@ -149,7 +159,9 @@
     // 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 TEST_SUBSCRIBER_PROP = "test.subscriberid";
 
     private static final String TAB_3G = "3g";
     private static final String TAB_4G = "4g";
@@ -166,20 +178,19 @@
     private static final String TAG_CONFIRM_RESTRICT = "confirmRestrict";
     private static final String TAG_DENIED_RESTRICT = "deniedRestrict";
     private static final String TAG_CONFIRM_APP_RESTRICT = "confirmAppRestrict";
+    private static final String TAG_CONFIRM_AUTO_SYNC_CHANGE = "confirmAutoSyncChange";
     private static final String TAG_APP_DETAILS = "appDetails";
 
     private static final int LOADER_CHART_DATA = 2;
     private static final int LOADER_SUMMARY = 3;
 
-    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 NetworkPolicyManager mPolicyManager;
     private ConnectivityManager mConnService;
 
+    private INetworkStatsSession mStatsSession;
+
     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";
@@ -230,7 +241,7 @@
     private NetworkTemplate mTemplate;
     private ChartData mChartData;
 
-    private int[] mAppDetailUids = null;
+    private AppItem mCurrentApp = null;
 
     private Intent mAppSettingsIntent;
 
@@ -241,6 +252,7 @@
 
     private MenuItem mMenuDataRoaming;
     private MenuItem mMenuRestrictBackground;
+    private MenuItem mMenuAutoSync;
 
     /** Flag used to ignore listeners during binding. */
     private boolean mBinding;
@@ -250,24 +262,29 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        final Context context = getActivity();
 
         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);
+        mPolicyManager = NetworkPolicyManager.from(context);
+        mConnService = ConnectivityManager.from(context);
 
         mPrefs = getActivity().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);
 
-        mPolicyEditor = new NetworkPolicyEditor(mPolicyService);
+        mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
         mPolicyEditor.read();
 
         mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, false);
         mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, false);
 
+        // override preferences when no mobile radio
+        if (!hasReadyMobileRadio(context)) {
+            mShowWifi = hasWifiRadio(context);
+            mShowEthernet = hasEthernet(context);
+        }
+
         setHasOptionsMenu(true);
     }
 
@@ -280,6 +297,12 @@
 
         mUidDetailProvider = new UidDetailProvider(context);
 
+        try {
+            mStatsSession = mStatsService.openSession();
+        } catch (RemoteException e) {
+            throw new RuntimeException(e);
+        }
+
         mTabHost = (TabHost) view.findViewById(android.R.id.tabhost);
         mTabsContainer = (ViewGroup) view.findViewById(R.id.tabs_container);
         mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs);
@@ -372,9 +395,6 @@
         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(mUidDetailProvider, mInsetSide);
         mListView.setOnItemClickListener(mListListener);
         mListView.setAdapter(mAdapter);
@@ -428,33 +448,53 @@
         final boolean appDetailMode = isAppDetailMode();
 
         mMenuDataRoaming = menu.findItem(R.id.data_usage_menu_roaming);
-        mMenuDataRoaming.setVisible(hasMobileRadio(context) && !appDetailMode);
+        mMenuDataRoaming.setVisible(hasReadyMobileRadio(context) && !appDetailMode);
         mMenuDataRoaming.setChecked(getDataRoaming());
 
         mMenuRestrictBackground = menu.findItem(R.id.data_usage_menu_restrict_background);
-        mMenuRestrictBackground.setVisible(hasMobileRadio(context) && !appDetailMode);
-        mMenuRestrictBackground.setChecked(getRestrictBackground());
+        mMenuRestrictBackground.setVisible(hasReadyMobileRadio(context) && !appDetailMode);
+        mMenuRestrictBackground.setChecked(mPolicyManager.getRestrictBackground());
+
+        mMenuAutoSync = menu.findItem(R.id.data_usage_menu_auto_sync);
+        mMenuAutoSync.setChecked(ContentResolver.getMasterSyncAutomatically());
 
         final MenuItem split4g = menu.findItem(R.id.data_usage_menu_split_4g);
-        split4g.setVisible(hasMobile4gRadio(context) && !appDetailMode);
+        split4g.setVisible(hasReadyMobile4gRadio(context) && !appDetailMode);
         split4g.setChecked(isMobilePolicySplit());
 
         final MenuItem showWifi = menu.findItem(R.id.data_usage_menu_show_wifi);
-        if (hasWifiRadio(context) && hasMobileRadio(context)) {
+        if (hasWifiRadio(context) && hasReadyMobileRadio(context)) {
             showWifi.setVisible(!appDetailMode);
             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)) {
+        if (hasEthernet(context) && hasReadyMobileRadio(context)) {
             showEthernet.setVisible(!appDetailMode);
             showEthernet.setChecked(mShowEthernet);
         } else {
             showEthernet.setVisible(false);
-            mShowEthernet = true;
+        }
+
+        final MenuItem metered = menu.findItem(R.id.data_usage_menu_metered);
+        if (hasReadyMobileRadio(context) || hasWifiRadio(context)) {
+            metered.setVisible(!appDetailMode);
+        } else {
+            metered.setVisible(false);
+        }
+
+        final MenuItem help = menu.findItem(R.id.data_usage_menu_help);
+        String helpUrl;
+        if (!TextUtils.isEmpty(helpUrl = getResources().getString(R.string.help_url_data_usage))) {
+            Intent helpIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(helpUrl));
+            helpIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+            help.setIntent(helpIntent);
+            help.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        } else {
+            help.setVisible(false);
         }
     }
 
@@ -474,11 +514,7 @@
             case R.id.data_usage_menu_restrict_background: {
                 final boolean restrictBackground = !item.isChecked();
                 if (restrictBackground) {
-                    if (hasLimitedNetworks()) {
-                        ConfirmRestrictFragment.show(this);
-                    } else {
-                        DeniedRestrictFragment.show(this);
-                    }
+                    ConfirmRestrictFragment.show(this);
                 } else {
                     // no confirmation to drop restriction
                     setRestrictBackground(false);
@@ -506,50 +542,55 @@
                 updateTabs();
                 return true;
             }
+            case R.id.data_usage_menu_metered: {
+                final PreferenceActivity activity = (PreferenceActivity) getActivity();
+                activity.startPreferencePanel(DataUsageMeteredSettings.class.getCanonicalName(), null,
+                        R.string.data_usage_metered_title, null, this, 0);
+                return true;
+            }
+            case R.id.data_usage_menu_auto_sync: {
+                ConfirmAutoSyncChangeFragment.show(this, !item.isChecked());
+                return true;
+            }
         }
         return false;
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
+    public void onDestroy() {
         mDataEnabledView = null;
         mDisableAtLimitView = null;
 
         mUidDetailProvider.clearCache();
         mUidDetailProvider = null;
-    }
 
-    @Override
-    public void onDestroy() {
+        TrafficStats.closeQuietly(mStatsSession);
+
         if (this.isRemoving()) {
             getFragmentManager()
                     .popBackStack(TAG_APP_DETAILS, FragmentManager.POP_BACK_STACK_INCLUSIVE);
         }
+
         super.onDestroy();
     }
 
     /**
-     * Listener to setup {@link LayoutTransition} after first layout pass.
+     * Build and assign {@link LayoutTransition} to various containers. Should
+     * only be assigned after initial layout is complete.
      */
-    private OnGlobalLayoutListener mFirstLayoutListener = new OnGlobalLayoutListener() {
-        /** {@inheritDoc} */
-        public void onGlobalLayout() {
-            mListView.getViewTreeObserver().removeGlobalOnLayoutListener(mFirstLayoutListener);
+    private void ensureLayoutTransitions() {
+        // skip when already setup
+        if (mChart.getLayoutTransition() != null) return;
 
-            mTabsContainer.setLayoutTransition(buildLayoutTransition());
-            mHeader.setLayoutTransition(buildLayoutTransition());
-            mNetworkSwitchesContainer.setLayoutTransition(buildLayoutTransition());
+        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.APPEARING, null);
-            chartTransition.setAnimator(LayoutTransition.DISAPPEARING, null);
-            mChart.setLayoutTransition(chartTransition);
-        }
-    };
+        final LayoutTransition chartTransition = buildLayoutTransition();
+        chartTransition.disableTransitionType(LayoutTransition.APPEARING);
+        chartTransition.disableTransitionType(LayoutTransition.DISAPPEARING);
+        mChart.setLayoutTransition(chartTransition);
+    }
 
     private static LayoutTransition buildLayoutTransition() {
         final LayoutTransition transition = new LayoutTransition();
@@ -570,10 +611,10 @@
         mTabHost.clearAllTabs();
 
         final boolean mobileSplit = isMobilePolicySplit();
-        if (mobileSplit && hasMobile4gRadio(context)) {
+        if (mobileSplit && hasReadyMobile4gRadio(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)) {
+        } else if (hasReadyMobileRadio(context)) {
             mTabHost.addTab(buildTabSpec(TAB_MOBILE, R.string.data_usage_tab_mobile));
         }
         if (mShowWifi && hasWifiRadio(context)) {
@@ -583,6 +624,7 @@
             mTabHost.addTab(buildTabSpec(TAB_ETHERNET, R.string.data_usage_tab_ethernet));
         }
 
+        final boolean noTabs = mTabWidget.getTabCount() == 0;
         final boolean multipleTabs = mTabWidget.getTabCount() > 1;
         mTabWidget.setVisibility(multipleTabs ? View.VISIBLE : View.GONE);
         if (mIntentTab != null) {
@@ -593,6 +635,9 @@
                 mTabHost.setCurrentTabByTag(mIntentTab);
             }
             mIntentTab = null;
+        } else if (noTabs) {
+            // no usable tabs, so hide body
+            updateBody();
         } else {
             // already hit updateBody() when added; ignore
         }
@@ -602,7 +647,7 @@
      * Factory that provide empty {@link View} to make {@link TabHost} happy.
      */
     private TabContentFactory mEmptyTabContent = new TabContentFactory() {
-        /** {@inheritDoc} */
+        @Override
         public View createTabContent(String tag) {
             return new View(mTabHost.getContext());
         }
@@ -617,7 +662,7 @@
     }
 
     private OnTabChangeListener mTabListener = new OnTabChangeListener() {
-        /** {@inheritDoc} */
+        @Override
         public void onTabChanged(String tabId) {
             // user changed tab; update body
             updateBody();
@@ -651,6 +696,9 @@
 
         mDataEnabledView.setVisibility(View.VISIBLE);
 
+        // TODO: remove mobile tabs when SIM isn't ready
+        final TelephonyManager tele = TelephonyManager.from(context);
+
         if (TAB_MOBILE.equals(currentTab)) {
             setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_mobile);
             setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_mobile_limit);
@@ -672,7 +720,7 @@
             // wifi doesn't have any controls
             mDataEnabledView.setVisibility(View.GONE);
             mDisableAtLimitView.setVisibility(View.GONE);
-            mTemplate = buildTemplateWifi();
+            mTemplate = buildTemplateWifiWildcard();
 
         } else if (TAB_ETHERNET.equals(currentTab)) {
             // ethernet doesn't have any controls
@@ -688,7 +736,7 @@
         // TODO: consider chaining two loaders together instead of reloading
         // network history when showing app detail.
         getLoaderManager().restartLoader(LOADER_CHART_DATA,
-                ChartDataLoader.buildArgs(mTemplate, mAppDetailUids), mChartDataCallbacks);
+                ChartDataLoader.buildArgs(mTemplate, mCurrentApp), mChartDataCallbacks);
 
         // detail mode can change visible menus, invalidate
         getActivity().invalidateOptionsMenu();
@@ -697,15 +745,11 @@
     }
 
     private boolean isAppDetailMode() {
-        return mAppDetailUids != null;
-    }
-
-    private int getAppDetailPrimaryUid() {
-        return mAppDetailUids[0];
+        return mCurrentApp != null;
     }
 
     /**
-     * Update UID details panels to match {@link #mAppDetailUids}, showing or
+     * Update UID details panels to match {@link #mCurrentApp}, showing or
      * hiding them depending on {@link #isAppDetailMode()}.
      */
     private void updateAppDetail() {
@@ -729,8 +773,8 @@
         mChart.bindNetworkPolicy(null);
 
         // show icon and all labels appearing under this app
-        final int primaryUid = getAppDetailPrimaryUid();
-        final UidDetail detail = mUidDetailProvider.getUidDetail(primaryUid, true);
+        final int appId = mCurrentApp.appId;
+        final UidDetail detail = mUidDetailProvider.getUidDetail(appId, true);
         mAppIcon.setImageDrawable(detail.icon);
 
         mAppTitles.removeAllViews();
@@ -744,7 +788,7 @@
 
         // enable settings button when package provides it
         // TODO: target torwards entire UID instead of just first package
-        final String[] packageNames = pm.getPackagesForUid(primaryUid);
+        final String[] packageNames = pm.getPackagesForUid(appId);
         if (packageNames != null && packageNames.length > 0) {
             mAppSettingsIntent = new Intent(Intent.ACTION_MANAGE_NETWORK_USAGE);
             mAppSettingsIntent.setPackage(packageNames[0]);
@@ -752,25 +796,20 @@
 
             final boolean matchFound = pm.resolveActivity(mAppSettingsIntent, 0) != null;
             mAppSettings.setEnabled(matchFound);
+            mAppSettings.setVisibility(View.VISIBLE);
 
         } else {
             mAppSettingsIntent = null;
-            mAppSettings.setEnabled(false);
+            mAppSettings.setVisibility(View.GONE);
         }
 
         updateDetailData();
 
-        if (NetworkPolicyManager.isUidValidForPolicy(context, primaryUid)
-                && !getRestrictBackground() && isBandwidthControlEnabled()
-                && hasMobileRadio(context)) {
+        if (UserId.isApp(appId) && !mPolicyManager.getRestrictBackground()
+                && isBandwidthControlEnabled() && hasReadyMobileRadio(context)) {
             setPreferenceTitle(mAppRestrictView, R.string.data_usage_app_restrict_background);
-            if (hasLimitedNetworks()) {
-                setPreferenceSummary(mAppRestrictView,
-                        getString(R.string.data_usage_app_restrict_background_summary));
-            } else {
-                setPreferenceSummary(mAppRestrictView,
-                        getString(R.string.data_usage_app_restrict_background_summary_disabled));
-            }
+            setPreferenceSummary(mAppRestrictView,
+                    getString(R.string.data_usage_app_restrict_background_summary));
 
             mAppRestrictView.setVisibility(View.VISIBLE);
             mAppRestrict.setChecked(getAppRestrictBackground());
@@ -840,48 +879,22 @@
         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);
-        }
+    public void setRestrictBackground(boolean restrictBackground) {
+        mPolicyManager.setRestrictBackground(restrictBackground);
+        mMenuRestrictBackground.setChecked(restrictBackground);
     }
 
     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);
-        }
-
+        final int appId = mCurrentApp.appId;
+        final int uidPolicy = mPolicyManager.getAppPolicy(appId);
         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);
-        }
-
+        final int appId = mCurrentApp.appId;
+        mPolicyManager.setAppPolicy(appId,
+                restrictBackground ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE);
         mAppRestrict.setChecked(restrictBackground);
     }
 
@@ -997,7 +1010,7 @@
     }
 
     private OnCheckedChangeListener mDataEnabledListener = new OnCheckedChangeListener() {
-        /** {@inheritDoc} */
+        @Override
         public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             if (mBinding) return;
 
@@ -1018,7 +1031,7 @@
     };
 
     private View.OnClickListener mDisableAtLimitListener = new View.OnClickListener() {
-        /** {@inheritDoc} */
+        @Override
         public void onClick(View v) {
             final boolean disableAtLimit = !mDisableAtLimit.isChecked();
             if (disableAtLimit) {
@@ -1032,21 +1045,15 @@
     };
 
     private View.OnClickListener mAppRestrictListener = new View.OnClickListener() {
-        /** {@inheritDoc} */
+        @Override
         public void onClick(View v) {
             final boolean restrictBackground = !mAppRestrict.isChecked();
 
             if (restrictBackground) {
-                if (hasLimitedNetworks()) {
-                    // enabling restriction; show confirmation dialog which
-                    // eventually calls setRestrictBackground() once user
-                    // confirms.
-                    ConfirmAppRestrictFragment.show(DataUsageSummary.this);
-                } else {
-                    // no limited networks; show dialog to guide user towards
-                    // setting a network limit. doesn't mutate restrict state.
-                    DeniedRestrictFragment.show(DataUsageSummary.this);
-                }
+                // enabling restriction; show confirmation dialog which
+                // eventually calls setRestrictBackground() once user
+                // confirms.
+                ConfirmAppRestrictFragment.show(DataUsageSummary.this);
             } else {
                 setAppRestrictBackground(false);
             }
@@ -1054,25 +1061,31 @@
     };
 
     private OnClickListener mAppSettingsListener = new OnClickListener() {
-        /** {@inheritDoc} */
+        @Override
         public void onClick(View v) {
+            if (!isAdded()) return;
+
             // TODO: target torwards entire UID instead of just first package
             startActivity(mAppSettingsIntent);
         }
     };
 
     private OnItemClickListener mListListener = new OnItemClickListener() {
-        /** {@inheritDoc} */
+        @Override
         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 = mUidDetailProvider.getUidDetail(app.uids[0], true);
-            AppDetailsFragment.show(DataUsageSummary.this, app.uids, detail.label);
+            final AppItem app = (AppItem) parent.getItemAtPosition(position);
+
+            // TODO: sigh, remove this hack once we understand 6450986
+            if (mUidDetailProvider == null || app == null) return;
+
+            final UidDetail detail = mUidDetailProvider.getUidDetail(app.appId, true);
+            AppDetailsFragment.show(DataUsageSummary.this, app, detail.label);
         }
     };
 
     private OnItemSelectedListener mCycleListener = new OnItemSelectedListener() {
-        /** {@inheritDoc} */
+        @Override
         public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
             final CycleItem cycle = (CycleItem) parent.getItemAtPosition(position);
             if (cycle instanceof CycleChangeItem) {
@@ -1097,7 +1110,7 @@
             }
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void onNothingSelected(AdapterView<?> parent) {
             // ignored
         }
@@ -1154,20 +1167,30 @@
 
         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);
+        final String rangePhrase = formatDateRange(context, start, end);
 
-        mUsageSummary.setText(
-                getString(R.string.data_usage_total_during_range, totalPhrase, rangePhrase));
+        final int summaryRes;
+        if (TAB_MOBILE.equals(mCurrentTab) || TAB_3G.equals(mCurrentApp)
+                || TAB_4G.equals(mCurrentApp)) {
+            summaryRes = R.string.data_usage_total_during_range_mobile;
+        } else {
+            summaryRes = R.string.data_usage_total_during_range;
+        }
+
+        mUsageSummary.setText(getString(summaryRes, totalPhrase, rangePhrase));
+
+        // initial layout is finished above, ensure we have transitions
+        ensureLayoutTransitions();
     }
 
     private final LoaderCallbacks<ChartData> mChartDataCallbacks = new LoaderCallbacks<
             ChartData>() {
-        /** {@inheritDoc} */
+        @Override
         public Loader<ChartData> onCreateLoader(int id, Bundle args) {
-            return new ChartDataLoader(getActivity(), mStatsService, args);
+            return new ChartDataLoader(getActivity(), mStatsSession, args);
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void onLoadFinished(Loader<ChartData> loader, ChartData data) {
             mChartData = data;
             mChart.bindNetworkStats(mChartData.network);
@@ -1183,7 +1206,7 @@
             }
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void onLoaderReset(Loader<ChartData> loader) {
             mChartData = null;
             mChart.bindNetworkStats(null);
@@ -1193,20 +1216,22 @@
 
     private final LoaderCallbacks<NetworkStats> mSummaryCallbacks = new LoaderCallbacks<
             NetworkStats>() {
-        /** {@inheritDoc} */
+        @Override
         public Loader<NetworkStats> onCreateLoader(int id, Bundle args) {
-            return new SummaryForAllUidLoader(getActivity(), mStatsService, args);
+            return new SummaryForAllUidLoader(getActivity(), mStatsSession, args);
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void onLoadFinished(Loader<NetworkStats> loader, NetworkStats data) {
-            mAdapter.bindStats(data);
+            final int[] restrictedAppIds = mPolicyManager.getAppsWithPolicy(
+                    POLICY_REJECT_METERED_BACKGROUND);
+            mAdapter.bindStats(data, restrictedAppIds);
             updateEmptyVisible();
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void onLoaderReset(Loader<NetworkStats> loader) {
-            mAdapter.bindStats(null);
+            mAdapter.bindStats(null, new int[0]);
             updateEmptyVisible();
         }
 
@@ -1216,50 +1241,55 @@
         }
     };
 
+    @Deprecated
     private boolean isMobilePolicySplit() {
         final Context context = getActivity();
-        if (hasMobileRadio(context)) {
-            final String subscriberId = getActiveSubscriberId(context);
-            return mPolicyEditor.isMobilePolicySplit(subscriberId);
+        if (hasReadyMobileRadio(context)) {
+            final TelephonyManager tele = TelephonyManager.from(context);
+            return mPolicyEditor.isMobilePolicySplit(getActiveSubscriberId(context));
         } else {
             return false;
         }
     }
 
+    @Deprecated
     private void setMobilePolicySplit(boolean split) {
-        final String subscriberId = getActiveSubscriberId(getActivity());
-        mPolicyEditor.setMobilePolicySplit(subscriberId, split);
+        final Context context = getActivity();
+        if (hasReadyMobileRadio(context)) {
+            final TelephonyManager tele = TelephonyManager.from(context);
+            mPolicyEditor.setMobilePolicySplit(getActiveSubscriberId(context), split);
+        }
     }
 
     private static String getActiveSubscriberId(Context context) {
-        final TelephonyManager telephony = (TelephonyManager) context.getSystemService(
-                Context.TELEPHONY_SERVICE);
-        return telephony.getSubscriberId();
+        final TelephonyManager tele = TelephonyManager.from(context);
+        final String actualSubscriberId = tele.getSubscriberId();
+        return SystemProperties.get(TEST_SUBSCRIBER_PROP, actualSubscriberId);
     }
 
     private DataUsageChartListener mChartListener = new DataUsageChartListener() {
-        /** {@inheritDoc} */
+        @Override
         public void onInspectRangeChanged() {
             if (LOGD) Log.d(TAG, "onInspectRangeChanged()");
             updateDetailData();
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void onWarningChanged() {
             setPolicyWarningBytes(mChart.getWarningBytes());
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void onLimitChanged() {
             setPolicyLimitBytes(mChart.getLimitBytes());
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void requestWarningEdit() {
             WarningEditorFragment.show(DataUsageSummary.this);
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void requestLimitEdit() {
             LimitEditorFragment.show(DataUsageSummary.this);
         }
@@ -1278,7 +1308,7 @@
         }
 
         public CycleItem(Context context, long start, long end) {
-            this.label = formatDateRange(context, start, end, true);
+            this.label = formatDateRange(context, start, end);
             this.start = start;
             this.end = end;
         }
@@ -1297,7 +1327,7 @@
             return false;
         }
 
-        /** {@inheritDoc} */
+        @Override
         public int compareTo(CycleItem another) {
             return Long.compare(start, another.start);
         }
@@ -1307,14 +1337,13 @@
     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) {
+    public static String formatDateRange(Context context, long start, long end) {
         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();
+            return DateUtils.formatDateRange(context, sFormatter, start, end, flags, null)
+                    .toString();
         }
     }
 
@@ -1377,25 +1406,54 @@
         }
     }
 
-    private static class AppUsageItem implements Comparable<AppUsageItem> {
-        public int[] uids;
+    public static class AppItem implements Comparable<AppItem>, Parcelable {
+        public final int appId;
+        public boolean restricted;
+        public SparseBooleanArray uids = new SparseBooleanArray();
         public long total;
 
-        public AppUsageItem(int uid) {
-            uids = new int[] { uid };
+        public AppItem(int appId) {
+            this.appId = appId;
+        }
+
+        public AppItem(Parcel parcel) {
+            appId = parcel.readInt();
+            uids = parcel.readSparseBooleanArray();
+            total = parcel.readLong();
         }
 
         public void addUid(int uid) {
-            if (contains(uids, uid)) return;
-            final int length = uids.length;
-            uids = Arrays.copyOf(uids, length + 1);
-            uids[length] = uid;
+            uids.put(uid, true);
         }
 
-        /** {@inheritDoc} */
-        public int compareTo(AppUsageItem another) {
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(appId);
+            dest.writeSparseBooleanArray(uids);
+            dest.writeLong(total);
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public int compareTo(AppItem another) {
             return Long.compare(another.total, total);
         }
+
+        public static final Creator<AppItem> CREATOR = new Creator<AppItem>() {
+            @Override
+            public AppItem createFromParcel(Parcel in) {
+                return new AppItem(in);
+            }
+
+            @Override
+            public AppItem[] newArray(int size) {
+                return new AppItem[size];
+            }
+        };
     }
 
     /**
@@ -1405,7 +1463,7 @@
         private final UidDetailProvider mProvider;
         private final int mInsetSide;
 
-        private ArrayList<AppUsageItem> mItems = Lists.newArrayList();
+        private ArrayList<AppItem> mItems = Lists.newArrayList();
         private long mLargest;
 
         public DataUsageAdapter(UidDetailProvider provider, int insetSide) {
@@ -1416,35 +1474,45 @@
         /**
          * Bind the given {@link NetworkStats}, or {@code null} to clear list.
          */
-        public void bindStats(NetworkStats stats) {
+        public void bindStats(NetworkStats stats, int[] restrictedAppIds) {
             mItems.clear();
 
-            final AppUsageItem systemItem = new AppUsageItem(android.os.Process.SYSTEM_UID);
-            final SparseArray<AppUsageItem> knownUids = new SparseArray<AppUsageItem>();
+            final AppItem systemItem = new AppItem(android.os.Process.SYSTEM_UID);
+            final SparseArray<AppItem> knownUids = new SparseArray<AppItem>();
 
             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 == UID_REMOVED || uid == UID_TETHERING) {
-                    AppUsageItem item = knownUids.get(uid);
+                final boolean isApp = UserId.isApp(entry.uid);
+                final int appId = isApp ? UserId.getAppId(entry.uid) : entry.uid;
+                if (isApp || appId == UID_REMOVED || appId == UID_TETHERING) {
+                    AppItem item = knownUids.get(appId);
                     if (item == null) {
-                        item = new AppUsageItem(uid);
-                        knownUids.put(uid, item);
+                        item = new AppItem(appId);
+                        knownUids.put(appId, item);
                         mItems.add(item);
                     }
 
                     item.total += entry.rxBytes + entry.txBytes;
+                    item.addUid(entry.uid);
                 } else {
                     systemItem.total += entry.rxBytes + entry.txBytes;
-                    systemItem.addUid(uid);
+                    systemItem.addUid(entry.uid);
                 }
             }
 
+            for (int appId : restrictedAppIds) {
+                AppItem item = knownUids.get(appId);
+                if (item == null) {
+                    item = new AppItem(appId);
+                    item.total = -1;
+                    mItems.add(item);
+                }
+                item.restricted = true;
+            }
+
             if (systemItem.total > 0) {
                 mItems.add(systemItem);
             }
@@ -1466,7 +1534,7 @@
 
         @Override
         public long getItemId(int position) {
-            return mItems.get(position).uids[0];
+            return mItems.get(position).appId;
         }
 
         @Override
@@ -1487,10 +1555,16 @@
                     android.R.id.progress);
 
             // kick off async load of app details
-            final AppUsageItem item = mItems.get(position);
+            final AppItem item = mItems.get(position);
             UidDetailTask.bindView(mProvider, item, convertView);
 
-            text1.setText(Formatter.formatFileSize(context, item.total));
+            if (item.restricted && item.total <= 0) {
+                text1.setText(R.string.data_usage_app_restricted);
+                progress.setVisibility(View.GONE);
+            } else {
+                text1.setText(Formatter.formatFileSize(context, item.total));
+                progress.setVisibility(View.VISIBLE);
+            }
 
             final int percentTotal = mLargest != 0 ? (int) (item.total * 100 / mLargest) : 0;
             progress.setProgress(percentTotal);
@@ -1504,13 +1578,13 @@
      * {@link DataUsageSummary}.
      */
     public static class AppDetailsFragment extends Fragment {
-        private static final String EXTRA_UIDS = "uids";
+        private static final String EXTRA_APP = "app";
 
-        public static void show(DataUsageSummary parent, int[] uids, CharSequence label) {
+        public static void show(DataUsageSummary parent, AppItem app, CharSequence label) {
             if (!parent.isAdded()) return;
 
             final Bundle args = new Bundle();
-            args.putIntArray(EXTRA_UIDS, uids);
+            args.putParcelable(EXTRA_APP, app);
 
             final AppDetailsFragment fragment = new AppDetailsFragment();
             fragment.setArguments(args);
@@ -1519,14 +1593,14 @@
             ft.add(fragment, TAG_APP_DETAILS);
             ft.addToBackStack(TAG_APP_DETAILS);
             ft.setBreadCrumbTitle(label);
-            ft.commit();
+            ft.commitAllowingStateLoss();
         }
 
         @Override
         public void onStart() {
             super.onStart();
             final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
-            target.mAppDetailUids = getArguments().getIntArray(EXTRA_UIDS);
+            target.mCurrentApp = getArguments().getParcelable(EXTRA_APP);
             target.updateBody();
         }
 
@@ -1534,7 +1608,7 @@
         public void onStop() {
             super.onStop();
             final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
-            target.mAppDetailUids = null;
+            target.mCurrentApp = null;
             target.updateBody();
         }
     }
@@ -1552,22 +1626,21 @@
 
             final Resources res = parent.getResources();
             final CharSequence message;
+            final long minLimitBytes = (long) (
+                    parent.mPolicyEditor.getPolicy(parent.mTemplate).warningBytes * 1.2f);
             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;
+                message = res.getString(R.string.data_usage_limit_dialog_mobile);
+                limitBytes = Math.max(5 * GB_IN_BYTES, minLimitBytes);
             } else if (TAB_4G.equals(currentTab)) {
-                message = buildDialogMessage(res, R.string.data_usage_tab_4g);
-                limitBytes = 5 * GB_IN_BYTES;
+                message = res.getString(R.string.data_usage_limit_dialog_mobile);
+                limitBytes = Math.max(5 * GB_IN_BYTES, minLimitBytes);
             } 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;
+                message = res.getString(R.string.data_usage_limit_dialog_mobile);
+                limitBytes = Math.max(5 * GB_IN_BYTES, minLimitBytes);
             } else {
                 throw new IllegalArgumentException("unknown current tab: " + currentTab);
             }
@@ -1582,10 +1655,6 @@
             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();
@@ -1598,6 +1667,7 @@
             builder.setMessage(message);
 
             builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
                     if (target != null) {
@@ -1653,9 +1723,11 @@
 
             builder.setPositiveButton(R.string.data_usage_cycle_editor_positive,
                     new DialogInterface.OnClickListener() {
+                        @Override
                         public void onClick(DialogInterface dialog, int which) {
                             final int cycleDay = cycleDayPicker.getValue();
-                            editor.setPolicyCycleDay(template, cycleDay);
+                            final String cycleTimezone = new Time().timezone;
+                            editor.setPolicyCycleDay(template, cycleDay, cycleTimezone);
                             target.updatePolicy(true);
                         }
                     });
@@ -1712,6 +1784,7 @@
 
             builder.setPositiveButton(R.string.data_usage_cycle_editor_positive,
                     new DialogInterface.OnClickListener() {
+                        @Override
                         public void onClick(DialogInterface dialog, int which) {
                             // clear focus to finish pending text edits
                             bytesPicker.clearFocus();
@@ -1774,6 +1847,7 @@
 
             builder.setPositiveButton(R.string.data_usage_cycle_editor_positive,
                     new DialogInterface.OnClickListener() {
+                        @Override
                         public void onClick(DialogInterface dialog, int which) {
                             // clear focus to finish pending text edits
                             bytesPicker.clearFocus();
@@ -1807,6 +1881,7 @@
             builder.setMessage(R.string.data_usage_disable_mobile);
 
             builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
                     if (target != null) {
@@ -1823,7 +1898,7 @@
 
     /**
      * Dialog to request user confirmation before setting
-     * {@link Settings.Secure#DATA_ROAMING}.
+     * {@link android.provider.Settings.Secure#DATA_ROAMING}.
      */
     public static class ConfirmDataRoamingFragment extends DialogFragment {
         public static void show(DataUsageSummary parent) {
@@ -1843,6 +1918,7 @@
             builder.setMessage(R.string.roaming_warning);
 
             builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
                     if (target != null) {
@@ -1878,6 +1954,7 @@
             builder.setMessage(getString(R.string.data_usage_restrict_background));
 
             builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
                     if (target != null) {
@@ -1940,6 +2017,7 @@
             builder.setMessage(R.string.data_usage_app_restrict_dialog);
 
             builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
                     if (target != null) {
@@ -1954,6 +2032,56 @@
     }
 
     /**
+     * Dialog to inform user about changing auto-sync setting
+     */
+    public static class ConfirmAutoSyncChangeFragment extends DialogFragment {
+        private static final String SAVE_ENABLING = "enabling";
+        private boolean mEnabling;
+
+        public static void show(DataUsageSummary parent, boolean enabling) {
+            if (!parent.isAdded()) return;
+
+            final ConfirmAutoSyncChangeFragment dialog = new ConfirmAutoSyncChangeFragment();
+            dialog.mEnabling = enabling;
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_AUTO_SYNC_CHANGE);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+            if (savedInstanceState != null) {
+                mEnabling = savedInstanceState.getBoolean(SAVE_ENABLING);
+            }
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            if (!mEnabling) {
+                builder.setTitle(R.string.data_usage_auto_sync_off_dialog_title);
+                builder.setMessage(R.string.data_usage_auto_sync_off_dialog);
+            } else {
+                builder.setTitle(R.string.data_usage_auto_sync_on_dialog_title);
+                builder.setMessage(R.string.data_usage_auto_sync_on_dialog);
+            }
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    ContentResolver.setMasterSyncAutomatically(mEnabling);
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            return builder.create();
+        }
+
+        @Override
+        public void onSaveInstanceState(Bundle outState) {
+            super.onSaveInstanceState(outState);
+            outState.putBoolean(SAVE_ENABLING, mEnabling);
+        }
+    }
+
+    /**
      * Compute default tab that should be selected, based on
      * {@link NetworkPolicyManager#EXTRA_NETWORK_TEMPLATE} extra.
      */
@@ -1981,23 +2109,23 @@
      */
     private static class UidDetailTask extends AsyncTask<Void, Void, UidDetail> {
         private final UidDetailProvider mProvider;
-        private final AppUsageItem mItem;
+        private final AppItem mItem;
         private final View mTarget;
 
-        private UidDetailTask(UidDetailProvider provider, AppUsageItem item, View target) {
+        private UidDetailTask(UidDetailProvider provider, AppItem item, View target) {
             mProvider = checkNotNull(provider);
             mItem = checkNotNull(item);
             mTarget = checkNotNull(target);
         }
 
         public static void bindView(
-                UidDetailProvider provider, AppUsageItem item, View target) {
+                UidDetailProvider provider, AppItem item, View target) {
             final UidDetailTask existing = (UidDetailTask) target.getTag();
             if (existing != null) {
                 existing.cancel(false);
             }
 
-            final UidDetail cachedDetail = provider.getUidDetail(item.uids[0], false);
+            final UidDetail cachedDetail = provider.getUidDetail(item.appId, false);
             if (cachedDetail != null) {
                 bindView(cachedDetail, target);
             } else {
@@ -2026,7 +2154,7 @@
 
         @Override
         protected UidDetail doInBackground(Void... params) {
-            return mProvider.getUidDetail(mItem.uids[0], true);
+            return mProvider.getUidDetail(mItem.appId, true);
         }
 
         @Override
@@ -2036,22 +2164,24 @@
     }
 
     /**
-     * Test if device has a mobile data radio.
+     * Test if device has a mobile data radio with SIM in ready state.
      */
-    private static boolean hasMobileRadio(Context context) {
+    public static boolean hasReadyMobileRadio(Context context) {
         if (TEST_RADIOS) {
             return SystemProperties.get(TEST_RADIOS_PROP).contains("mobile");
         }
 
-        final ConnectivityManager conn = (ConnectivityManager) context.getSystemService(
-                Context.CONNECTIVITY_SERVICE);
-        return conn.isNetworkSupported(TYPE_MOBILE);
+        final ConnectivityManager conn = ConnectivityManager.from(context);
+        final TelephonyManager tele = TelephonyManager.from(context);
+
+        // require both supported network and ready SIM
+        return conn.isNetworkSupported(TYPE_MOBILE) && tele.getSimState() == SIM_STATE_READY;
     }
 
     /**
      * Test if device has a mobile 4G data radio.
      */
-    private static boolean hasMobile4gRadio(Context context) {
+    public static boolean hasReadyMobile4gRadio(Context context) {
         if (!NetworkPolicyEditor.ENABLE_SPLIT_POLICIES) {
             return false;
         }
@@ -2059,40 +2189,53 @@
             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);
+        final ConnectivityManager conn = ConnectivityManager.from(context);
+        final TelephonyManager tele = TelephonyManager.from(context);
 
         final boolean hasWimax = conn.isNetworkSupported(TYPE_WIMAX);
-        final boolean hasLte = telephony.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE;
+        final boolean hasLte = (tele.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE)
+                && hasReadyMobileRadio(context);
         return hasWimax || hasLte;
     }
 
     /**
      * Test if device has a Wi-Fi data radio.
      */
-    private static boolean hasWifiRadio(Context context) {
+    public static boolean hasWifiRadio(Context context) {
         if (TEST_RADIOS) {
             return SystemProperties.get(TEST_RADIOS_PROP).contains("wifi");
         }
 
-        final ConnectivityManager conn = (ConnectivityManager) context.getSystemService(
-                Context.CONNECTIVITY_SERVICE);
+        final ConnectivityManager conn = ConnectivityManager.from(context);
         return conn.isNetworkSupported(TYPE_WIFI);
     }
 
     /**
      * Test if device has an ethernet network connection.
      */
-    private static boolean hasEthernet(Context context) {
+    public 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.isNetworkSupported(TYPE_ETHERNET);
+        final ConnectivityManager conn = ConnectivityManager.from(context);
+        final boolean hasEthernet = conn.isNetworkSupported(TYPE_ETHERNET);
+
+        final long ethernetBytes;
+        if (mStatsSession != null) {
+            try {
+                ethernetBytes = mStatsSession.getSummaryForNetwork(
+                        NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
+                        .getTotalBytes();
+            } catch (RemoteException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            ethernetBytes = 0;
+        }
+
+        // only show ethernet when both hardware present and traffic has occurred
+        return hasEthernet && ethernetBytes > 0;
     }
 
     /**
@@ -2126,6 +2269,7 @@
      * Build string describing currently limited networks, which defines when
      * background data is restricted.
      */
+    @Deprecated
     private CharSequence buildLimitedNetworksString() {
         final List<CharSequence> limited = buildLimitedNetworksList();
 
@@ -2141,22 +2285,28 @@
      * Build list of currently limited networks, which defines when background
      * data is restricted.
      */
+    @Deprecated
     private List<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));
+
+        final TelephonyManager tele = TelephonyManager.from(context);
+        if (tele.getSimState() == SIM_STATE_READY) {
+            final String subscriberId = getActiveSubscriberId(context);
+            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(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())) {
+
+        if (mPolicyEditor.hasLimitedPolicy(buildTemplateWifiWildcard())) {
             limited.add(getText(R.string.data_usage_tab_wifi));
         }
         if (mPolicyEditor.hasLimitedPolicy(buildTemplateEthernet())) {
@@ -2202,13 +2352,4 @@
         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/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 2ffae19..29c58ab 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -16,16 +16,24 @@
 
 package com.android.settings;
 
+import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
+
+import android.app.ActionBar;
+import android.app.Activity;
 import android.app.ActivityManagerNative;
+import android.app.ActivityThread;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.DialogFragment;
 import android.app.backup.IBackupManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.VerifierDeviceIdentity;
+import android.os.AsyncTask;
 import android.os.BatteryManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -35,41 +43,58 @@
 import android.os.ServiceManager;
 import android.os.StrictMode;
 import android.os.SystemProperties;
+import android.os.Trace;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
+import android.preference.MultiCheckPreference;
 import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
-import android.preference.Preference.OnPreferenceChangeListener;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.HardwareRenderer;
 import android.view.IWindowManager;
+import android.view.View;
+import android.widget.CompoundButton;
+import android.widget.Switch;
+
+import java.util.ArrayList;
 
 /*
  * Displays preferences for application developers.
  */
 public class DevelopmentSettings extends PreferenceFragment
         implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
-                OnPreferenceChangeListener {
+                OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {
 
     private static final String ENABLE_ADB = "enable_adb";
-
-    private static final String VERIFIER_DEVICE_IDENTIFIER = "verifier_device_identifier";
     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 ENFORCE_READ_EXTERNAL = "enforce_read_external";
     private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
     private static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
 
+    private static final String DEBUG_APP_KEY = "debug_app";
+    private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
     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 DISABLE_OVERLAYS_KEY = "disable_overlays";
     private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";
     private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
+    private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
+    private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
+    private static final String DEBUG_LAYOUT_KEY = "debug_layout";
     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 ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
+
+    private static final String ENABLE_TRACES_KEY = "enable_traces";
 
     private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
             = "immediately_destroy_activities";
@@ -77,32 +102,56 @@
 
     private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
 
+    private static final String TAG_CONFIRM_ENFORCE = "confirm_enforce";
+
+    private static final int RESULT_DEBUG_APP = 1000;
+
     private IWindowManager mWindowManager;
     private IBackupManager mBackupManager;
 
+    private Switch mEnabledSwitch;
+    private boolean mLastEnabledState;
+    private boolean mHaveDebugSettings;
+    private boolean mDontPokeProperties;
+
     private CheckBoxPreference mEnableAdb;
     private CheckBoxPreference mKeepScreenOn;
+    private CheckBoxPreference mEnforceReadExternal;
     private CheckBoxPreference mAllowMockLocation;
     private PreferenceScreen mPassword;
 
+    private String mDebugApp;
+    private Preference mDebugAppPref;
+    private CheckBoxPreference mWaitForDebugger;
+
     private CheckBoxPreference mStrictMode;
     private CheckBoxPreference mPointerLocation;
     private CheckBoxPreference mShowTouches;
     private CheckBoxPreference mShowScreenUpdates;
+    private CheckBoxPreference mDisableOverlays;
     private CheckBoxPreference mShowCpuUsage;
     private CheckBoxPreference mForceHardwareUi;
+    private CheckBoxPreference mTrackFrameTime;
+    private CheckBoxPreference mShowHwScreenUpdates;
+    private CheckBoxPreference mDebugLayout;
     private ListPreference mWindowAnimationScale;
     private ListPreference mTransitionAnimationScale;
+    private ListPreference mAnimatorDurationScale;
+    private MultiCheckPreference mEnableTracesPref;
 
     private CheckBoxPreference mImmediatelyDestroyActivities;
     private ListPreference mAppProcessLimit;
 
     private CheckBoxPreference mShowAllANRs;
 
-    // To track whether Yes was clicked in the adb warning dialog
-    private boolean mOkClicked;
+    private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
+    private final ArrayList<CheckBoxPreference> mResetCbPrefs
+            = new ArrayList<CheckBoxPreference>();
 
-    private Dialog mOkDialog;
+    // To track whether a confirmation dialog was clicked.
+    private boolean mDialogClicked;
+    private Dialog mEnableDialog;
+    private Dialog mAdbDialog;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -114,75 +163,204 @@
 
         addPreferencesFromResource(R.xml.development_prefs);
 
-        mEnableAdb = (CheckBoxPreference) findPreference(ENABLE_ADB);
-        mKeepScreenOn = (CheckBoxPreference) findPreference(KEEP_SCREEN_ON);
-        mAllowMockLocation = (CheckBoxPreference) findPreference(ALLOW_MOCK_LOCATION);
+        mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
+        mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON);
+        mEnforceReadExternal = findAndInitCheckboxPref(ENFORCE_READ_EXTERNAL);
+        mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION);
         mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD);
+        mAllPrefs.add(mPassword);
 
-        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);
-        mForceHardwareUi = (CheckBoxPreference) findPreference(FORCE_HARDWARE_UI_KEY);
+        mDebugAppPref = findPreference(DEBUG_APP_KEY);
+        mAllPrefs.add(mDebugAppPref);
+        mWaitForDebugger = findAndInitCheckboxPref(WAIT_FOR_DEBUGGER_KEY);
+        mStrictMode = findAndInitCheckboxPref(STRICT_MODE_KEY);
+        mPointerLocation = findAndInitCheckboxPref(POINTER_LOCATION_KEY);
+        mShowTouches = findAndInitCheckboxPref(SHOW_TOUCHES_KEY);
+        mShowScreenUpdates = findAndInitCheckboxPref(SHOW_SCREEN_UPDATES_KEY);
+        mDisableOverlays = findAndInitCheckboxPref(DISABLE_OVERLAYS_KEY);
+        mShowCpuUsage = findAndInitCheckboxPref(SHOW_CPU_USAGE_KEY);
+        mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY);
+        mTrackFrameTime = findAndInitCheckboxPref(TRACK_FRAME_TIME_KEY);
+        mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY);
+        mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY);
         mWindowAnimationScale = (ListPreference) findPreference(WINDOW_ANIMATION_SCALE_KEY);
+        mAllPrefs.add(mWindowAnimationScale);
         mWindowAnimationScale.setOnPreferenceChangeListener(this);
         mTransitionAnimationScale = (ListPreference) findPreference(TRANSITION_ANIMATION_SCALE_KEY);
+        mAllPrefs.add(mTransitionAnimationScale);
         mTransitionAnimationScale.setOnPreferenceChangeListener(this);
+        mAnimatorDurationScale = (ListPreference) findPreference(ANIMATOR_DURATION_SCALE_KEY);
+        mAllPrefs.add(mAnimatorDurationScale);
+        mAnimatorDurationScale.setOnPreferenceChangeListener(this);
+        mEnableTracesPref = (MultiCheckPreference)findPreference(ENABLE_TRACES_KEY);
+        String[] traceValues = new String[Trace.TRACE_TAGS.length];
+        for (int i=Trace.TRACE_FLAGS_START_BIT; i<traceValues.length; i++) {
+            traceValues[i] = Integer.toString(1<<i);
+        }
+        mEnableTracesPref.setEntries(Trace.TRACE_TAGS);
+        mEnableTracesPref.setEntryValues(traceValues);
+        mAllPrefs.add(mEnableTracesPref);
+        mEnableTracesPref.setOnPreferenceChangeListener(this);
 
         mImmediatelyDestroyActivities = (CheckBoxPreference) findPreference(
                 IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
+        mAllPrefs.add(mImmediatelyDestroyActivities);
+        mResetCbPrefs.add(mImmediatelyDestroyActivities);
         mAppProcessLimit = (ListPreference) findPreference(APP_PROCESS_LIMIT_KEY);
+        mAllPrefs.add(mAppProcessLimit);
         mAppProcessLimit.setOnPreferenceChangeListener(this);
 
         mShowAllANRs = (CheckBoxPreference) findPreference(
                 SHOW_ALL_ANRS_KEY);
+        mAllPrefs.add(mShowAllANRs);
+        mResetCbPrefs.add(mShowAllANRs);
 
-        final Preference verifierDeviceIdentifier = findPreference(VERIFIER_DEVICE_IDENTIFIER);
-        final PackageManager pm = getActivity().getPackageManager();
-        final VerifierDeviceIdentity verifierIndentity = pm.getVerifierDeviceIdentity();
-        if (verifierIndentity != null) {
-            verifierDeviceIdentifier.setSummary(verifierIndentity.toString());
+        Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
+        if (hdcpChecking != null) {
+            mAllPrefs.add(hdcpChecking);
         }
-
         removeHdcpOptionsForProduction();
     }
 
+    private CheckBoxPreference findAndInitCheckboxPref(String key) {
+        CheckBoxPreference pref = (CheckBoxPreference) findPreference(key);
+        if (pref == null) {
+            throw new IllegalArgumentException("Cannot find preference with key = " + key);
+        }
+        mAllPrefs.add(pref);
+        mResetCbPrefs.add(pref);
+        return pref;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final Activity activity = getActivity();
+        mEnabledSwitch = new Switch(activity);
+
+        final int padding = activity.getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        mEnabledSwitch.setPadding(0, 0, padding, 0);
+        mEnabledSwitch.setOnCheckedChangeListener(this);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        final Activity activity = getActivity();
+        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(mEnabledSwitch, new ActionBar.LayoutParams(
+                ActionBar.LayoutParams.WRAP_CONTENT,
+                ActionBar.LayoutParams.WRAP_CONTENT,
+                Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        final Activity activity = getActivity();
+        activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(null);
+    }
+
     private void removeHdcpOptionsForProduction() {
         if ("user".equals(Build.TYPE)) {
             Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
             if (hdcpChecking != null) {
                 // Remove the preference
                 getPreferenceScreen().removePreference(hdcpChecking);
+                mAllPrefs.remove(hdcpChecking);
             }
         }
     }
 
+    private void setPrefsEnabledState(boolean enabled) {
+        for (int i = 0; i < mAllPrefs.size(); i++) {
+            mAllPrefs.get(i).setEnabled(enabled);
+        }
+        updateAllOptions();
+    }
+
     @Override
     public void onResume() {
         super.onResume();
 
         final ContentResolver cr = getActivity().getContentResolver();
-        mEnableAdb.setChecked(Settings.Secure.getInt(cr,
+        mLastEnabledState = Settings.Secure.getInt(cr,
+                Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+        mEnabledSwitch.setChecked(mLastEnabledState);
+        setPrefsEnabledState(mLastEnabledState);
+
+        if (mHaveDebugSettings && !mLastEnabledState) {
+            // Overall debugging is disabled, but there are some debug
+            // settings that are enabled.  This is an invalid state.  Switch
+            // to debug settings being enabled, so the user knows there is
+            // stuff enabled and can turn it all off if they want.
+            Settings.Secure.putInt(getActivity().getContentResolver(),
+                    Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 1);
+            mLastEnabledState = true;
+            setPrefsEnabledState(mLastEnabledState);
+        }
+    }
+
+    void updateCheckBox(CheckBoxPreference checkBox, boolean value) {
+        checkBox.setChecked(value);
+        mHaveDebugSettings |= value;
+    }
+
+    private void updateAllOptions() {
+        final Context context = getActivity();
+        final ContentResolver cr = context.getContentResolver();
+        mHaveDebugSettings = false;
+        updateCheckBox(mEnableAdb, Settings.Secure.getInt(cr,
                 Settings.Secure.ADB_ENABLED, 0) != 0);
-        mKeepScreenOn.setChecked(Settings.System.getInt(cr,
+        updateCheckBox(mKeepScreenOn, Settings.System.getInt(cr,
                 Settings.System.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
-        mAllowMockLocation.setChecked(Settings.Secure.getInt(cr,
+        updateCheckBox(mEnforceReadExternal, isPermissionEnforced(context, READ_EXTERNAL_STORAGE));
+        updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
                 Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
         updateHdcpValues();
         updatePasswordSummary();
+        updateDebuggerOptions();
         updateStrictModeVisualOptions();
         updatePointerLocationOptions();
         updateShowTouchesOptions();
         updateFlingerOptions();
         updateCpuUsageOptions();
         updateHardwareUiOptions();
+        updateTrackFrameTimeOptions();
+        updateShowHwScreenUpdatesOptions();
+        updateDebugLayoutOptions();
         updateAnimationScaleOptions();
+        updateEnableTracesOptions();
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
         updateShowAllANRsOptions();
     }
 
+    private void resetDangerousOptions() {
+        mDontPokeProperties = true;
+        for (int i=0; i<mResetCbPrefs.size(); i++) {
+            CheckBoxPreference cb = mResetCbPrefs.get(i);
+            if (cb.isChecked()) {
+                cb.setChecked(false);
+                onPreferenceTreeClick(null, cb);
+            }
+        }
+        resetDebuggerOptions();
+        writeAnimationScaleOption(0, mWindowAnimationScale, null);
+        writeAnimationScaleOption(1, mTransitionAnimationScale, null);
+        writeAnimationScaleOption(2, mAnimatorDurationScale, null);
+        writeEnableTracesOptions(0);
+        writeAppProcessLimitOptions(null);
+        mHaveDebugSettings = false;
+        updateAllOptions();
+        mDontPokeProperties = false;
+        pokeSystemProperties();
+    }
+
     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);
@@ -214,12 +392,52 @@
         }
     }
 
+    private void writeDebuggerOptions() {
+        try {
+            ActivityManagerNative.getDefault().setDebugApp(
+                mDebugApp, mWaitForDebugger.isChecked(), true);
+        } catch (RemoteException ex) {
+        }
+    }
+
+    private static void resetDebuggerOptions() {
+        try {
+            ActivityManagerNative.getDefault().setDebugApp(
+                    null, false, true);
+        } catch (RemoteException ex) {
+        }
+    }
+
+    private void updateDebuggerOptions() {
+        mDebugApp = Settings.System.getString(
+                getActivity().getContentResolver(), Settings.System.DEBUG_APP);
+        updateCheckBox(mWaitForDebugger, Settings.System.getInt(
+                getActivity().getContentResolver(), Settings.System.WAIT_FOR_DEBUGGER, 0) != 0);
+        if (mDebugApp != null && mDebugApp.length() > 0) {
+            String label;
+            try {
+                ApplicationInfo ai = getActivity().getPackageManager().getApplicationInfo(mDebugApp,
+                        PackageManager.GET_DISABLED_COMPONENTS);
+                CharSequence lab = getActivity().getPackageManager().getApplicationLabel(ai);
+                label = lab != null ? lab.toString() : mDebugApp;
+            } catch (PackageManager.NameNotFoundException e) {
+                label = mDebugApp;
+            }
+            mDebugAppPref.setSummary(getResources().getString(R.string.debug_app_set, label));
+            mWaitForDebugger.setEnabled(true);
+            mHaveDebugSettings = true;
+        } else {
+            mDebugAppPref.setSummary(getResources().getString(R.string.debug_app_not_set));
+            mWaitForDebugger.setEnabled(false);
+        }
+    }
+
     // 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() {
+    private static int currentStrictModeActiveIndex() {
         if (TextUtils.isEmpty(SystemProperties.get(StrictMode.VISUAL_PROPERTY))) {
             return 0;
         }
@@ -236,7 +454,7 @@
     }
 
     private void updateStrictModeVisualOptions() {
-        mStrictMode.setChecked(currentStrictModeActiveIndex() == 1);
+        updateCheckBox(mStrictMode, currentStrictModeActiveIndex() == 1);
     }
 
     private void writePointerLocationOptions() {
@@ -245,7 +463,7 @@
     }
 
     private void updatePointerLocationOptions() {
-        mPointerLocation.setChecked(Settings.System.getInt(getActivity().getContentResolver(),
+        updateCheckBox(mPointerLocation, Settings.System.getInt(getActivity().getContentResolver(),
                 Settings.System.POINTER_LOCATION, 0) != 0);
     }
 
@@ -255,7 +473,7 @@
     }
 
     private void updateShowTouchesOptions() {
-        mShowTouches.setChecked(Settings.System.getInt(getActivity().getContentResolver(),
+        updateCheckBox(mShowTouches, Settings.System.getInt(getActivity().getContentResolver(),
                 Settings.System.SHOW_TOUCHES, 0) != 0);
     }
 
@@ -273,9 +491,11 @@
                 @SuppressWarnings("unused")
                 int enableGL = reply.readInt();
                 int showUpdates = reply.readInt();
-                mShowScreenUpdates.setChecked(showUpdates != 0);
+                updateCheckBox(mShowScreenUpdates, showUpdates != 0);
                 @SuppressWarnings("unused")
                 int showBackground = reply.readInt();
+                int disableOverlays = reply.readInt();
+                updateCheckBox(mDisableOverlays, disableOverlays != 0);
                 reply.recycle();
                 data.recycle();
             }
@@ -283,13 +503,14 @@
         }
     }
 
-    private void writeFlingerOptions() {
+    private void writeShowUpdatesOption() {
         try {
             IBinder flinger = ServiceManager.getService("SurfaceFlinger");
             if (flinger != null) {
                 Parcel data = Parcel.obtain();
                 data.writeInterfaceToken("android.ui.ISurfaceComposer");
-                data.writeInt(mShowScreenUpdates.isChecked() ? 1 : 0);
+                final int showUpdates = mShowScreenUpdates.isChecked() ? 1 : 0; 
+                data.writeInt(showUpdates);
                 flinger.transact(1002, data, null, 0);
                 data.recycle();
 
@@ -299,16 +520,67 @@
         }
     }
 
+    private void writeDisableOverlaysOption() {
+        try {
+            IBinder flinger = ServiceManager.getService("SurfaceFlinger");
+            if (flinger != null) {
+                Parcel data = Parcel.obtain();
+                data.writeInterfaceToken("android.ui.ISurfaceComposer");
+                final int disableOverlays = mDisableOverlays.isChecked() ? 1 : 0; 
+                data.writeInt(disableOverlays);
+                flinger.transact(1008, data, null, 0);
+                data.recycle();
+
+                updateFlingerOptions();
+            }
+        } catch (RemoteException ex) {
+        }
+    }
+
     private void updateHardwareUiOptions() {
-        mForceHardwareUi.setChecked(SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false));
+        updateCheckBox(mForceHardwareUi, SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false));
     }
     
     private void writeHardwareUiOptions() {
         SystemProperties.set(HARDWARE_UI_PROPERTY, mForceHardwareUi.isChecked() ? "true" : "false");
+        pokeSystemProperties();
+    }
+
+    private void updateTrackFrameTimeOptions() {
+        updateCheckBox(mTrackFrameTime,
+                SystemProperties.getBoolean(HardwareRenderer.PROFILE_PROPERTY, false));
+    }
+
+    private void writeTrackFrameTimeOptions() {
+        SystemProperties.set(HardwareRenderer.PROFILE_PROPERTY,
+                mTrackFrameTime.isChecked() ? "true" : "false");
+        pokeSystemProperties();
+    }
+
+    private void updateShowHwScreenUpdatesOptions() {
+        updateCheckBox(mShowHwScreenUpdates,
+                SystemProperties.getBoolean(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false));
+    }
+
+    private void writeShowHwScreenUpdatesOptions() {
+        SystemProperties.set(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
+                mShowHwScreenUpdates.isChecked() ? "true" : "false");
+        pokeSystemProperties();
+    }
+
+    private void updateDebugLayoutOptions() {
+        updateCheckBox(mDebugLayout,
+                SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false));
+    }
+
+    private void writeDebugLayoutOptions() {
+        SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
+                mDebugLayout.isChecked() ? "true" : "false");
+        pokeSystemProperties();
     }
 
     private void updateCpuUsageOptions() {
-        mShowCpuUsage.setChecked(Settings.System.getInt(getActivity().getContentResolver(),
+        updateCheckBox(mShowCpuUsage, Settings.System.getInt(getActivity().getContentResolver(),
                 Settings.System.SHOW_PROCESSES, 0) != 0);
     }
     
@@ -334,13 +606,16 @@
     }
 
     private void updateImmediatelyDestroyActivitiesOptions() {
-        mImmediatelyDestroyActivities.setChecked(Settings.System.getInt(
+        updateCheckBox(mImmediatelyDestroyActivities, 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);
+            if (scale != 1) {
+                mHaveDebugSettings = true;
+            }
             CharSequence[] values = pref.getEntryValues();
             for (int i=0; i<values.length; i++) {
                 float val = Float.parseFloat(values[i].toString());
@@ -359,11 +634,12 @@
     private void updateAnimationScaleOptions() {
         updateAnimationScaleValue(0, mWindowAnimationScale);
         updateAnimationScaleValue(1, mTransitionAnimationScale);
+        updateAnimationScaleValue(2, mAnimatorDurationScale);
     }
 
     private void writeAnimationScaleOption(int which, ListPreference pref, Object newValue) {
         try {
-            float scale = Float.parseFloat(newValue.toString());
+            float scale = newValue != null ? Float.parseFloat(newValue.toString()) : 1;
             mWindowManager.setAnimationScale(which, scale);
             updateAnimationScaleValue(which, pref);
         } catch (RemoteException e) {
@@ -377,6 +653,9 @@
             for (int i=0; i<values.length; i++) {
                 int val = Integer.parseInt(values[i].toString());
                 if (val >= limit) {
+                    if (i != 0) {
+                        mHaveDebugSettings = true;
+                    }
                     mAppProcessLimit.setValueIndex(i);
                     mAppProcessLimit.setSummary(mAppProcessLimit.getEntries()[i]);
                     return;
@@ -390,7 +669,7 @@
 
     private void writeAppProcessLimitOptions(Object newValue) {
         try {
-            int limit = Integer.parseInt(newValue.toString());
+            int limit = newValue != null ? Integer.parseInt(newValue.toString()) : -1;
             ActivityManagerNative.getDefault().setProcessLimit(limit);
             updateAppProcessLimitOptions();
         } catch (RemoteException e) {
@@ -404,10 +683,92 @@
     }
 
     private void updateShowAllANRsOptions() {
-        mShowAllANRs.setChecked(Settings.Secure.getInt(
+        updateCheckBox(mShowAllANRs, Settings.Secure.getInt(
             getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
     }
 
+    private void updateEnableTracesOptions() {
+        String strValue = SystemProperties.get(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS);
+        long flags = SystemProperties.getLong(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS, 0);
+        String[] values = mEnableTracesPref.getEntryValues();
+        int numSet = 0;
+        for (int i=Trace.TRACE_FLAGS_START_BIT; i<values.length; i++) {
+            boolean set = (flags&(1<<i)) != 0;
+            mEnableTracesPref.setValue(i-Trace.TRACE_FLAGS_START_BIT, set);
+            if (set) {
+                numSet++;
+            }
+        }
+        if (numSet == 0) {
+            mEnableTracesPref.setSummary(R.string.enable_traces_summary_none);
+        } else if (numSet == values.length) {
+            mHaveDebugSettings = true;
+            mEnableTracesPref.setSummary(R.string.enable_traces_summary_all);
+        } else {
+            mHaveDebugSettings = true;
+            mEnableTracesPref.setSummary(getString(R.string.enable_traces_summary_num, numSet));
+        }
+    }
+
+    private void writeEnableTracesOptions() {
+        long value = 0;
+        String[] values = mEnableTracesPref.getEntryValues();
+        for (int i=Trace.TRACE_FLAGS_START_BIT; i<values.length; i++) {
+            if (mEnableTracesPref.getValue(i-Trace.TRACE_FLAGS_START_BIT)) {
+                value |= 1<<i;
+            }
+        }
+        writeEnableTracesOptions(value);
+        // Make sure summary is updated.
+        updateEnableTracesOptions();
+    }
+
+    private void writeEnableTracesOptions(long value) {
+        SystemProperties.set(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS,
+                "0x" + Long.toString(value, 16));
+        pokeSystemProperties();
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        if (buttonView == mEnabledSwitch) {
+            if (isChecked != mLastEnabledState) {
+                if (isChecked) {
+                    mDialogClicked = false;
+                    if (mEnableDialog != null) dismissDialogs();
+                    mEnableDialog = new AlertDialog.Builder(getActivity()).setMessage(
+                            getActivity().getResources().getString(
+                                    R.string.dev_settings_warning_message))
+                            .setTitle(R.string.dev_settings_warning_title)
+                            .setIcon(android.R.drawable.ic_dialog_alert)
+                            .setPositiveButton(android.R.string.yes, this)
+                            .setNegativeButton(android.R.string.no, this)
+                            .show();
+                    mEnableDialog.setOnDismissListener(this);
+                } else {
+                    resetDangerousOptions();
+                    Settings.Secure.putInt(getActivity().getContentResolver(),
+                            Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 0);
+                    mLastEnabledState = isChecked;
+                    setPrefsEnabledState(mLastEnabledState);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == RESULT_DEBUG_APP) {
+            if (resultCode == Activity.RESULT_OK) {
+                mDebugApp = data.getAction();
+                writeDebuggerOptions();
+                updateDebuggerOptions();
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
 
@@ -417,16 +778,16 @@
 
         if (preference == mEnableAdb) {
             if (mEnableAdb.isChecked()) {
-                mOkClicked = false;
-                if (mOkDialog != null) dismissDialog();
-                mOkDialog = new AlertDialog.Builder(getActivity()).setMessage(
+                mDialogClicked = false;
+                if (mAdbDialog != null) dismissDialogs();
+                mAdbDialog = 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)
                         .setNegativeButton(android.R.string.no, this)
                         .show();
-                mOkDialog.setOnDismissListener(this);
+                mAdbDialog.setOnDismissListener(this);
             } else {
                 Settings.Secure.putInt(getActivity().getContentResolver(),
                         Settings.Secure.ADB_ENABLED, 0);
@@ -436,10 +797,20 @@
                     Settings.System.STAY_ON_WHILE_PLUGGED_IN, 
                     mKeepScreenOn.isChecked() ? 
                     (BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB) : 0);
+        } else if (preference == mEnforceReadExternal) {
+            if (mEnforceReadExternal.isChecked()) {
+                ConfirmEnforceFragment.show(this);
+            } else {
+                setPermissionEnforced(getActivity(), READ_EXTERNAL_STORAGE, false);
+            }
         } else if (preference == mAllowMockLocation) {
             Settings.Secure.putInt(getActivity().getContentResolver(),
                     Settings.Secure.ALLOW_MOCK_LOCATION,
                     mAllowMockLocation.isChecked() ? 1 : 0);
+        } else if (preference == mDebugAppPref) {
+            startActivityForResult(new Intent(getActivity(), AppPicker.class), RESULT_DEBUG_APP);
+        } else if (preference == mWaitForDebugger) {
+            writeDebuggerOptions();
         } else if (preference == mStrictMode) {
             writeStrictModeVisualOptions();
         } else if (preference == mPointerLocation) {
@@ -447,7 +818,9 @@
         } else if (preference == mShowTouches) {
             writeShowTouchesOptions();
         } else if (preference == mShowScreenUpdates) {
-            writeFlingerOptions();
+            writeShowUpdatesOption();
+        } else if (preference == mDisableOverlays) {
+            writeDisableOverlaysOption();
         } else if (preference == mShowCpuUsage) {
             writeCpuUsageOptions();
         } else if (preference == mImmediatelyDestroyActivities) {
@@ -456,6 +829,12 @@
             writeShowAllANRsOptions();
         } else if (preference == mForceHardwareUi) {
             writeHardwareUiOptions();
+        } else if (preference == mTrackFrameTime) {
+            writeTrackFrameTimeOptions();
+        } else if (preference == mShowHwScreenUpdates) {
+            writeShowHwScreenUpdatesOptions();
+        } else if (preference == mDebugLayout) {
+            writeDebugLayoutOptions();
         }
 
         return false;
@@ -466,6 +845,7 @@
         if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
             SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
             updateHdcpValues();
+            pokeSystemProperties();
             return true;
         } else if (preference == mWindowAnimationScale) {
             writeAnimationScaleOption(0, mWindowAnimationScale, newValue);
@@ -473,6 +853,12 @@
         } else if (preference == mTransitionAnimationScale) {
             writeAnimationScaleOption(1, mTransitionAnimationScale, newValue);
             return true;
+        } else if (preference == mAnimatorDurationScale) {
+            writeAnimationScaleOption(2, mAnimatorDurationScale, newValue);
+            return true;
+        } else if (preference == mEnableTracesPref) {
+            writeEnableTracesOptions();
+            return true;
         } else if (preference == mAppProcessLimit) {
             writeAppProcessLimitOptions(newValue);
             return true;
@@ -480,33 +866,144 @@
         return false;
     }
 
-    private void dismissDialog() {
-        if (mOkDialog == null) return;
-        mOkDialog.dismiss();
-        mOkDialog = null;
+    private void dismissDialogs() {
+        if (mAdbDialog != null) {
+            mAdbDialog.dismiss();
+            mAdbDialog = null;
+        }
+        if (mEnableDialog != null) {
+            mEnableDialog.dismiss();
+            mEnableDialog = null;
+        }
     }
 
     public void onClick(DialogInterface dialog, int which) {
-        if (which == DialogInterface.BUTTON_POSITIVE) {
-            mOkClicked = true;
-            Settings.Secure.putInt(getActivity().getContentResolver(),
-                    Settings.Secure.ADB_ENABLED, 1);
-        } else {
-            // Reset the toggle
-            mEnableAdb.setChecked(false);
+        if (dialog == mAdbDialog) {
+            if (which == DialogInterface.BUTTON_POSITIVE) {
+                mDialogClicked = true;
+                Settings.Secure.putInt(getActivity().getContentResolver(),
+                        Settings.Secure.ADB_ENABLED, 1);
+            } else {
+                // Reset the toggle
+                mEnableAdb.setChecked(false);
+            }
+        } else if (dialog == mEnableDialog) {
+            if (which == DialogInterface.BUTTON_POSITIVE) {
+                mDialogClicked = true;
+                Settings.Secure.putInt(getActivity().getContentResolver(),
+                        Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 1);
+                mLastEnabledState = true;
+                setPrefsEnabledState(mLastEnabledState);
+            } else {
+                // Reset the toggle
+                mEnabledSwitch.setChecked(false);
+            }
         }
     }
 
     public void onDismiss(DialogInterface dialog) {
         // Assuming that onClick gets called first
-        if (!mOkClicked) {
-            mEnableAdb.setChecked(false);
+        if (dialog == mAdbDialog) {
+            if (!mDialogClicked) {
+                mEnableAdb.setChecked(false);
+            }
+            mAdbDialog = null;
+        } else if (dialog == mEnableDialog) {
+            if (!mDialogClicked) {
+                mEnabledSwitch.setChecked(false);
+            }
+            mEnableDialog = null;
         }
     }
 
     @Override
     public void onDestroy() {
-        dismissDialog();
+        dismissDialogs();
         super.onDestroy();
     }
+
+    void pokeSystemProperties() {
+        if (!mDontPokeProperties) {
+            (new SystemPropPoker()).execute();
+        }
+    }
+
+    static class SystemPropPoker extends AsyncTask<Void, Void, Void> {
+        @Override
+        protected Void doInBackground(Void... params) {
+            String[] services;
+            try {
+                services = ServiceManager.listServices();
+            } catch (RemoteException e) {
+                return null;
+            }
+            for (String service : services) {
+                IBinder obj = ServiceManager.checkService(service);
+                if (obj != null) {
+                    Parcel data = Parcel.obtain();
+                    try {
+                        obj.transact(IBinder.SYSPROPS_TRANSACTION, data, null, 0);
+                    } catch (RemoteException e) {
+                    }
+                    data.recycle();
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Dialog to confirm enforcement of {@link #READ_EXTERNAL_STORAGE}.
+     */
+    public static class ConfirmEnforceFragment extends DialogFragment {
+        public static void show(DevelopmentSettings parent) {
+            final ConfirmEnforceFragment dialog = new ConfirmEnforceFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_ENFORCE);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.enforce_read_external_confirm_title);
+            builder.setMessage(R.string.enforce_read_external_confirm_message);
+
+            builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    setPermissionEnforced(context, READ_EXTERNAL_STORAGE, true);
+                    ((DevelopmentSettings) getTargetFragment()).updateAllOptions();
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, new OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    ((DevelopmentSettings) getTargetFragment()).updateAllOptions();
+                }
+            });
+
+            return builder.create();
+        }
+    }
+
+    private static boolean isPermissionEnforced(Context context, String permission) {
+        try {
+            return ActivityThread.getPackageManager().isPermissionEnforced(READ_EXTERNAL_STORAGE);
+        } catch (RemoteException e) {
+            throw new RuntimeException("Problem talking with PackageManager", e);
+        }
+    }
+
+    private static void setPermissionEnforced(
+            Context context, String permission, boolean enforced) {
+        try {
+            // TODO: offload to background thread
+            ActivityThread.getPackageManager()
+                    .setPermissionEnforced(READ_EXTERNAL_STORAGE, enforced);
+        } catch (RemoteException e) {
+            throw new RuntimeException("Problem talking with PackageManager", e);
+        }
+    }
 }
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 5887140..fc162e2 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -24,11 +24,8 @@
 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;
@@ -36,8 +33,9 @@
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.util.Log;
-import android.view.IWindowManager;
-import android.view.Surface;
+
+import com.android.internal.view.RotationPolicy;
+import com.android.settings.DreamSettings;
 
 import java.util.ArrayList;
 
@@ -52,6 +50,7 @@
     private static final String KEY_ACCELEROMETER = "accelerometer";
     private static final String KEY_FONT_SIZE = "font_size";
     private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
+    private static final String KEY_SCREEN_SAVER = "screensaver";
 
     private CheckBoxPreference mAccelerometer;
     private ListPreference mFontSizePref;
@@ -60,10 +59,12 @@
     private final Configuration mCurConfig = new Configuration();
     
     private ListPreference mScreenTimeoutPreference;
+    private Preference mScreenSaverPreference;
 
-    private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) {
+    private final RotationPolicy.RotationPolicyListener mRotationPolicyListener =
+            new RotationPolicy.RotationPolicyListener() {
         @Override
-        public void onChange(boolean selfChange) {
+        public void onChange() {
             updateAccelerometerRotationCheckbox();
         }
     };
@@ -77,7 +78,19 @@
 
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
         mAccelerometer.setPersistent(false);
+        if (RotationPolicy.isRotationLockToggleSupported(getActivity())) {
+            // If rotation lock is supported, then we do not provide this option in
+            // Display settings.  However, is still available in Accessibility settings.
+            getPreferenceScreen().removePreference(mAccelerometer);
+        }
 
+        mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);
+        if (mScreenSaverPreference != null
+                && getResources().getBoolean(
+                        com.android.internal.R.bool.config_enableDreams) == false) {
+            getPreferenceScreen().removePreference(mScreenSaverPreference);
+        }
+        
         mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
         final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT,
                 FALLBACK_SCREEN_TIMEOUT_VALUE);
@@ -102,6 +115,7 @@
                 Log.e(TAG, Settings.System.NOTIFICATION_LIGHT_PULSE + " not found");
             }
         }
+
     }
 
     private void updateTimeoutPreferenceDescription(long currentTimeout) {
@@ -198,27 +212,36 @@
         super.onResume();
 
         updateState();
-        getContentResolver().registerContentObserver(
-                Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION), true,
-                mAccelerometerRotationObserver);
+
+        RotationPolicy.registerRotationPolicyListener(getActivity(),
+                mRotationPolicyListener);
     }
 
     @Override
     public void onPause() {
         super.onPause();
 
-        getContentResolver().unregisterContentObserver(mAccelerometerRotationObserver);
+        RotationPolicy.unregisterRotationPolicyListener(getActivity(),
+                mRotationPolicyListener);
     }
 
     private void updateState() {
         updateAccelerometerRotationCheckbox();
         readFontSizePreference(mFontSizePref);
+        updateScreenSaverSummary();
+    }
+
+    private void updateScreenSaverSummary() {
+        mScreenSaverPreference.setSummary(
+            DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext())
+                ? R.string.screensaver_settings_summary_on
+                : R.string.screensaver_settings_summary_off);
     }
 
     private void updateAccelerometerRotationCheckbox() {
-        mAccelerometer.setChecked(Settings.System.getInt(
-                getContentResolver(),
-                Settings.System.ACCELEROMETER_ROTATION, 0) != 0);
+        if (getActivity() == null) return;
+
+        mAccelerometer.setChecked(!RotationPolicy.isRotationLocked(getActivity()));
     }
 
     public void writeFontSizePreference(Object objValue) {
@@ -233,17 +256,8 @@
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference == mAccelerometer) {
-            try {
-                IWindowManager wm = IWindowManager.Stub.asInterface(
-                        ServiceManager.getService(Context.WINDOW_SERVICE));
-                if (mAccelerometer.isChecked()) {
-                    wm.thawRotation();
-                } else {
-                    wm.freezeRotation(Surface.ROTATION_0);
-                }
-            } catch (RemoteException exc) {
-                Log.w(TAG, "Unable to save auto-rotate setting");
-            }
+            RotationPolicy.setRotationLockForAccessibility(
+                    getActivity(), !mAccelerometer.isChecked());
         } else if (preference == mNotificationPulse) {
             boolean value = mNotificationPulse.isChecked();
             Settings.System.putInt(getContentResolver(), Settings.System.NOTIFICATION_LIGHT_PULSE,
diff --git a/src/com/android/settings/DreamComponentPreference.java b/src/com/android/settings/DreamComponentPreference.java
new file mode 100644
index 0000000..2114dd1
--- /dev/null
+++ b/src/com/android/settings/DreamComponentPreference.java
@@ -0,0 +1,236 @@
+/*
+ * 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.SCREENSAVER_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.ApplicationInfo;
+import android.content.pm.ComponentInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.preference.Preference;
+import android.provider.Settings;
+import android.service.dreams.IDreamManager;
+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.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class DreamComponentPreference extends Preference {
+    private static final String TAG = "DreamComponentPreference";
+
+    private static final boolean SHOW_DOCK_APPS = false;
+    private static final boolean SHOW_DREAM_SERVICES = true;
+    private static final boolean SHOW_DREAM_ACTIVITIES = false;
+
+    private final PackageManager pm;
+    private final ContentResolver resolver;
+    private final Collator   sCollator = Collator.getInstance();
+
+    public DreamComponentPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        pm = getContext().getPackageManager();
+        resolver = getContext().getContentResolver();
+
+        refreshFromSettings();
+    }
+
+    private void refreshFromSettings() {
+        ComponentName cn = null;
+        IDreamManager dm = IDreamManager.Stub.asInterface(
+                ServiceManager.getService("dreams"));
+        try {
+            cn = dm.getDreamComponent();
+        } catch (RemoteException ex) {
+            setSummary("(unknown)");
+            return;
+        }
+
+        try {
+            setSummary(pm.getActivityInfo(cn, 0).loadLabel(pm));
+        } catch (PackageManager.NameNotFoundException ex) {
+            try {
+                setSummary(pm.getServiceInfo(cn, 0).loadLabel(pm));
+            } catch (PackageManager.NameNotFoundException ex2) {
+                setSummary("(unknown)");
+            }
+        }
+    }
+
+    // Group by package, then by name.
+    Comparator<ResolveInfo> sResolveInfoComparator = new Comparator<ResolveInfo>() {
+        @Override
+        public int compare(ResolveInfo a, ResolveInfo b) {
+            CharSequence sa, sb;
+            
+            ApplicationInfo aia = a.activityInfo != null ? a.activityInfo.applicationInfo : a.serviceInfo.applicationInfo;
+            ApplicationInfo aib = b.activityInfo != null ? b.activityInfo.applicationInfo : b.serviceInfo.applicationInfo;
+            
+            if (!aia.equals(aib)) {
+                sa = pm.getApplicationLabel(aia);
+                sb = pm.getApplicationLabel(aib);
+            } else {
+                sa = a.loadLabel(pm);
+                if (sa == null) {
+                    sa = (a.activityInfo != null) ? a.activityInfo.name : a.serviceInfo.name;
+                }
+                sb = b.loadLabel(pm);
+                if (sb == null) {
+                    sb = (b.activityInfo != null) ? b.activityInfo.name : b.serviceInfo.name;
+                }
+            }
+            return sCollator.compare(sa.toString(), sb.toString());
+        }
+    };
+
+    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>();
+            
+            if (SHOW_DREAM_ACTIVITIES) {
+                results.addAll(pm.queryIntentActivities(choosy, PackageManager.GET_META_DATA));
+            }
+            
+            if (SHOW_DREAM_SERVICES) {
+                results.addAll(pm.queryIntentServices(choosy, PackageManager.GET_META_DATA));
+            }
+
+            // Group by package
+            Collections.sort(results, sResolveInfoComparator);
+
+            if (SHOW_DOCK_APPS) {
+                choosy = new Intent(Intent.ACTION_MAIN)
+                            .addCategory(Intent.CATEGORY_DESK_DOCK);
+
+                List<ResolveInfo> dockApps = pm.queryIntentActivities(choosy, 0);
+                for (ResolveInfo app : dockApps) {
+                    // do not insert duplicate packages
+                    int pos = Collections.binarySearch(results, app, sResolveInfoComparator);
+                    if (pos < 0) {
+                        results.add(-1-pos, app);
+                    }
+                }
+            }
+        }
+
+        @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;
+        }
+
+        private CharSequence loadDescription(ResolveInfo ri) {
+            CharSequence desc = null;
+            if (ri != null) {
+                Bundle metaData = (ri.activityInfo != null) ? ri.activityInfo.metaData : ri.serviceInfo.metaData;
+                Log.d(TAG, "loadDescription: ri=" + ri + " metaData=" + metaData);
+                if (metaData != null) {
+                    desc = metaData.getCharSequence("android.screensaver.description");
+                    Log.d(TAG, "loadDescription: desc=" + desc);
+                    if (desc != null) {
+                        desc = desc.toString().trim();
+                    }
+                }
+            }
+            return desc;
+        }
+
+        @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);
+                        String pn = (ri.activityInfo != null) ? ri.activityInfo.applicationInfo.packageName
+                                : ri.serviceInfo.applicationInfo.packageName;
+                        String n = (ri.activityInfo != null) ? ri.activityInfo.name : ri.serviceInfo.name;
+                        ComponentName cn = new ComponentName(pn, n);
+
+                        setSummary(ri.loadLabel(pm));
+                        //getContext().startActivity(intent);
+                        
+                        IDreamManager dm = IDreamManager.Stub.asInterface(
+                                ServiceManager.getService("dreams"));
+                        try {
+                            dm.setDreamComponent(cn);
+                        } catch (RemoteException ex) {
+                            // too bad, so sad, oh mom, oh dad
+                        }
+                    }
+                })
+            .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..d9953aa
--- /dev/null
+++ b/src/com/android/settings/DreamSettings.java
@@ -0,0 +1,159 @@
+/*
+ * 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.SCREENSAVER_ENABLED;
+import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK;
+
+import android.app.ActionBar;
+import android.app.Activity;
+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.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.IWindowManager;
+import android.widget.CompoundButton;
+import android.widget.Switch;
+
+import java.util.ArrayList;
+
+public class DreamSettings extends SettingsPreferenceFragment {
+    private static final String TAG = "DreamSettings";
+
+    private static final String KEY_ACTIVATE_ON_DOCK = "activate_on_dock";
+
+    private CheckBoxPreference mActivateOnDockPreference;
+
+    private Switch mEnableSwitch;
+    private Enabler mEnabler;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.dream_settings);
+
+        mActivateOnDockPreference = (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_DOCK);
+
+        final Activity activity = getActivity();
+
+        mEnableSwitch = new Switch(activity);
+
+        if (activity instanceof PreferenceActivity) {
+            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+            // note: we do not check onIsHidingHeaders() or onIsMultiPane() because there's no
+            // switch in the left-hand pane to control this; we need to show the ON/OFF in our
+            // fragment every time
+            final int padding = activity.getResources().getDimensionPixelSize(
+                    R.dimen.action_bar_switch_padding);
+            mEnableSwitch.setPadding(0, 0, padding, 0);
+            activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                    ActionBar.DISPLAY_SHOW_CUSTOM);
+            activity.getActionBar().setCustomView(mEnableSwitch, new ActionBar.LayoutParams(
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+            activity.getActionBar().setTitle(R.string.screensaver_settings_title);
+        }
+
+        mEnabler = new Enabler(activity, mEnableSwitch);
+    }
+
+    public static boolean isScreenSaverEnabled(Context context) {
+        return 0 != Settings.Secure.getInt(
+                    context.getContentResolver(), SCREENSAVER_ENABLED, 1);
+    }
+
+    public static void setScreenSaverEnabled(Context context, boolean enabled) {
+        Settings.Secure.putInt(
+                context.getContentResolver(), SCREENSAVER_ENABLED, enabled ? 1 : 0);
+    }
+
+    public static class Enabler implements CompoundButton.OnCheckedChangeListener  {
+        private final Context mContext;
+        private Switch mSwitch;
+
+        public Enabler(Context context, Switch switch_) {
+            mContext = context;
+            setSwitch(switch_);
+        }
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            setScreenSaverEnabled(mContext, isChecked);
+        }
+        public void setSwitch(Switch switch_) {
+            if (mSwitch == switch_) return;
+            if (mSwitch != null) mSwitch.setOnCheckedChangeListener(null);
+            mSwitch = switch_;
+            mSwitch.setOnCheckedChangeListener(this);
+
+            final boolean enabled = isScreenSaverEnabled(mContext);
+            mSwitch.setChecked(enabled);
+        }
+        public void pause() {
+            mSwitch.setOnCheckedChangeListener(null);
+        }
+        public void resume() {
+            mSwitch.setOnCheckedChangeListener(this);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        if (mEnabler != null) {
+            mEnabler.resume();
+        }
+
+        final boolean currentActivateOnDock = 0 != Settings.Secure.getInt(getContentResolver(),
+                SCREENSAVER_ACTIVATE_ON_DOCK, 1);
+        mActivateOnDockPreference.setChecked(currentActivateOnDock);
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        if (mEnabler != null) {
+            mEnabler.pause();
+        }
+
+        super.onPause();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (preference == mActivateOnDockPreference) {
+            Settings.Secure.putInt(getContentResolver(),
+                    SCREENSAVER_ACTIVATE_ON_DOCK, 
+                    mActivateOnDockPreference.isChecked() ? 1 : 0);
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+}
diff --git a/src/com/android/settings/DreamTesterPreference.java b/src/com/android/settings/DreamTesterPreference.java
new file mode 100644
index 0000000..87a142c
--- /dev/null
+++ b/src/com/android/settings/DreamTesterPreference.java
@@ -0,0 +1,87 @@
+/*
+ * 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.SCREENSAVER_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.os.RemoteException;
+import android.os.ServiceManager;
+import android.preference.Preference;
+import android.provider.Settings;
+import android.service.dreams.IDreamManager;
+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, SCREENSAVER_COMPONENT);
+        Log.v(TAG, "component=" + component);
+        if (component != null) {
+            ComponentName cn = ComponentName.unflattenFromString(component);
+            Log.v(TAG, "cn=" + cn);
+//            Intent intent = new Intent(Intent.ACTION_MAIN)
+//                .setComponent(cn)
+//                .addFlags(
+//                    Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+//                    )
+//                .putExtra("android.dreams.TEST", true);
+//            getContext().startService(intent);
+            IDreamManager dm = IDreamManager.Stub.asInterface(
+                    ServiceManager.getService("dreams"));
+            try {
+                dm.testDream(cn);
+            } catch (RemoteException ex) {
+                // too bad, so sad, oh mom, oh dad
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/EditPinPreference.java b/src/com/android/settings/EditPinPreference.java
index 362bed1..1877d43 100644
--- a/src/com/android/settings/EditPinPreference.java
+++ b/src/com/android/settings/EditPinPreference.java
@@ -19,8 +19,7 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.preference.EditTextPreference;
-import android.text.method.DigitsKeyListener;
-import android.text.method.PasswordTransformationMethod;
+import android.text.InputType;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.EditText;
@@ -52,12 +51,11 @@
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
-        final EditText editText = (EditText) view.findViewById(android.R.id.edit);
+        final EditText editText = getEditText();
 
         if (editText != null) {
-            editText.setSingleLine(true);
-            editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
-            editText.setKeyListener(DigitsKeyListener.getInstance());
+            editText.setInputType(InputType.TYPE_CLASS_NUMBER |
+                InputType.TYPE_NUMBER_VARIATION_PASSWORD);
         }
     }
 
diff --git a/src/com/android/settings/NsdEnabler.java b/src/com/android/settings/NsdEnabler.java
new file mode 100644
index 0000000..acdf92e
--- /dev/null
+++ b/src/com/android/settings/NsdEnabler.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.nsd.NsdManager;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+
+import com.android.settings.R;
+
+/**
+ * NsdEnabler is a helper to manage network service discovery on/off checkbox state.
+ */
+public class NsdEnabler implements Preference.OnPreferenceChangeListener {
+    private final Context mContext;
+    private final CheckBoxPreference mCheckbox;
+    private final IntentFilter mIntentFilter;
+    private NsdManager mNsdManager;
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (NsdManager.ACTION_NSD_STATE_CHANGED.equals(action)) {
+                handleNsdStateChanged(intent.getIntExtra(NsdManager.EXTRA_NSD_STATE,
+                        NsdManager.NSD_STATE_DISABLED));
+            }
+        }
+    };
+
+    public NsdEnabler(Context context, CheckBoxPreference checkBoxPreference) {
+        mContext = context;
+        mCheckbox = checkBoxPreference;
+        mNsdManager = (NsdManager) mContext.getSystemService(Context.NSD_SERVICE);
+        mIntentFilter = new IntentFilter(NsdManager.ACTION_NSD_STATE_CHANGED);
+    }
+
+    public void resume() {
+        mContext.registerReceiver(mReceiver, mIntentFilter);
+        mCheckbox.setOnPreferenceChangeListener(this);
+    }
+
+    public void pause() {
+        mContext.unregisterReceiver(mReceiver);
+        mCheckbox.setOnPreferenceChangeListener(null);
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object value) {
+
+        final boolean desiredState = (Boolean) value;
+        mCheckbox.setEnabled(false);
+        mNsdManager.setEnabled(desiredState);
+        return false;
+    }
+
+    private void handleNsdStateChanged(int newState) {
+        switch (newState) {
+            case NsdManager.NSD_STATE_DISABLED:
+                mCheckbox.setChecked(false);
+                mCheckbox.setEnabled(true);
+                break;
+            case NsdManager.NSD_STATE_ENABLED:
+                mCheckbox.setChecked(true);
+                mCheckbox.setEnabled(true);
+                break;
+        }
+    }
+}
diff --git a/src/com/android/settings/PointerSpeedPreference.java b/src/com/android/settings/PointerSpeedPreference.java
index 6a6a71f..3f40f9a 100644
--- a/src/com/android/settings/PointerSpeedPreference.java
+++ b/src/com/android/settings/PointerSpeedPreference.java
@@ -19,22 +19,20 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.ContentObserver;
+import android.hardware.input.InputManager;
 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 final InputManager mIm;
     private SeekBar mSeekBar;
 
     private int mOldSpeed;
@@ -42,9 +40,6 @@
 
     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) {
@@ -54,6 +49,7 @@
 
     public PointerSpeedPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mIm = (InputManager)getContext().getSystemService(Context.INPUT_SERVICE);
     }
 
     @Override
@@ -72,15 +68,15 @@
         super.onBindDialogView(view);
 
         mSeekBar = getSeekBar(view);
-        mSeekBar.setMax(MAX_SPEED - MIN_SPEED);
-        mOldSpeed = getSpeed(0);
-        mSeekBar.setProgress(mOldSpeed - MIN_SPEED);
+        mSeekBar.setMax(InputManager.MAX_POINTER_SPEED - InputManager.MIN_POINTER_SPEED);
+        mOldSpeed = mIm.getPointerSpeed(getContext());
+        mSeekBar.setProgress(mOldSpeed - InputManager.MIN_POINTER_SPEED);
         mSeekBar.setOnSeekBarChangeListener(this);
     }
 
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
         if (!mTouchInProgress) {
-            setSpeed(progress + MIN_SPEED);
+            mIm.tryPointerSpeed(progress + InputManager.MIN_POINTER_SPEED);
         }
     }
 
@@ -90,22 +86,12 @@
 
     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;
+        mIm.tryPointerSpeed(seekBar.getProgress() + InputManager.MIN_POINTER_SPEED);
     }
 
     private void onSpeedChanged() {
-        int speed = getSpeed(0);
-        mSeekBar.setProgress(speed - MIN_SPEED);
+        int speed = mIm.getPointerSpeed(getContext());
+        mSeekBar.setProgress(speed - InputManager.MIN_POINTER_SPEED);
     }
 
     @Override
@@ -115,8 +101,8 @@
         final ContentResolver resolver = getContext().getContentResolver();
 
         if (positiveResult) {
-            Settings.System.putInt(resolver, Settings.System.POINTER_SPEED,
-                    mSeekBar.getProgress() + MIN_SPEED);
+            mIm.setPointerSpeed(getContext(),
+                    mSeekBar.getProgress() + InputManager.MIN_POINTER_SPEED);
         } else {
             restoreOldState();
         }
@@ -127,21 +113,10 @@
     private void restoreOldState() {
         if (mRestoredOldState) return;
 
-        setSpeed(mOldSpeed);
+        mIm.tryPointerSpeed(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();
@@ -169,7 +144,7 @@
         super.onRestoreInstanceState(myState.getSuperState());
         mOldSpeed = myState.oldSpeed;
         mSeekBar.setProgress(myState.progress);
-        setSpeed(myState.progress + MIN_SPEED);
+        mIm.tryPointerSpeed(myState.progress + InputManager.MIN_POINTER_SPEED);
     }
 
     private static class SavedState extends BaseSavedState {
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 3f3b9ad..e2433bd 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -203,4 +203,9 @@
         mAutoRestore.setEnabled(enable);
         mConfigure.setEnabled(enable);
     }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_backup_reset;
+    }
 }
diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java
index c1b25d8..625aa59 100644
--- a/src/com/android/settings/ProgressCategory.java
+++ b/src/com/android/settings/ProgressCategory.java
@@ -36,13 +36,10 @@
     @Override
     public void onBindView(View view) {
         super.onBindView(view);
-        final TextView scanning = (TextView) view.findViewById(R.id.scanning_text);
         final View progressBar = view.findViewById(R.id.scanning_progress);
 
-        scanning.setText(mProgress ? R.string.progress_scanning : R.string.progress_tap_to_pair);
         boolean noDeviceFound = (getPreferenceCount() == 0 ||
                 (getPreferenceCount() == 1 && getPreference(0) == mNoDeviceFoundPreference));
-        scanning.setVisibility(noDeviceFound ? View.GONE : View.VISIBLE);
         progressBar.setVisibility(mProgress ? View.VISIBLE : View.GONE);
 
         if (mProgress || !noDeviceFound) {
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 5845c8f..a79f4a5 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -116,8 +116,8 @@
             boolean muted = mAudioManager.isStreamMute(streamType);
 
             if (mCheckBoxes[i] != null) {
-                if (streamType == AudioManager.STREAM_RING && muted
-                        && mAudioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_RINGER)) {
+                if ((streamType == AudioManager.STREAM_RING) &&
+                        (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE)) {
                     mCheckBoxes[i].setImageResource(
                             com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
                 } else {
@@ -126,9 +126,13 @@
                 }
             }
             if (mSeekBars[i] != null) {
-                final int volume = muted ? mAudioManager.getLastAudibleStreamVolume(streamType)
-                        : mAudioManager.getStreamVolume(streamType);
+                final int volume = mAudioManager.getStreamVolume(streamType);
                 mSeekBars[i].setProgress(volume);
+                if (streamType != mAudioManager.getMasterStreamType() && muted) {
+                    mSeekBars[i].setEnabled(false);
+                } else {
+                    mSeekBars[i].setEnabled(true);
+                }
             }
         }
     }
@@ -169,9 +173,6 @@
             }
         }
 
-        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]);
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index adf8c37..a12da3e 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -26,6 +26,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.UserId;
 import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -53,13 +54,15 @@
     private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
     private static final String KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING =
             "biometric_weak_improve_matching";
+    private static final String KEY_BIOMETRIC_WEAK_LIVELINESS = "biometric_weak_liveliness";
     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;
-    private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_IMPROVE_REQUEST = 124;
+    private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST = 124;
+    private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF = 125;
 
     // Misc Settings
     private static final String KEY_SIM_LOCK = "sim_lock";
@@ -74,6 +77,7 @@
     private LockPatternUtils mLockPatternUtils;
     private ListPreference mLockAfter;
 
+    private CheckBoxPreference mBiometricWeakLiveliness;
     private CheckBoxPreference mVisiblePattern;
     private CheckBoxPreference mTactileFeedback;
 
@@ -137,15 +141,17 @@
         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;
+        if (UserId.myUserId() == 0) {
+            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
@@ -155,6 +161,10 @@
             updateLockAfterPreferenceSummary();
         }
 
+        // biometric weak liveliness
+        mBiometricWeakLiveliness =
+                (CheckBoxPreference) root.findPreference(KEY_BIOMETRIC_WEAK_LIVELINESS);
+
         // visible pattern
         mVisiblePattern = (CheckBoxPreference) root.findPreference(KEY_VISIBLE_PATTERN);
 
@@ -183,13 +193,17 @@
             }
         }
 
+        if (UserId.myUserId() > 0) {
+            return root;
+        }
+        // Rest are for primary user...
+
         // Append the rest of the settings
         addPreferencesFromResource(R.xml.security_settings_misc);
 
-        // Do not display SIM lock for CDMA phone
+        // Do not display SIM lock for devices without an Icc card
         TelephonyManager tm = TelephonyManager.getDefault();
-        if ((TelephonyManager.PHONE_TYPE_CDMA == tm.getCurrentPhoneType()) &&
-                (tm.getLteOnCdmaMode() != Phone.LTE_ON_CDMA_TRUE)) {
+        if (!tm.hasIccCard()) {
             root.removePreference(root.findPreference(KEY_SIM_LOCK));
         } else {
             // Disable SIM lock if sim card is missing or unknown
@@ -239,7 +253,9 @@
     public void onClick(DialogInterface dialog, int which) {
         if (dialog == mWarnInstallApps && which == DialogInterface.BUTTON_POSITIVE) {
             setNonMarketAppsAllowed(true);
-            mToggleAppInstallation.setChecked(true);
+            if (mToggleAppInstallation != null) {
+                mToggleAppInstallation.setChecked(true);
+            }
         }
     }
 
@@ -322,6 +338,10 @@
         createPreferenceHierarchy();
 
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
+        if (mBiometricWeakLiveliness != null) {
+            mBiometricWeakLiveliness.setChecked(
+                    lockPatternUtils.isBiometricWeakLivelinessEnabled());
+        }
         if (mVisiblePattern != null) {
             mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
         }
@@ -332,11 +352,15 @@
             mPowerButtonInstantlyLocks.setChecked(lockPatternUtils.getPowerButtonInstantlyLocks());
         }
 
-        mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
-                Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
+        if (mShowPassword != null) {
+            mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
+                    Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
+        }
 
         KeyStore.State state = KeyStore.getInstance().state();
-        mResetCredentials.setEnabled(state != KeyStore.State.UNINITIALIZED);
+        if (mResetCredentials != null) {
+            mResetCredentials.setEnabled(state != KeyStore.State.UNINITIALIZED);
+        }
     }
 
     @Override
@@ -351,8 +375,32 @@
             ChooseLockSettingsHelper helper =
                     new ChooseLockSettingsHelper(this.getActivity(), this);
             if (!helper.launchConfirmationActivity(
-                    CONFIRM_EXISTING_FOR_BIOMETRIC_IMPROVE_REQUEST, null, null)) {
-                startBiometricWeakImprove(); // no password set, so no need to confirm
+                    CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST, null, null)) {
+                // If this returns false, it means no password confirmation is required, so
+                // go ahead and start improve.
+                // Note: currently a backup is required for biometric_weak so this code path
+                // can't be reached, but is here in case things change in the future
+                startBiometricWeakImprove();
+            }
+        } else if (KEY_BIOMETRIC_WEAK_LIVELINESS.equals(key)) {
+            if (isToggled(preference)) {
+                lockPatternUtils.setBiometricWeakLivelinessEnabled(true);
+            } else {
+                // In this case the user has just unchecked the checkbox, but this action requires
+                // them to confirm their password.  We need to re-check the checkbox until
+                // they've confirmed their password
+                mBiometricWeakLiveliness.setChecked(true);
+                ChooseLockSettingsHelper helper =
+                        new ChooseLockSettingsHelper(this.getActivity(), this);
+                if (!helper.launchConfirmationActivity(
+                                CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF, null, null)) {
+                    // If this returns false, it means no password confirmation is required, so
+                    // go ahead and uncheck it here.
+                    // Note: currently a backup is required for biometric_weak so this code path
+                    // can't be reached, but is here in case things change in the future
+                    lockPatternUtils.setBiometricWeakLivelinessEnabled(false);
+                    mBiometricWeakLiveliness.setChecked(false);
+                }
             }
         } else if (KEY_LOCK_ENABLED.equals(key)) {
             lockPatternUtils.setLockPatternEnabled(isToggled(preference));
@@ -390,10 +438,16 @@
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == CONFIRM_EXISTING_FOR_BIOMETRIC_IMPROVE_REQUEST &&
+        if (requestCode == CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST &&
                 resultCode == Activity.RESULT_OK) {
             startBiometricWeakImprove();
             return;
+        } else if (requestCode == CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF &&
+                resultCode == Activity.RESULT_OK) {
+            final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
+            lockPatternUtils.setBiometricWeakLivelinessEnabled(false);
+            mBiometricWeakLiveliness.setChecked(false);
+            return;
         }
         createPreferenceHierarchy();
     }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index c9f5c73..37b47c2 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -16,20 +16,34 @@
 
 package com.android.settings;
 
+import com.android.internal.util.ArrayUtils;
 import com.android.settings.accounts.AccountSyncSettings;
+import com.android.settings.accounts.AuthenticatorHelper;
+import com.android.settings.accounts.ManageAccountsSettings;
+import com.android.settings.applications.ManageApplications;
 import com.android.settings.bluetooth.BluetoothEnabler;
+import com.android.settings.deviceinfo.Memory;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.wifi.WifiEnabler;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.OnAccountsUpdateListener;
 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.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.INetworkManagementService;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserId;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceActivity.Header;
 import android.preference.PreferenceFragment;
 import android.text.TextUtils;
 import android.util.Log;
@@ -45,13 +59,16 @@
 import android.widget.TextView;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 
 /**
  * Top-level settings activity to handle single pane and double pane UI layout.
  */
-public class Settings extends PreferenceActivity implements ButtonBarHandler {
+public class Settings extends PreferenceActivity
+        implements ButtonBarHandler, OnAccountsUpdateListener {
 
     private static final String LOG_TAG = "Settings";
     private static final String META_DATA_KEY_HEADER_ID =
@@ -75,24 +92,50 @@
     private Header mParentHeader;
     private boolean mInLocalHeaderSwitch;
 
+    // Show only these settings for restricted users
+    private int[] SETTINGS_FOR_RESTRICTED = {
+            R.id.wifi_settings,
+            R.id.bluetooth_settings,
+            R.id.sound_settings,
+            R.id.display_settings,
+            R.id.security_settings,
+            R.id.account_settings,
+            R.id.about_settings
+    };
+
+    private boolean mEnableUserManagement = false;
+
     // TODO: Update Call Settings based on airplane mode state.
 
     protected HashMap<Integer, Integer> mHeaderIndexMap = new HashMap<Integer, Integer>();
     private List<Header> mHeaders;
 
+    private AuthenticatorHelper mAuthenticatorHelper;
+    private Header mLastHeader;
+    private boolean mListeningToAccountUpdates;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         if (getIntent().getBooleanExtra(EXTRA_CLEAR_UI_OPTIONS, false)) {
             getWindow().setUiOptions(0);
         }
 
+        if (android.provider.Settings.Secure.getInt(getContentResolver(), "multiuser_enabled", -1)
+                > 0) {
+            mEnableUserManagement = true;
+        }
+
+        mAuthenticatorHelper = new AuthenticatorHelper();
+        mAuthenticatorHelper.updateAuthDescriptions(this);
+        mAuthenticatorHelper.onAccountsUpdated(this, null);
+
         getMetaData();
         mInLocalHeaderSwitch = true;
         super.onCreate(savedInstanceState);
         mInLocalHeaderSwitch = false;
 
         if (!onIsHidingHeaders() && onIsMultiPane()) {
-            highlightHeader();
+            highlightHeader(mTopLevelHeaderId);
             // Force the title so that it doesn't get overridden by a direct launch of
             // a specific settings screen.
             setTitle(R.string.settings_label);
@@ -118,9 +161,11 @@
             });
         }
 
-        // 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 up navigation for multi-pane, since we handle it in the fragment breadcrumbs
+        if (onIsMultiPane()) {
+            getActionBar().setDisplayHomeAsUpEnabled(false);
+            getActionBar().setHomeButtonEnabled(false);
+        }
     }
 
     @Override
@@ -156,6 +201,14 @@
         }
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mListeningToAccountUpdates) {
+            AccountManager.get(this).removeOnAccountsUpdatedListener(this);
+        }
+    }
+
     private void switchToHeaderLocal(Header header) {
         mInLocalHeaderSwitch = true;
         switchToHeader(header);
@@ -190,7 +243,7 @@
                 mCurrentHeader = parentHeader;
 
                 switchToHeaderLocal(parentHeader);
-                highlightHeader();
+                highlightHeader(mTopLevelHeaderId);
 
                 mParentHeader = new Header();
                 mParentHeader.fragment
@@ -213,9 +266,9 @@
         }
     }
 
-    private void highlightHeader() {
-        if (mTopLevelHeaderId != 0) {
-            Integer index = mHeaderIndexMap.get(mTopLevelHeaderId);
+    private void highlightHeader(int id) {
+        if (id != 0) {
+            Integer index = mHeaderIndexMap.get(id);
             if (index != null) {
                 getListView().setItemChecked(index, true);
                 getListView().smoothScrollToPosition(index);
@@ -294,7 +347,13 @@
         if (DataUsageSummary.class.getName().equals(fragmentName) ||
                 PowerUsageSummary.class.getName().equals(fragmentName) ||
                 AccountSyncSettings.class.getName().equals(fragmentName) ||
-                UserDictionarySettings.class.getName().equals(fragmentName)) {
+                UserDictionarySettings.class.getName().equals(fragmentName) ||
+                Memory.class.getName().equals(fragmentName) ||
+                ManageApplications.class.getName().equals(fragmentName) ||
+                WirelessSettings.class.getName().equals(fragmentName) ||
+                SoundSettings.class.getName().equals(fragmentName) ||
+                PrivacySettings.class.getName().equals(fragmentName) ||
+                ManageAccountsSettings.class.getName().equals(fragmentName)) {
             intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
         }
 
@@ -335,6 +394,31 @@
                 if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
                     target.remove(header);
                 }
+            } else if (id == R.id.data_usage_settings) {
+                // Remove data usage when kernel module not enabled
+                final INetworkManagementService netManager = INetworkManagementService.Stub
+                        .asInterface(ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
+                try {
+                    if (!netManager.isBandwidthControlEnabled()) {
+                        target.remove(header);
+                    }
+                } catch (RemoteException e) {
+                    // ignored
+                }
+            } else if (id == R.id.account_settings) {
+                int headerIndex = i + 1;
+                i = insertAccountsHeaders(target, headerIndex);
+            } else if (id == R.id.user_settings) {
+                if (!mEnableUserManagement
+                        || !UserId.MU_ENABLED || UserId.myUserId() != 0
+                        || !getResources().getBoolean(R.bool.enable_user_management)
+                        || Utils.isMonkeyRunning()) {
+                    target.remove(header);
+                }
+            }
+            if (UserId.MU_ENABLED && UserId.myUserId() != 0
+                    && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
+                target.remove(header);
             }
 
             // Increment if the current one wasn't removed by the Utils code.
@@ -350,6 +434,63 @@
         }
     }
 
+    private int insertAccountsHeaders(List<Header> target, int headerIndex) {
+        String[] accountTypes = mAuthenticatorHelper.getEnabledAccountTypes();
+        List<Header> accountHeaders = new ArrayList<Header>(accountTypes.length);
+        for (String accountType : accountTypes) {
+            CharSequence label = mAuthenticatorHelper.getLabelForType(this, accountType);
+            Account[] accounts = AccountManager.get(this).getAccountsByType(accountType);
+            boolean skipToAccount = accounts.length == 1
+                    && !mAuthenticatorHelper.hasAccountPreferences(accountType);
+            Header accHeader = new Header();
+            accHeader.title = label;
+            if (accHeader.extras == null) {
+                accHeader.extras = new Bundle();
+            }
+            if (skipToAccount) {
+                accHeader.breadCrumbTitleRes = R.string.account_sync_settings_title;
+                accHeader.breadCrumbShortTitleRes = R.string.account_sync_settings_title;
+                accHeader.fragment = AccountSyncSettings.class.getName();
+                accHeader.fragmentArguments = new Bundle();
+                // Need this for the icon
+                accHeader.extras.putString(ManageAccountsSettings.KEY_ACCOUNT_TYPE, accountType);
+                accHeader.extras.putParcelable(AccountSyncSettings.ACCOUNT_KEY, accounts[0]);
+                accHeader.fragmentArguments.putParcelable(AccountSyncSettings.ACCOUNT_KEY,
+                        accounts[0]);
+            } else {
+                accHeader.breadCrumbTitle = label;
+                accHeader.breadCrumbShortTitle = label;
+                accHeader.fragment = ManageAccountsSettings.class.getName();
+                accHeader.fragmentArguments = new Bundle();
+                accHeader.extras.putString(ManageAccountsSettings.KEY_ACCOUNT_TYPE, accountType);
+                accHeader.fragmentArguments.putString(ManageAccountsSettings.KEY_ACCOUNT_TYPE,
+                        accountType);
+                if (!isMultiPane()) {
+                    accHeader.fragmentArguments.putString(ManageAccountsSettings.KEY_ACCOUNT_LABEL,
+                            label.toString());
+                }
+            }
+            accountHeaders.add(accHeader);
+        }
+
+        // Sort by label
+        Collections.sort(accountHeaders, new Comparator<Header>() {
+            @Override
+            public int compare(Header h1, Header h2) {
+                return h1.title.toString().compareTo(h2.title.toString());
+            }
+        });
+
+        for (Header header : accountHeaders) {
+            target.add(headerIndex++, header);
+        }
+        if (!mListeningToAccountUpdates) {
+            AccountManager.get(this).addOnAccountsUpdatedListener(this, null, true);
+            mListeningToAccountUpdates = true;
+        }
+        return headerIndex;
+    }
+
     private boolean needsDockSettings() {
         return getResources().getBoolean(R.bool.has_dock_settings);
     }
@@ -361,7 +502,7 @@
             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);
@@ -395,6 +536,7 @@
 
         private final WifiEnabler mWifiEnabler;
         private final BluetoothEnabler mBluetoothEnabler;
+        private AuthenticatorHelper mAuthHelper;
 
         private static class HeaderViewHolder {
             ImageView icon;
@@ -441,10 +583,13 @@
             return true;
         }
 
-        public HeaderAdapter(Context context, List<Header> objects) {
+        public HeaderAdapter(Context context, List<Header> objects,
+                AuthenticatorHelper authenticatorHelper) {
             super(context, 0, objects);
+
+            mAuthHelper = authenticatorHelper;
             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));
@@ -480,9 +625,9 @@
 
                     case HEADER_TYPE_NORMAL:
                         view = mInflater.inflate(
-                                com.android.internal.R.layout.preference_header_item, parent,
+                                R.layout.preference_header_item, parent,
                                 false);
-                        holder.icon = (ImageView) view.findViewById(com.android.internal.R.id.icon);
+                        holder.icon = (ImageView) view.findViewById(R.id.icon);
                         holder.title = (TextView)
                                 view.findViewById(com.android.internal.R.id.title);
                         holder.summary = (TextView)
@@ -512,7 +657,20 @@
 
                     //$FALL-THROUGH$
                 case HEADER_TYPE_NORMAL:
-                    holder.icon.setImageResource(header.iconRes);
+                    if (header.extras != null
+                            && header.extras.containsKey(ManageAccountsSettings.KEY_ACCOUNT_TYPE)) {
+                        String accType = header.extras.getString(
+                                ManageAccountsSettings.KEY_ACCOUNT_TYPE);
+                        ViewGroup.LayoutParams lp = holder.icon.getLayoutParams();
+                        lp.width = getContext().getResources().getDimensionPixelSize(
+                                R.dimen.header_icon_width);
+                        lp.height = lp.width;
+                        holder.icon.setLayoutParams(lp);
+                        Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
+                        holder.icon.setImageDrawable(icon);
+                    } else {
+                        holder.icon.setImageResource(header.iconRes);
+                    }
                     holder.title.setText(header.getTitle(getContext().getResources()));
                     CharSequence summary = header.getSummary(getContext().getResources());
                     if (!TextUtils.isEmpty(summary)) {
@@ -539,16 +697,37 @@
     }
 
     @Override
+    public void onHeaderClick(Header header, int position) {
+        boolean revert = false;
+        if (header.id == R.id.account_add) {
+            revert = true;
+        }
+
+        super.onHeaderClick(header, position);
+
+        if (revert && mLastHeader != null) {
+            highlightHeader((int) mLastHeader.id);
+        } else {
+            mLastHeader = header;
+        }
+    }
+
+    @Override
     public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
         // Override the fragment title for Wallpaper settings
         int titleRes = pref.getTitleRes();
         if (pref.getFragment().equals(WallpaperTypeSettings.class.getName())) {
             titleRes = R.string.wallpaper_settings_fragment_title;
         }
-        startPreferencePanel(pref.getFragment(), pref.getExtras(), titleRes, null, null, 0);
+        startPreferencePanel(pref.getFragment(), pref.getExtras(), titleRes, pref.getTitle(),
+                null, 0);
         return true;
     }
 
+    public boolean shouldUpRecreateTask(Intent targetIntent) {
+        return super.shouldUpRecreateTask(new Intent(this, Settings.class));
+    }
+
     @Override
     public void setListAdapter(ListAdapter adapter) {
         if (mHeaders == null) {
@@ -561,7 +740,13 @@
         }
 
         // Ignore the adapter provided by PreferenceActivity and substitute ours instead
-        super.setListAdapter(new HeaderAdapter(this, mHeaders));
+        super.setListAdapter(new HeaderAdapter(this, mHeaders, mAuthenticatorHelper));
+    }
+
+    @Override
+    public void onAccountsUpdated(Account[] accounts) {
+        mAuthenticatorHelper.onAccountsUpdated(this, accounts);
+        invalidateHeaders();
     }
 
     /*
@@ -576,6 +761,7 @@
     public static class WifiSettingsActivity extends Settings { /* empty */ }
     public static class WifiP2pSettingsActivity extends Settings { /* empty */ }
     public static class InputMethodAndLanguageSettingsActivity extends Settings { /* empty */ }
+    public static class KeyboardLayoutPickerActivity extends Settings { /* empty */ }
     public static class InputMethodAndSubtypeEnablerActivity extends Settings { /* empty */ }
     public static class SpellCheckersSettingsActivity extends Settings { /* empty */ }
     public static class LocalePickerActivity extends Settings { /* empty */ }
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index f7e3b02..368976a 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -21,11 +21,17 @@
 import android.app.Fragment;
 import android.content.ContentResolver;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
+import android.text.TextUtils;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.widget.Button;
 
 /**
@@ -35,11 +41,49 @@
 
     private static final String TAG = "SettingsPreferenceFragment";
 
+    private static final int MENU_HELP = Menu.FIRST + 100;
+
     private SettingsDialogFragment mDialogFragment;
 
+    private String mHelpUrl;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        // Prepare help url and enable menu if necessary
+        int helpResource = getHelpResource();
+        if (helpResource != 0) {
+            mHelpUrl = getResources().getString(helpResource);
+        }
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
+        if (!TextUtils.isEmpty(mHelpUrl)) {
+            setHasOptionsMenu(true);
+        }
+    }
+
+    /**
+     * Override this if you want to show a help item in the menu, by returning the resource id.
+     * @return the resource id for the help url
+     */
+    protected int getHelpResource() {
+        return 0;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (mHelpUrl != null) {
+            Intent helpIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(mHelpUrl));
+            helpIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+            MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
+            helpItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+            helpItem.setIntent(helpIntent);
+        }
     }
 
     /*
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index cf7cd0a..67557b9 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -16,17 +16,14 @@
 
 package com.android.settings;
 
-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;
@@ -41,8 +38,6 @@
 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;
 
@@ -55,8 +50,7 @@
     /** If there is no setting in the provider, use this. */
     private static final int FALLBACK_EMERGENCY_TONE_VALUE = 0;
 
-    private static final String KEY_SILENT_MODE = "silent_mode";
-    private static final String KEY_VIBRATE = "vibrate_on_ring";
+    private static final String KEY_VIBRATE = "vibrate_when_ringing";
     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";
@@ -67,11 +61,7 @@
     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 SILENT_MODE_OFF = "off";
-    private static final String SILENT_MODE_VIBRATE = "vibrate";
-    private static final String SILENT_MODE_MUTE = "mute";
+    private static final String KEY_CATEGORY_CALLS = "category_calls_and_notification";
 
     private static final String[] NEED_VOICE_CAPABILITY = {
             KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS,
@@ -81,8 +71,7 @@
     private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
     private static final int MSG_UPDATE_NOTIFICATION_SUMMARY = 2;
 
-    private CheckBoxPreference mVibrateOnRing;
-    private ListPreference mSilentMode;
+    private CheckBoxPreference mVibrateWhenRinging;
     private CheckBoxPreference mDtmfTone;
     private CheckBoxPreference mSoundEffects;
     private CheckBoxPreference mHapticFeedback;
@@ -95,15 +84,6 @@
 
     private AudioManager mAudioManager;
 
-    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) {
-                updateState(false);
-            }
-        }
-    };
-
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
             switch (msg.what) {
@@ -134,16 +114,14 @@
             getPreferenceScreen().removePreference(findPreference(KEY_EMERGENCY_TONE));
         }
 
-        mSilentMode = (ListPreference) findPreference(KEY_SILENT_MODE);
         if (!getResources().getBoolean(R.bool.has_silent_mode)) {
-            getPreferenceScreen().removePreference(mSilentMode);
             findPreference(KEY_RING_VOLUME).setDependency(null);
-        } else {
-            mSilentMode.setOnPreferenceChangeListener(this);
         }
 
-        mVibrateOnRing = (CheckBoxPreference) findPreference(KEY_VIBRATE);
-        mVibrateOnRing.setOnPreferenceChangeListener(this);
+        mVibrateWhenRinging = (CheckBoxPreference) findPreference(KEY_VIBRATE);
+        mVibrateWhenRinging.setPersistent(false);
+        mVibrateWhenRinging.setChecked(Settings.System.getInt(resolver,
+                Settings.System.VIBRATE_WHEN_RINGING, 0) != 0);
 
         mDtmfTone = (CheckBoxPreference) findPreference(KEY_DTMF_TONE);
         mDtmfTone.setPersistent(false);
@@ -165,8 +143,9 @@
         mRingtonePreference = findPreference(KEY_RINGTONE);
         mNotificationPreference = findPreference(KEY_NOTIFICATION_SOUND);
 
-        if (!((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
-            getPreferenceScreen().removePreference(mVibrateOnRing);
+        Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+        if (vibrator == null || !vibrator.hasVibrator()) {
+            getPreferenceScreen().removePreference(mVibrateWhenRinging);
             getPreferenceScreen().removePreference(mHapticFeedback);
         }
 
@@ -220,65 +199,7 @@
     public void onResume() {
         super.onResume();
 
-        updateState(true);
         lookupRingtoneNames();
-
-        IntentFilter filter = new IntentFilter(AudioManager.RINGER_MODE_CHANGED_ACTION);
-        getActivity().registerReceiver(mReceiver, filter);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-
-        getActivity().unregisterReceiver(mReceiver);
-    }
-
-    /**
-     * Put the audio system into the correct vibrate setting
-     */
-    private void setPhoneVibrateSettingValue(boolean vibeOnRing) {
-        // If vibrate-on-ring is checked, use VIBRATE_SETTING_ON
-        // Otherwise vibrate is off when ringer is silent
-        int vibrateMode = vibeOnRing ? AudioManager.VIBRATE_SETTING_ON
-                : AudioManager.VIBRATE_SETTING_ONLY_SILENT;
-        mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER, vibrateMode);
-        mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION, vibrateMode);
-    }
-
-    private void setPhoneSilentSettingValue(String value) {
-        int ringerMode = AudioManager.RINGER_MODE_NORMAL;
-        if (value.equals(SILENT_MODE_MUTE)) {
-            ringerMode = AudioManager.RINGER_MODE_SILENT;
-        } else if (value.equals(SILENT_MODE_VIBRATE)) {
-            ringerMode = AudioManager.RINGER_MODE_VIBRATE;
-        }
-        mAudioManager.setRingerMode(ringerMode);
-    }
-
-    private String getPhoneSilentModeSettingValue() {
-        switch (mAudioManager.getRingerMode()) {
-        case AudioManager.RINGER_MODE_NORMAL:
-            return SILENT_MODE_OFF;
-        case AudioManager.RINGER_MODE_VIBRATE:
-            return SILENT_MODE_VIBRATE;
-        case AudioManager.RINGER_MODE_SILENT:
-            return SILENT_MODE_MUTE;
-        }
-        // Shouldn't happen
-        return SILENT_MODE_OFF;
-    }
-
-    // updateState in fact updates the UI to reflect the system state
-    private void updateState(boolean force) {
-        if (getActivity() == null) return;
-
-        final int vibrateMode = mAudioManager.getVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER);
-
-        mVibrateOnRing.setChecked(vibrateMode == AudioManager.VIBRATE_SETTING_ON);
-        mSilentMode.setValue(getPhoneSilentModeSettingValue());
-
-        mSilentMode.setSummary(mSilentMode.getEntry());
     }
 
     private void updateRingtoneName(int type, Preference preference, int msg) {
@@ -314,7 +235,10 @@
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (preference == mDtmfTone) {
+        if (preference == mVibrateWhenRinging) {
+            Settings.System.putInt(getContentResolver(), Settings.System.VIBRATE_WHEN_RINGING,
+                    mVibrateWhenRinging.isChecked() ? 1 : 0);
+        } else if (preference == mDtmfTone) {
             Settings.System.putInt(getContentResolver(), Settings.System.DTMF_TONE_WHEN_DIALING,
                     mDtmfTone.isChecked() ? 1 : 0);
 
@@ -353,12 +277,13 @@
             } catch (NumberFormatException e) {
                 Log.e(TAG, "could not persist emergency tone setting", e);
             }
-        } else if (preference == mVibrateOnRing) {
-            setPhoneVibrateSettingValue((Boolean) objValue);
-        } else if (preference == mSilentMode) {
-            setPhoneSilentSettingValue(objValue.toString());
         }
 
         return true;
     }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_sound;
+    }
 }
diff --git a/src/com/android/settings/SubSettings.java b/src/com/android/settings/SubSettings.java
index 9cd3c31..eb275ad 100644
--- a/src/com/android/settings/SubSettings.java
+++ b/src/com/android/settings/SubSettings.java
@@ -21,4 +21,10 @@
  * since for our app it is a special singleTask class.
  */
 public class SubSettings extends Settings {
+
+    @Override
+    public boolean onNavigateUp() {
+        finish();
+        return true;
+    }
 }
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 867f733..77a72a7 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -37,6 +37,7 @@
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -58,14 +59,8 @@
     private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
     private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
     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_";
-    private static final String HELP_URL = "file:///android_asset/html/%y%z/tethering_%xhelp.html";
-    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 static final int DIALOG_AP_SETTINGS = 1;
 
     private WebView mView;
     private CheckBoxPreference mUsbTether;
@@ -75,8 +70,6 @@
 
     private CheckBoxPreference mBluetoothTether;
 
-    private PreferenceScreen mTetherHelp;
-
     private BroadcastReceiver mTetherChangeReceiver;
 
     private String[] mUsbRegexs;
@@ -130,7 +123,6 @@
         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);
@@ -204,50 +196,7 @@
 
     @Override
     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
-            final AssetManager am = getActivity().getAssets();
-            String path = HELP_PATH.replace("%y", locale.getLanguage().toLowerCase());
-            path = path.replace("%z", '_'+locale.getCountry().toLowerCase());
-            boolean useCountry = true;
-            InputStream is = null;
-            try {
-                is = am.open(path);
-            } catch (Exception ignored) {
-                useCountry = false;
-            } finally {
-                if (is != null) {
-                    try {
-                        is.close();
-                    } catch (Exception ignored) {}
-                }
-            }
-            String url = HELP_URL.replace("%y", locale.getLanguage().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)) {
-                url = url.replace("%x", WIFI_HELP_MODIFIER);
-            } else {
-                // could assert that both wifi and usb have regexs, but the default
-                // is to use this anyway so no check is needed
-                url = url.replace("%x", "");
-            }
-
-            mView.loadUrl(url);
-            // 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) {
+        if (id == DIALOG_AP_SETTINGS) {
             final Activity activity = getActivity();
             mDialog = new WifiApDialog(activity, this, mWifiConfig);
             return mDialog;
@@ -476,6 +425,9 @@
     }
 
     boolean isProvisioningNeeded() {
+        if (SystemProperties.getBoolean("net.tethering.noprovisioning", false)) {
+            return false;
+        }
         return mProvisionApp.length == 2;
     }
 
@@ -584,9 +536,6 @@
                     mBluetoothTether.setSummary(R.string.bluetooth_tethering_off_subtext);
                 }
             }
-        } else if (preference == mTetherHelp) {
-            showDialog(DIALOG_TETHER_HELP);
-            return true;
         } else if (preference == mCreateNetwork) {
             showDialog(DIALOG_AP_SETTINGS);
         }
@@ -627,4 +576,9 @@
             }
         }
     }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_tether;
+    }
 }
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 496947b..b561ed4 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -20,6 +20,7 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ListFragment;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -27,6 +28,7 @@
 import android.os.Bundle;
 import android.provider.UserDictionary;
 import android.text.InputType;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -44,22 +46,19 @@
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 
-import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
+import com.android.settings.inputmethod.UserDictionaryAddWordContents;
 
 import java.util.Locale;
 
-public class UserDictionarySettings extends ListFragment implements DialogCreatable {
+public class UserDictionarySettings extends ListFragment {
     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";
-
     private static final String[] QUERY_PROJECTION = {
-        UserDictionary.Words._ID, UserDictionary.Words.WORD
+        UserDictionary.Words._ID, UserDictionary.Words.WORD, UserDictionary.Words.SHORTCUT
     };
 
-    private static final int INDEX_ID = 0;
-    private static final int INDEX_WORD = 1;
+    // The index of the shortcut in the above array.
+    private static final int INDEX_SHORTCUT = 2;
 
     // Either the locale is empty (means the word is applicable to all locales)
     // or the word equals our current locale
@@ -68,28 +67,18 @@
     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 String DELETE_SELECTION_WITH_SHORTCUT = UserDictionary.Words.WORD
+            + "=? AND " + UserDictionary.Words.SHORTCUT + "=?";
+    private static final String DELETE_SELECTION_WITHOUT_SHORTCUT = UserDictionary.Words.WORD
+            + "=? AND " + UserDictionary.Words.SHORTCUT + " is null OR "
+            + UserDictionary.Words.SHORTCUT + "=''";
 
     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;
-
-    private SettingsDialogFragment mDialogFragment;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -135,31 +124,6 @@
 
         setHasOptionsMenu(true);
 
-        if (savedInstanceState != null) {
-            mDialogEditingWord = savedInstanceState.getString(INSTANCE_KEY_DIALOG_EDITING_WORD);
-            mAddedWordAlready = savedInstanceState.getBoolean(INSTANCE_KEY_ADDED_WORD, false);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        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
-    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(final String locale) {
@@ -189,15 +153,16 @@
     private ListAdapter createAdapter() {
         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);
+                new String[] { UserDictionary.Words.WORD, UserDictionary.Words.SHORTCUT },
+                new int[] { android.R.id.text1, android.R.id.text2 }, this);
     }
 
     @Override
     public void onListItemClick(ListView l, View v, int position, long id) {
-        String word = getWord(position);
+        final String word = getWord(position);
+        final String shortcut = getShortcut(position);
         if (word != null) {
-            showAddOrEditDialog(word);
+            showAddOrEditDialog(word, shortcut);
         }
     }
 
@@ -212,16 +177,34 @@
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        showAddOrEditDialog(null);
-        return true;
+        if (item.getItemId() == OPTIONS_MENU_ADD) {
+            showAddOrEditDialog(null, null);
+            return true;
+        }
+        return false;
     }
 
-    private void showAddOrEditDialog(String editingWord) {
-        mDialogEditingWord = editingWord;
-        showDialog(DIALOG_ADD_OR_EDIT);
+    /**
+     * Add or edit a word. If editingWord is null, it's an add; otherwise, it's an edit.
+     * @param editingWord the word to edit, or null if it's an add.
+     * @param editingShortcut the shortcut for this entry, or null if none.
+     */
+    private void showAddOrEditDialog(final String editingWord, final String editingShortcut) {
+        final Bundle args = new Bundle();
+        args.putInt(UserDictionaryAddWordContents.EXTRA_MODE, null == editingWord
+                ? UserDictionaryAddWordContents.MODE_INSERT
+                : UserDictionaryAddWordContents.MODE_EDIT);
+        args.putString(UserDictionaryAddWordContents.EXTRA_WORD, editingWord);
+        args.putString(UserDictionaryAddWordContents.EXTRA_SHORTCUT, editingShortcut);
+        args.putString(UserDictionaryAddWordContents.EXTRA_LOCALE, mLocale);
+        android.preference.PreferenceActivity pa =
+                (android.preference.PreferenceActivity)getActivity();
+        pa.startPreferencePanel(
+                com.android.settings.inputmethod.UserDictionaryAddWordFragment.class.getName(),
+                args, R.string.user_dict_settings_add_dialog_title, null, null, 0);
     }
 
-    private String getWord(int position) {
+    private String getWord(final int position) {
         if (null == mCursor) return null;
         mCursor.moveToPosition(position);
         // Handle a possible race-condition
@@ -231,96 +214,45 @@
                 mCursor.getColumnIndexOrThrow(UserDictionary.Words.WORD));
     }
 
-    @Override
-    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);
+    private String getShortcut(final int position) {
+        if (null == mCursor) return null;
+        mCursor.moveToPosition(position);
+        // Handle a possible race-condition
+        if (mCursor.isAfterLast()) return null;
 
-        AlertDialog dialog = dialogBuilder
-                .setTitle(mDialogEditingWord != null 
-                        ? R.string.user_dict_settings_edit_dialog_title 
-                        : R.string.user_dict_settings_add_dialog_title)
-                .setView(content)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        onAddOrEditFinished(editText.getText().toString());
-                        if (mAutoReturn) activity.onBackPressed();
-                    }})
-                .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (mAutoReturn) activity.onBackPressed();
-                    }})
-                .create();
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
-                WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        return dialog;
+        return mCursor.getString(
+                mCursor.getColumnIndexOrThrow(UserDictionary.Words.SHORTCUT));
     }
 
-    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) {
-        if (mDialogEditingWord != null) {
-            // 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.
-        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);
+    public static void deleteWord(final String word, final String shortcut,
+            final ContentResolver resolver) {
+        if (TextUtils.isEmpty(shortcut)) {
+            resolver.delete(
+                    UserDictionary.Words.CONTENT_URI, DELETE_SELECTION_WITHOUT_SHORTCUT,
+                    new String[] { word });
         } 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);
+            resolver.delete(
+                    UserDictionary.Words.CONTENT_URI, DELETE_SELECTION_WITH_SHORTCUT,
+                    new String[] { word, shortcut });
         }
-        if (null != mCursor && !mCursor.requery()) {
-            throw new IllegalStateException("can't requery on already-closed cursor.");
-        }
-        mAddedWordAlready = true;
     }
 
-    private void deleteWord(String word) {
-        getActivity().getContentResolver().delete(
-                UserDictionary.Words.CONTENT_URI, DELETE_SELECTION, new String[] { word });
-    }
-
-    private static class MyAdapter extends SimpleCursorAdapter implements SectionIndexer,
-            View.OnClickListener {
+    private static class MyAdapter extends SimpleCursorAdapter implements SectionIndexer {
 
         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));
+                if (columnIndex == INDEX_SHORTCUT) {
+                    final String shortcut = c.getString(INDEX_SHORTCUT);
+                    if (TextUtils.isEmpty(shortcut)) {
+                        v.setVisibility(View.GONE);
+                    } else {
+                        ((TextView)v).setText(shortcut);
+                        v.setVisibility(View.VISIBLE);
+                    }
+                    v.invalidate();
                     return true;
                 }
 
@@ -332,7 +264,6 @@
                 UserDictionarySettings settings) {
             super(context, layout, c, from, to);
 
-            mSettings = settings;
             if (null != c) {
                 final String alphabet = context.getString(
                         com.android.internal.R.string.fast_scroll_alphabet);
@@ -353,9 +284,5 @@
         public Object[] 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 582891d..a029342 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -407,7 +407,7 @@
             final int paddingBottom = res.getDimensionPixelSize(
                     com.android.internal.R.dimen.preference_fragment_padding_bottom);
 
-            final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingBottom;
+            final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingSide;
             list.setPadding(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom);
         }
     }
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 13f6902..3b67ec3 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -37,7 +37,7 @@
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.settings.nfc.NfcEnabler;
-import com.android.settings.wifi.p2p.WifiP2pEnabler;
+import com.android.settings.NsdEnabler;
 
 public class WirelessSettings extends SettingsPreferenceFragment {
 
@@ -46,11 +46,10 @@
     private static final String KEY_WIMAX_SETTINGS = "wimax_settings";
     private static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_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 String KEY_TOGGLE_NSD = "toggle_nsd"; //network service discovery
 
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
     public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -59,8 +58,7 @@
     private CheckBoxPreference mAirplaneModePreference;
     private NfcEnabler mNfcEnabler;
     private NfcAdapter mNfcAdapter;
-
-    private WifiP2pEnabler mWifiP2pEnabler;
+    private NsdEnabler mNsdEnabler;
 
     /**
      * Invoked on each preference click in this hierarchy, overrides
@@ -101,12 +99,15 @@
         mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
         CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
         PreferenceScreen androidBeam = (PreferenceScreen) findPreference(KEY_ANDROID_BEAM_SETTINGS);
-
-        CheckBoxPreference wifiP2p = (CheckBoxPreference) findPreference(KEY_TOGGLE_WIFI_P2P);
+        CheckBoxPreference nsd = (CheckBoxPreference) findPreference(KEY_TOGGLE_NSD);
 
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
 
+        // Remove NSD checkbox by default
+        getPreferenceScreen().removePreference(nsd);
+        //mNsdEnabler = new NsdEnabler(activity, nsd);
+
         String toggleable = Settings.System.getString(activity.getContentResolver(),
                 Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
 
@@ -153,15 +154,6 @@
             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);
-        } else {
-            mWifiP2pEnabler = new WifiP2pEnabler(activity, wifiP2p);
-        }
-        getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
-
         // Enable Proxy selector settings if allowed.
         Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);
         DevicePolicyManager mDPM = (DevicePolicyManager)
@@ -189,9 +181,8 @@
         if (mNfcEnabler != null) {
             mNfcEnabler.resume();
         }
-
-        if (mWifiP2pEnabler != null) {
-            mWifiP2pEnabler.resume();
+        if (mNsdEnabler != null) {
+            mNsdEnabler.resume();
         }
     }
 
@@ -203,9 +194,8 @@
         if (mNfcEnabler != null) {
             mNfcEnabler.pause();
         }
-
-        if (mWifiP2pEnabler != null) {
-            mWifiP2pEnabler.pause();
+        if (mNsdEnabler != null) {
+            mNsdEnabler.pause();
         }
     }
 
@@ -218,4 +208,9 @@
                     mAirplaneModePreference.isChecked());
         }
     }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_more_networks;
+    }
 }
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index a0d6a7f..2759a8f 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -17,6 +17,7 @@
 package com.android.settings.accounts;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,6 +28,7 @@
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
 import android.accounts.OnAccountsUpdateListener;
+import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SyncAdapterType;
@@ -38,6 +40,7 @@
 import android.os.Handler;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.text.format.DateFormat;
 import android.util.Log;
 
 class AccountPreferenceBase extends SettingsPreferenceFragment
@@ -46,12 +49,12 @@
     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;
+    private AuthenticatorHelper mAuthenticatorHelper = new AuthenticatorHelper();
+    private java.text.DateFormat mDateFormat;
+    private java.text.DateFormat mTimeFormat;
 
     /**
      * Overload to handle account updates.
@@ -75,6 +78,16 @@
     }
 
     @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final Activity activity = getActivity();
+
+        mDateFormat = DateFormat.getDateFormat(activity);
+        mTimeFormat = DateFormat.getTimeFormat(activity);
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         mStatusChangeListenerHandle = ContentResolver.addStatusChangeListener(
@@ -91,7 +104,6 @@
         ContentResolver.removeStatusChangeListener(mStatusChangeListenerHandle);
     }
 
-
     private SyncStatusObserver mSyncStatusObserver = new SyncStatusObserver() {
         public void onStatusChanged(int which) {
             mHandler.post(new Runnable() {
@@ -124,64 +136,21 @@
     }
 
     /**
-     * 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) {
+    public PreferenceScreen addPreferencesForType(final String accountType,
+            PreferenceScreen parent) {
         PreferenceScreen prefs = null;
-        if (mTypeToAuthDescription.containsKey(accountType)) {
+        if (mAuthenticatorHelper.containsAccountType(accountType)) {
             AuthenticatorDescription desc = null;
             try {
-                desc = mTypeToAuthDescription.get(accountType);
+                desc = mAuthenticatorHelper.getAccountTypeDescription(accountType);
                 if (desc != null && desc.accountPreferencesId != 0) {
                     Context authContext = getActivity().createPackageContext(desc.packageName, 0);
                     prefs = getPreferenceManager().inflateFromResource(authContext,
-                            desc.accountPreferencesId, getPreferenceScreen());
+                            desc.accountPreferencesId, parent);
                 }
             } catch (PackageManager.NameNotFoundException e) {
                 Log.w(TAG, "Couldn't load preferences.xml file from " + desc.packageName);
@@ -192,15 +161,21 @@
         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]);
-        }
+    public void updateAuthDescriptions() {
+        mAuthenticatorHelper.updateAuthDescriptions(getActivity());
         onAuthDescriptionsUpdated();
     }
+
+    protected Drawable getDrawableForType(final String accountType) {
+        return mAuthenticatorHelper.getDrawableForType(getActivity(), accountType);
+    }
+
+    protected CharSequence getLabelForType(final String accountType) {
+        return mAuthenticatorHelper.getLabelForType(getActivity(), accountType);
+    }
+
+    protected String formatSyncDate(Date date) {
+        // TODO: Switch to using DateUtils.formatDateTime
+        return mDateFormat.format(date) + " " + mTimeFormat.format(date);
+    }
 }
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 6847607..196908e 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -63,9 +63,9 @@
 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 MENU_SYNC_NOW_ID       = Menu.FIRST;
+    private static final int MENU_SYNC_CANCEL_ID    = Menu.FIRST + 1;
+    private static final int MENU_REMOVE_ACCOUNT_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;
@@ -73,8 +73,6 @@
     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.
@@ -98,6 +96,10 @@
                                 .removeAccount(mAccount,
                                 new AccountManagerCallback<Boolean>() {
                             public void run(AccountManagerFuture<Boolean> future) {
+                                // If already out of this screen, don't proceed.
+                                if (!AccountSyncSettings.this.isResumed()) {
+                                    return;
+                                }
                                 boolean failed = true;
                                 try {
                                     if (future.getResult() == true) {
@@ -168,11 +170,6 @@
     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.");
@@ -208,11 +205,13 @@
                 new SyncStateCheckBoxPreference(getActivity(), account, authority);
         item.setPersistent(false);
         final ProviderInfo providerInfo = getPackageManager().resolveContentProvider(authority, 0);
-        CharSequence providerLabel = providerInfo != null
-                ? providerInfo.loadLabel(getPackageManager()) : null;
+        if (providerInfo == null) {
+            return;
+        }
+        CharSequence providerLabel = providerInfo.loadLabel(getPackageManager());
         if (TextUtils.isEmpty(providerLabel)) {
             Log.e(TAG, "Provider needs a label for authority '" + authority + "'");
-            providerLabel = authority;
+            return;
         }
         String title = getString(R.string.sync_item_title, providerLabel);
         item.setTitle(title);
@@ -222,17 +221,16 @@
 
     @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))
+                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))
+                getString(R.string.sync_menu_sync_cancel))
                 .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
+        MenuItem removeAccount = menu.add(0, MENU_REMOVE_ACCOUNT_ID, 0,
+                getString(R.string.remove_account_label))
+                .setIcon(R.drawable.ic_menu_delete_holo_dark);
 
         removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
@@ -240,6 +238,8 @@
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         syncCancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+
+        super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
@@ -394,11 +394,14 @@
             }
 
             final long successEndTime = (status == null) ? 0 : status.lastSuccessTime;
-            if (successEndTime != 0) {
+            if (!syncEnabled) {
+                syncPref.setSummary(R.string.sync_disabled);
+            } else if (activelySyncing) {
+                syncPref.setSummary(R.string.sync_in_progress);
+            } else if (successEndTime != 0) {
                 date.setTime(successEndTime);
-                final String timeString = mDateFormat.format(date) + " "
-                        + mTimeFormat.format(date);
-                syncPref.setSummary(timeString);
+                final String timeString = formatSyncDate(date);
+                syncPref.setSummary(getResources().getString(R.string.last_synced, timeString));
             } else {
                 syncPref.setSummary("");
             }
@@ -498,25 +501,12 @@
         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);
-            }
-        }
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_accounts;
     }
 }
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java
new file mode 100644
index 0000000..eba785b
--- /dev/null
+++ b/src/com/android/settings/accounts/AuthenticatorHelper.java
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.accounts;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class AuthenticatorHelper {
+
+    private static final String TAG = "AuthenticatorHelper";
+    private Map<String, AuthenticatorDescription> mTypeToAuthDescription
+            = new HashMap<String, AuthenticatorDescription>();
+    private AuthenticatorDescription[] mAuthDescs;
+    private ArrayList<String> mEnabledAccountTypes = new ArrayList<String>();
+    private Map<String, Drawable> mAccTypeIconCache = new HashMap<String, Drawable>();
+
+    public AuthenticatorHelper() {
+    }
+
+    public String[] getEnabledAccountTypes() {
+        return mEnabledAccountTypes.toArray(new String[mEnabledAccountTypes.size()]);
+    }
+
+    /**
+     * 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.
+     */
+    public Drawable getDrawableForType(Context context, final String accountType) {
+        Drawable icon = null;
+        if (mAccTypeIconCache.containsKey(accountType)) {
+            return mAccTypeIconCache.get(accountType);
+        }
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            try {
+                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+                Context authContext = context.createPackageContext(desc.packageName, 0);
+                icon = authContext.getResources().getDrawable(desc.iconId);
+                mAccTypeIconCache.put(accountType, icon);
+            } catch (PackageManager.NameNotFoundException e) {
+            } catch (Resources.NotFoundException e) {
+            }
+        }
+        if (icon == null) {
+            icon = context.getPackageManager().getDefaultActivityIcon();
+        }
+        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.
+     */
+    public CharSequence getLabelForType(Context context, final String accountType) {
+        CharSequence label = null;
+        if (mTypeToAuthDescription.containsKey(accountType)) {
+            try {
+                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
+                Context authContext = context.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;
+    }
+
+    /**
+     * Updates provider icons. Subclasses should call this in onCreate()
+     * and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
+     */
+    public void updateAuthDescriptions(Context context) {
+        mAuthDescs = AccountManager.get(context).getAuthenticatorTypes();
+        for (int i = 0; i < mAuthDescs.length; i++) {
+            mTypeToAuthDescription.put(mAuthDescs[i].type, mAuthDescs[i]);
+        }
+    }
+
+    public void onAccountsUpdated(Context context, Account[] accounts) {
+        if (accounts == null) {
+            accounts = AccountManager.get(context).getAccounts();
+        }
+        mEnabledAccountTypes.clear();
+        mAccTypeIconCache.clear();
+        for (Account account: accounts) {
+            if (!mEnabledAccountTypes.contains(account.type)) {
+                mEnabledAccountTypes.add(account.type);
+            }
+        }
+    }
+
+    public boolean containsAccountType(String accountType) {
+        return mTypeToAuthDescription.containsKey(accountType);
+    }
+
+    public AuthenticatorDescription getAccountTypeDescription(String accountType) {
+        return mTypeToAuthDescription.get(accountType);
+    }
+
+    public boolean hasAccountPreferences(final String accountType) {
+        if (containsAccountType(accountType)) {
+            AuthenticatorDescription desc = getAccountTypeDescription(accountType);
+            if (desc != null && desc.accountPreferencesId != 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 0177491..a27fbbd 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -21,16 +21,22 @@
 import android.accounts.OnAccountsUpdateListener;
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SyncAdapterType;
 import android.content.SyncInfo;
 import android.content.SyncStatusInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -44,16 +50,22 @@
 import android.widget.TextView;
 
 import com.android.settings.AccountPreference;
-import com.android.settings.DialogCreatable;
 import com.android.settings.R;
+import com.android.settings.Settings;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashSet;
 
 public class ManageAccountsSettings extends AccountPreferenceBase
-        implements OnAccountsUpdateListener, DialogCreatable {
+        implements OnAccountsUpdateListener {
 
-    private static final int MENU_ADD_ACCOUNT = Menu.FIRST;
+    private static final String ACCOUNT_KEY = "account"; // to pass to auth settings
+    public static final String KEY_ACCOUNT_TYPE = "account_type";
+    public static final String KEY_ACCOUNT_LABEL = "account_label";
+
+    private static final int MENU_SYNC_NOW_ID = Menu.FIRST;
+    private static final int MENU_SYNC_CANCEL_ID    = Menu.FIRST + 1;
 
     private static final int REQUEST_SHOW_SYNC_SETTINGS = 1;
 
@@ -61,12 +73,19 @@
     private TextView mErrorInfoView;
 
     private SettingsDialogFragment mDialogFragment;
-    private Switch mAutoSyncSwitch;
+    // If an account type is set, then show only accounts of that type
+    private String mAccountType;
+    // Temporary hack, to deal with backward compatibility 
+    private Account mFirstAccount;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        Bundle args = getArguments();
+        if (args != null && args.containsKey(KEY_ACCOUNT_TYPE)) {
+            mAccountType = args.getString(KEY_ACCOUNT_TYPE);
+        }
         addPreferencesFromResource(R.xml.manage_accounts_settings);
         setHasOptionsMenu(true);
     }
@@ -76,12 +95,6 @@
         super.onStart();
         Activity activity = getActivity();
         AccountManager.get(activity).addOnAccountsUpdatedListener(this, null, true);
-        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                ActionBar.DISPLAY_SHOW_CUSTOM);
-        activity.getActionBar().setCustomView(mAutoSyncSwitch, new ActionBar.LayoutParams(
-                ActionBar.LayoutParams.WRAP_CONTENT,
-                ActionBar.LayoutParams.WRAP_CONTENT,
-                Gravity.CENTER_VERTICAL | Gravity.RIGHT));
     }
 
     @Override
@@ -101,23 +114,12 @@
         mErrorInfoView = (TextView)view.findViewById(R.id.sync_settings_error_info);
         mErrorInfoView.setVisibility(View.GONE);
 
-        mAutoSyncSwitch = new Switch(activity);
-
-        // TODO Where to put the switch in tablet multipane layout?
-        final int padding = activity.getResources().getDimensionPixelSize(
-                R.dimen.action_bar_switch_padding);
-        mAutoSyncSwitch.setPadding(0, 0, padding, 0);
-        mAutoSyncSwitch.setChecked(ContentResolver.getMasterSyncAutomatically());
-        mAutoSyncSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                ContentResolver.setMasterSyncAutomatically(isChecked);
-                onSyncStateUpdated();
-            }
-        });
-
         mAuthorities = activity.getIntent().getStringArrayExtra(AUTHORITIES_FILTER_KEY);
 
+        Bundle args = getArguments();
+        if (args != null && args.containsKey(KEY_ACCOUNT_LABEL)) {
+            getActivity().setTitle(args.getString(KEY_ACCOUNT_LABEL));
+        }
         updateAuthDescriptions();
     }
 
@@ -150,29 +152,60 @@
     }
 
     @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));
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        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);
+        super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        MenuItem addAccountItem = menu.add(0, MENU_ADD_ACCOUNT, 0, R.string.add_account_label);
-        addAccountItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
-                | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+    public void onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        boolean syncActive = ContentResolver.getCurrentSync() != null;
+        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive && mFirstAccount != null);
+        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive && mFirstAccount != null);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        final int itemId = item.getItemId();
-        if (itemId == MENU_ADD_ACCOUNT) {
-            onAddAccountClicked();
+        switch (item.getItemId()) {
+        case MENU_SYNC_NOW_ID:
+            requestOrCancelSyncForAccounts(true);
             return true;
-        } else {
-            return super.onOptionsItemSelected(item);
+        case MENU_SYNC_CANCEL_ID:
+            requestOrCancelSyncForAccounts(false);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void requestOrCancelSyncForAccounts(boolean sync) {
+        SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypes();
+        Bundle extras = new Bundle();
+        extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
+        int count = getPreferenceScreen().getPreferenceCount();
+        // For each account
+        for (int i = 0; i < count; i++) {
+            Preference pref = getPreferenceScreen().getPreference(i);
+            if (pref instanceof AccountPreference) {
+                Account account = ((AccountPreference) pref).getAccount();
+                // For all available sync authorities, sync those that are enabled for the account
+                for (int j = 0; j < syncAdapters.length; j++) {
+                    SyncAdapterType sa = syncAdapters[j];
+                    if (syncAdapters[j].accountType.equals(mAccountType)
+                            && ContentResolver.getSyncAutomatically(account, sa.authority)) {
+                        if (sync) {
+                            ContentResolver.requestSync(account, sa.authority, extras);
+                        } else {
+                            ContentResolver.cancelSync(account, sa.authority);
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -180,15 +213,12 @@
     protected void onSyncStateUpdated() {
         // Catch any delayed delivery of update messages
         if (getActivity() == null) return;
-        // Set background connection state
-        if (mAutoSyncSwitch != null) {
-            mAutoSyncSwitch.setChecked(ContentResolver.getMasterSyncAutomatically());
-        }
 
         // 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
+        Date date = new Date();
 
         // only track userfacing sync adapters when deciding if account is synced or not
         final SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypes();
@@ -208,8 +238,10 @@
             AccountPreference accountPref = (AccountPreference) pref;
             Account account = accountPref.getAccount();
             int syncCount = 0;
+            long lastSuccessTime = 0;
             boolean syncIsFailing = false;
             final ArrayList<String> authorities = accountPref.getAuthorities();
+            boolean syncingNow = false;
             if (authorities != null) {
                 for (String authority : authorities) {
                     SyncStatusInfo status = ContentResolver.getSyncStatus(account, authority);
@@ -230,6 +262,10 @@
                         syncIsFailing = true;
                         anySyncFailed = true;
                     }
+                    syncingNow |= activelySyncing;
+                    if (status != null && lastSuccessTime < status.lastSuccessTime) {
+                        lastSuccessTime = status.lastSuccessTime;
+                    }
                     syncCount += syncEnabled && userFacing.contains(authority) ? 1 : 0;
                 }
             } else {
@@ -237,15 +273,26 @@
                     Log.v(TAG, "no syncadapters found for " + account);
                 }
             }
-            int syncStatus = AccountPreference.SYNC_DISABLED;
             if (syncIsFailing) {
-                syncStatus = AccountPreference.SYNC_ERROR;
+                accountPref.setSyncStatus(AccountPreference.SYNC_ERROR, true);
             } else if (syncCount == 0) {
-                syncStatus = AccountPreference.SYNC_DISABLED;
+                accountPref.setSyncStatus(AccountPreference.SYNC_DISABLED, true);
             } else if (syncCount > 0) {
-                syncStatus = AccountPreference.SYNC_ENABLED;
+                if (syncingNow) {
+                    accountPref.setSyncStatus(AccountPreference.SYNC_IN_PROGRESS, true);
+                } else {
+                    accountPref.setSyncStatus(AccountPreference.SYNC_ENABLED, true);
+                    if (lastSuccessTime > 0) {
+                        accountPref.setSyncStatus(AccountPreference.SYNC_ENABLED, false);
+                        date.setTime(lastSuccessTime);
+                        final String timeString = formatSyncDate(date);
+                        accountPref.setSummary(getResources().getString(
+                                R.string.last_synced, timeString));
+                    }
+                }
+            } else {
+                accountPref.setSyncStatus(AccountPreference.SYNC_DISABLED, true);
             }
-            accountPref.setSyncStatus(syncStatus);
         }
 
         mErrorInfoView.setVisibility(anySyncFailed ? View.VISIBLE : View.GONE);
@@ -255,8 +302,12 @@
     public void onAccountsUpdated(Account[] accounts) {
         if (getActivity() == null) return;
         getPreferenceScreen().removeAll();
+        mFirstAccount = null;
+        addPreferencesFromResource(R.xml.manage_accounts_settings);
         for (int i = 0, n = accounts.length; i < n; i++) {
             final Account account = accounts[i];
+            // If an account type is specified for this screen, skip other types
+            if (mAccountType != null && !account.type.equals(mAccountType)) continue;
             final ArrayList<String> auths = getAuthoritiesForAccountType(account.type);
 
             boolean showAccount = true;
@@ -273,26 +324,58 @@
             if (showAccount) {
                 final Drawable icon = getDrawableForType(account.type);
                 final AccountPreference preference =
-                        new AccountPreference(getActivity(), account, icon, auths);
+                        new AccountPreference(getActivity(), account, icon, auths, false);
                 getPreferenceScreen().addPreference(preference);
+                if (mFirstAccount == null) {
+                    mFirstAccount = account;
+                }
             }
         }
+        if (mAccountType != null && mFirstAccount != null) {
+            addAuthenticatorSettings();
+        } else {
+            // There's no account, reset to top-level of settings
+            Intent settingsTop = new Intent(android.provider.Settings.ACTION_SETTINGS);
+            settingsTop.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            getActivity().startActivity(settingsTop);
+        }
         onSyncStateUpdated();
     }
 
+    private void addAuthenticatorSettings() {
+        PreferenceScreen prefs = addPreferencesForType(mAccountType, getPreferenceScreen());
+        if (prefs != null) {
+            updatePreferenceIntents(prefs);
+        }
+    }
+
+    private void updatePreferenceIntents(PreferenceScreen prefs) {
+        PackageManager pm = getActivity().getPackageManager();
+        for (int i = 0; i < prefs.getPreferenceCount();) {
+            Intent intent = prefs.getPreference(i).getIntent();
+            if (intent != null) {
+                ResolveInfo ri = pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
+                if (ri == null) {
+                    prefs.removePreference(prefs.getPreference(i));
+                    continue;
+                } else {
+                    intent.putExtra(ACCOUNT_KEY, mFirstAccount);
+                    intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
+                }
+            }
+            i++;
+        }
+    }
+
     @Override
     protected void onAuthDescriptionsUpdated() {
         // Update account icons for all account preference items
         for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
-            AccountPreference pref = (AccountPreference) getPreferenceScreen().getPreference(i);
-            pref.setProviderIcon(getDrawableForType(pref.getAccount().type));
-            pref.setSummary(getLabelForType(pref.getAccount().type));
+            Preference pref = getPreferenceScreen().getPreference(i);
+            if (pref instanceof AccountPreference) {
+                AccountPreference accPref = (AccountPreference) pref;
+                accPref.setSummary(getLabelForType(accPref.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/SyncSettings.java b/src/com/android/settings/accounts/SyncSettings.java
new file mode 100644
index 0000000..20c296a
--- /dev/null
+++ b/src/com/android/settings/accounts/SyncSettings.java
@@ -0,0 +1,174 @@
+/*
+ * 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.OnAccountsUpdateListener;
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.android.settings.AccountPreference;
+import com.android.settings.DialogCreatable;
+import com.android.settings.R;
+
+import java.util.ArrayList;
+
+public class SyncSettings extends AccountPreferenceBase
+        implements OnAccountsUpdateListener, DialogCreatable {
+
+    private static final String KEY_SYNC_SWITCH = "sync_switch";
+
+    private String[] mAuthorities;
+
+    private SettingsDialogFragment mDialogFragment;
+    private CheckBoxPreference mAutoSyncPreference;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        addPreferencesFromResource(R.xml.sync_settings);
+        mAutoSyncPreference =
+                (CheckBoxPreference) getPreferenceScreen().findPreference(KEY_SYNC_SWITCH);
+        mAutoSyncPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                ContentResolver.setMasterSyncAutomatically((Boolean) newValue);
+                return true;
+            }
+        });
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        Activity activity = getActivity();
+        AccountManager.get(activity).addOnAccountsUpdatedListener(this, null, true);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final Activity activity = getActivity();
+        mAutoSyncPreference.setChecked(ContentResolver.getMasterSyncAutomatically());
+        mAuthorities = activity.getIntent().getStringArrayExtra(AUTHORITIES_FILTER_KEY);
+
+        updateAuthDescriptions();
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        final Activity activity = getActivity();
+        AccountManager.get(activity).removeOnAccountsUpdatedListener(this);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) {
+        if (preference instanceof AccountPreference) {
+            startAccountSettings((AccountPreference) preference);
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    private void startAccountSettings(AccountPreference acctPref) {
+        Intent intent = new Intent("android.settings.ACCOUNT_SYNC_SETTINGS");
+        intent.putExtra(AccountSyncSettings.ACCOUNT_KEY, acctPref.getAccount());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+        finish();
+    }
+
+    @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));
+    }
+
+    private void removeAccountPreferences() {
+        PreferenceScreen parent = getPreferenceScreen();
+        for (int i = 0; i < parent.getPreferenceCount(); ) {
+            if (parent.getPreference(i) instanceof AccountPreference) {
+                parent.removePreference(parent.getPreference(i));
+            } else {
+                i++;
+            }
+        }
+    }
+
+    @Override
+    public void onAccountsUpdated(Account[] accounts) {
+        if (getActivity() == null) return;
+
+        removeAccountPreferences();
+        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, true);
+                getPreferenceScreen().addPreference(preference);
+                preference.setSummary(getLabelForType(account.type));
+            }
+        }
+        onSyncStateUpdated();
+    }
+
+    @Override
+    protected void onAuthDescriptionsUpdated() {
+        // Update account icons for all account preference items
+        for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
+            Preference pref = getPreferenceScreen().getPreference(i);
+            if (pref instanceof AccountPreference) {
+                AccountPreference accPref = (AccountPreference)
+                        getPreferenceScreen().getPreference(i);
+                accPref.setIcon(getDrawableForType(accPref.getAccount().type));
+                accPref.setSummary(getLabelForType(accPref.getAccount().type));
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/accounts/SyncSettingsActivity.java b/src/com/android/settings/accounts/SyncSettingsActivity.java
new file mode 100644
index 0000000..ed0089e
--- /dev/null
+++ b/src/com/android/settings/accounts/SyncSettingsActivity.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.accounts;
+
+import android.content.Intent;
+import android.preference.PreferenceActivity;
+
+/**
+ * Launcher activity for the SyncSettings fragment.
+ *
+ */
+public class SyncSettingsActivity extends PreferenceActivity {
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, SyncSettings.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/AppViewHolder.java b/src/com/android/settings/applications/AppViewHolder.java
new file mode 100644
index 0000000..d23f187
--- /dev/null
+++ b/src/com/android/settings/applications/AppViewHolder.java
@@ -0,0 +1,64 @@
+package com.android.settings.applications;
+
+import com.android.settings.R;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+// View Holder used when displaying views
+public class AppViewHolder {
+    public ApplicationsState.AppEntry entry;
+    public View rootView;
+    public TextView appName;
+    public ImageView appIcon;
+    public TextView appSize;
+    public TextView disabled;
+    public CheckBox checkBox;
+
+    static public AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView) {
+        if (convertView == null) {
+            convertView = inflater.inflate(R.layout.manage_applications_item, null);
+
+            // Creates a ViewHolder and store references to the two children views
+            // we want to bind data to.
+            AppViewHolder holder = new AppViewHolder();
+            holder.rootView = convertView;
+            holder.appName = (TextView) convertView.findViewById(R.id.app_name);
+            holder.appIcon = (ImageView) convertView.findViewById(R.id.app_icon);
+            holder.appSize = (TextView) convertView.findViewById(R.id.app_size);
+            holder.disabled = (TextView) convertView.findViewById(R.id.app_disabled);
+            holder.checkBox = (CheckBox) convertView.findViewById(R.id.app_on_sdcard);
+            convertView.setTag(holder);
+            return holder;
+        } else {
+            // Get the ViewHolder back to get fast access to the TextView
+            // and the ImageView.
+            return (AppViewHolder)convertView.getTag();
+        }
+    }
+
+    void updateSizeText(CharSequence invalidSizeStr, int whichSize) {
+        if (ManageApplications.DEBUG) Log.i(ManageApplications.TAG, "updateSizeText of " + entry.label + " " + entry
+                + ": " + entry.sizeStr);
+        if (entry.sizeStr != null) {
+            switch (whichSize) {
+                case ManageApplications.SIZE_INTERNAL:
+                    appSize.setText(entry.internalSizeStr);
+                    break;
+                case ManageApplications.SIZE_EXTERNAL:
+                    appSize.setText(entry.externalSizeStr);
+                    break;
+                default:
+                    appSize.setText(entry.sizeStr);
+                    break;
+            }
+        } else if (entry.size == ApplicationsState.SIZE_INVALID) {
+            appSize.setText(invalidSizeStr);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 799b34a..0a5c26e 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -227,24 +227,21 @@
     PackageIntentReceiver mPackageIntentReceiver;
 
     boolean mResumed;
-    Callbacks mCurCallbacks;
 
-    // Information about all applications.  Synchronize on mAppEntries
+    // Information about all applications.  Synchronize on mEntriesMap
     // to protect access to these.
+    final ArrayList<Session> mSessions = new ArrayList<Session>();
+    final ArrayList<Session> mRebuildingSessions = new ArrayList<Session>();
     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>();
     long mCurId = 1;
     String mCurComputingSizePkg;
+    boolean mSessionsChanged;
 
-    // Rebuilding of app list.  Synchronized on mRebuildSync.
-    final Object mRebuildSync = new Object();
-    boolean mRebuildRequested;
-    boolean mRebuildAsync;
-    AppFilter mRebuildFilter;
-    Comparator<AppEntry> mRebuildComparator;
-    ArrayList<AppEntry> mRebuildResult;
+    // Temporary for dispatching session callbacks.  Only touched by main thread.
+    final ArrayList<Session> mActiveSessions = new ArrayList<Session>();
 
     /**
      * Receives notifications when applications are added/removed.
@@ -262,6 +259,9 @@
              sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);
              mContext.registerReceiver(this, sdFilter);
          }
+         void unregisterReceiver() {
+             mContext.unregisterReceiver(this);
+         }
          @Override
          public void onReceive(Context context, Intent intent) {
              String actionStr = intent.getAction();
@@ -300,6 +300,21 @@
          }
     }
 
+    void rebuildActiveSessions() {
+        synchronized (mEntriesMap) {
+            if (!mSessionsChanged) {
+                return;
+            }
+            mActiveSessions.clear();
+            for (int i=0; i<mSessions.size(); i++) {
+                Session s = mSessions.get(i);
+                if (s.mResumed) {
+                    mActiveSessions.add(s);
+                }
+            }
+        }
+    }
+
     class MainHandler extends Handler {
         static final int MSG_REBUILD_COMPLETE = 1;
         static final int MSG_PACKAGE_LIST_CHANGED = 2;
@@ -310,35 +325,39 @@
 
         @Override
         public void handleMessage(Message msg) {
+            rebuildActiveSessions();
             switch (msg.what) {
                 case MSG_REBUILD_COMPLETE: {
-                    if (mCurCallbacks != null) {
-                        mCurCallbacks.onRebuildComplete((ArrayList<AppEntry>)msg.obj);
+                    Session s = (Session)msg.obj;
+                    if (mActiveSessions.contains(s)) {
+                        s.mCallbacks.onRebuildComplete(s.mLastAppList);
                     }
                 } break;
                 case MSG_PACKAGE_LIST_CHANGED: {
-                    if (mCurCallbacks != null) {
-                        mCurCallbacks.onPackageListChanged();
+                    for (int i=0; i<mActiveSessions.size(); i++) {
+                        mActiveSessions.get(i).mCallbacks.onPackageListChanged();
                     }
                 } break;
                 case MSG_PACKAGE_ICON_CHANGED: {
-                    if (mCurCallbacks != null) {
-                        mCurCallbacks.onPackageIconChanged();
+                    for (int i=0; i<mActiveSessions.size(); i++) {
+                        mActiveSessions.get(i).mCallbacks.onPackageIconChanged();
                     }
                 } break;
                 case MSG_PACKAGE_SIZE_CHANGED: {
-                    if (mCurCallbacks != null) {
-                        mCurCallbacks.onPackageSizeChanged((String)msg.obj);
+                    for (int i=0; i<mActiveSessions.size(); i++) {
+                        mActiveSessions.get(i).mCallbacks.onPackageSizeChanged(
+                                (String)msg.obj);
                     }
                 } break;
                 case MSG_ALL_SIZES_COMPUTED: {
-                    if (mCurCallbacks != null) {
-                        mCurCallbacks.onAllSizesComputed();
+                    for (int i=0; i<mActiveSessions.size(); i++) {
+                        mActiveSessions.get(i).mCallbacks.onAllSizesComputed();
                     }
                 } break;
                 case MSG_RUNNING_STATE_CHANGED: {
-                    if (mCurCallbacks != null) {
-                        mCurCallbacks.onRunningStateChanged(msg.arg1 != 0);
+                    for (int i=0; i<mActiveSessions.size(); i++) {
+                        mActiveSessions.get(i).mCallbacks.onRunningStateChanged(
+                                msg.arg1 != 0);
                     }
                 } break;
             }
@@ -391,157 +410,226 @@
         }
     }
 
-    void resume(Callbacks callbacks) {
-        if (DEBUG_LOCKING) Log.v(TAG, "resume about to acquire lock...");
-        synchronized (mEntriesMap) {
-            mCurCallbacks = callbacks;
-            mResumed = true;
-            if (mPackageIntentReceiver == null) {
-                mPackageIntentReceiver = new PackageIntentReceiver();
-                mPackageIntentReceiver.registerReceiver();
-            }
-            mApplications = mPm.getInstalledApplications(
-                    PackageManager.GET_UNINSTALLED_PACKAGES |
-                    PackageManager.GET_DISABLED_COMPONENTS);
-            if (mApplications == null) {
-                mApplications = new ArrayList<ApplicationInfo>();
-            }
+    public class Session {
+        final Callbacks mCallbacks;
+        boolean mResumed;
 
-            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;
-                }
-            }
+        // Rebuilding of app list.  Synchronized on mRebuildSync.
+        final Object mRebuildSync = new Object();
+        boolean mRebuildRequested;
+        boolean mRebuildAsync;
+        AppFilter mRebuildFilter;
+        Comparator<AppEntry> mRebuildComparator;
+        ArrayList<AppEntry> mRebuildResult;
+        ArrayList<AppEntry> mLastAppList;
 
-            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;
+        Session(Callbacks callbacks) {
+            mCallbacks = callbacks;
+        }
+
+        public void resume() {
+            if (DEBUG_LOCKING) Log.v(TAG, "resume about to acquire lock...");
+            synchronized (mEntriesMap) {
+                if (!mResumed) {
+                    mResumed = true;
+                    mSessionsChanged = true;
+                    doResumeIfNeededLocked();
                 }
-                final AppEntry entry = mEntriesMap.get(info.packageName);
-                if (entry != null) {
-                    entry.info = info;
-                }
-            }
-            mCurComputingSizePkg = null;
-            if (!mBackgroundHandler.hasMessages(BackgroundHandler.MSG_LOAD_ENTRIES)) {
-                mBackgroundHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ENTRIES);
             }
             if (DEBUG_LOCKING) Log.v(TAG, "...resume releasing lock");
         }
-    }
 
-    void pause() {
-        if (DEBUG_LOCKING) Log.v(TAG, "pause about to acquire lock...");
-        synchronized (mEntriesMap) {
-            mCurCallbacks = null;
-            mResumed = false;
-            if (DEBUG_LOCKING) Log.v(TAG, "...pause releasing lock");
-        }
-    }
-
-    // Creates a new list of app entries with the given filter and comparator.
-    ArrayList<AppEntry> rebuild(AppFilter filter, Comparator<AppEntry> comparator) {
-        synchronized (mRebuildSync) {
-            mRebuildRequested = true;
-            mRebuildAsync = false;
-            mRebuildFilter = filter;
-            mRebuildComparator = comparator;
-            mRebuildResult = null;
-            if (!mBackgroundHandler.hasMessages(BackgroundHandler.MSG_REBUILD_LIST)) {
-                mBackgroundHandler.sendEmptyMessage(BackgroundHandler.MSG_REBUILD_LIST);
-            }
-
-            // We will wait for .25s for the list to be built.
-            long waitend = SystemClock.uptimeMillis()+250;
-
-            while (mRebuildResult == null) {
-                long now = SystemClock.uptimeMillis();
-                if (now >= waitend) {
-                    break;
+        public void pause() {
+            if (DEBUG_LOCKING) Log.v(TAG, "pause about to acquire lock...");
+            synchronized (mEntriesMap) {
+                if (mResumed) {
+                    mResumed = false;
+                    mSessionsChanged = true;
+                    mBackgroundHandler.removeMessages(BackgroundHandler.MSG_REBUILD_LIST, this);
+                    doPauseIfNeededLocked();
                 }
-                try {
-                    mRebuildSync.wait(waitend - now);
-                } catch (InterruptedException e) {
-                }
+                if (DEBUG_LOCKING) Log.v(TAG, "...pause releasing lock");
             }
-
-            mRebuildAsync = true;
-
-            return mRebuildResult;
-        }
-    }
-
-    void handleRebuildList() {
-        AppFilter filter;
-        Comparator<AppEntry> comparator;
-        synchronized (mRebuildSync) {
-            if (!mRebuildRequested) {
-                return;
-            }
-
-            filter = mRebuildFilter;
-            comparator = mRebuildComparator;
-            mRebuildRequested = false;
-            mRebuildFilter = null;
-            mRebuildComparator = null;
         }
 
-        Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
-
-        if (filter != null) {
-            filter.init();
-        }
-        
-        List<ApplicationInfo> apps;
-        synchronized (mEntriesMap) {
-            apps = new ArrayList<ApplicationInfo>(mApplications);
-        }
-
-        ArrayList<AppEntry> filteredApps = new ArrayList<AppEntry>();
-        if (DEBUG) Log.i(TAG, "Rebuilding...");
-        for (int i=0; i<apps.size(); i++) {
-            ApplicationInfo info = apps.get(i);
-            if (filter == null || filter.filterApp(info)) {
+        // Creates a new list of app entries with the given filter and comparator.
+        ArrayList<AppEntry> rebuild(AppFilter filter, Comparator<AppEntry> comparator) {
+            synchronized (mRebuildSync) {
                 synchronized (mEntriesMap) {
-                    if (DEBUG_LOCKING) Log.v(TAG, "rebuild acquired lock");
-                    AppEntry entry = getEntryLocked(info);
-                    entry.ensureLabel(mContext);
-                    if (DEBUG) Log.i(TAG, "Using " + info.packageName + ": " + entry);
-                    filteredApps.add(entry);
-                    if (DEBUG_LOCKING) Log.v(TAG, "rebuild releasing lock");
+                    mRebuildingSessions.add(this);
+                    mRebuildRequested = true;
+                    mRebuildAsync = false;
+                    mRebuildFilter = filter;
+                    mRebuildComparator = comparator;
+                    mRebuildResult = null;
+                    if (!mBackgroundHandler.hasMessages(BackgroundHandler.MSG_REBUILD_LIST)) {
+                        Message msg = mBackgroundHandler.obtainMessage(
+                                BackgroundHandler.MSG_REBUILD_LIST);
+                        mBackgroundHandler.sendMessage(msg);
+                    }
                 }
+
+                // We will wait for .25s for the list to be built.
+                long waitend = SystemClock.uptimeMillis()+250;
+
+                while (mRebuildResult == null) {
+                    long now = SystemClock.uptimeMillis();
+                    if (now >= waitend) {
+                        break;
+                    }
+                    try {
+                        mRebuildSync.wait(waitend - now);
+                    } catch (InterruptedException e) {
+                    }
+                }
+
+                mRebuildAsync = true;
+
+                return mRebuildResult;
             }
         }
 
-        Collections.sort(filteredApps, comparator);
+        void handleRebuildList() {
+            AppFilter filter;
+            Comparator<AppEntry> comparator;
+            synchronized (mRebuildSync) {
+                if (!mRebuildRequested) {
+                    return;
+                }
 
-        synchronized (mRebuildSync) {
-            if (!mRebuildRequested) {
-                if (!mRebuildAsync) {
-                    mRebuildResult = filteredApps;
-                    mRebuildSync.notifyAll();
-                } else {
-                    if (!mMainHandler.hasMessages(MainHandler.MSG_REBUILD_COMPLETE)) {
-                        Message msg = mMainHandler.obtainMessage(
-                                MainHandler.MSG_REBUILD_COMPLETE, filteredApps);
-                        mMainHandler.sendMessage(msg);
+                filter = mRebuildFilter;
+                comparator = mRebuildComparator;
+                mRebuildRequested = false;
+                mRebuildFilter = null;
+                mRebuildComparator = null;
+            }
+
+            Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
+
+            if (filter != null) {
+                filter.init();
+            }
+            
+            List<ApplicationInfo> apps;
+            synchronized (mEntriesMap) {
+                apps = new ArrayList<ApplicationInfo>(mApplications);
+            }
+
+            ArrayList<AppEntry> filteredApps = new ArrayList<AppEntry>();
+            if (DEBUG) Log.i(TAG, "Rebuilding...");
+            for (int i=0; i<apps.size(); i++) {
+                ApplicationInfo info = apps.get(i);
+                if (filter == null || filter.filterApp(info)) {
+                    synchronized (mEntriesMap) {
+                        if (DEBUG_LOCKING) Log.v(TAG, "rebuild acquired lock");
+                        AppEntry entry = getEntryLocked(info);
+                        entry.ensureLabel(mContext);
+                        if (DEBUG) Log.i(TAG, "Using " + info.packageName + ": " + entry);
+                        filteredApps.add(entry);
+                        if (DEBUG_LOCKING) Log.v(TAG, "rebuild releasing lock");
                     }
                 }
             }
+
+            Collections.sort(filteredApps, comparator);
+
+            synchronized (mRebuildSync) {
+                if (!mRebuildRequested) {
+                    mLastAppList = filteredApps;
+                    if (!mRebuildAsync) {
+                        mRebuildResult = filteredApps;
+                        mRebuildSync.notifyAll();
+                    } else {
+                        if (!mMainHandler.hasMessages(MainHandler.MSG_REBUILD_COMPLETE, this)) {
+                            Message msg = mMainHandler.obtainMessage(
+                                    MainHandler.MSG_REBUILD_COMPLETE, this);
+                            mMainHandler.sendMessage(msg);
+                        }
+                    }
+                }
+            }
+
+            Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
         }
 
-        Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
+        public void release() {
+            pause();
+            synchronized (mEntriesMap) {
+                mSessions.remove(this);
+            }
+        }
+    }
+
+    public Session newSession(Callbacks callbacks) {
+        Session s = new Session(callbacks);
+        synchronized (mEntriesMap) {
+            mSessions.add(s);
+        }
+        return s;
+    }
+
+    void doResumeIfNeededLocked() {
+        if (mResumed) {
+            return;
+        }
+        mResumed = true;
+        if (mPackageIntentReceiver == null) {
+            mPackageIntentReceiver = new PackageIntentReceiver();
+            mPackageIntentReceiver.registerReceiver();
+        }
+        mApplications = mPm.getInstalledApplications(
+                PackageManager.GET_UNINSTALLED_PACKAGES |
+                PackageManager.GET_DISABLED_COMPONENTS);
+        if (mApplications == null) {
+            mApplications = new ArrayList<ApplicationInfo>();
+        }
+
+        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;
+            }
+        }
+        mCurComputingSizePkg = null;
+        if (!mBackgroundHandler.hasMessages(BackgroundHandler.MSG_LOAD_ENTRIES)) {
+            mBackgroundHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ENTRIES);
+        }
+    }
+
+    void doPauseIfNeededLocked() {
+        if (!mResumed) {
+            return;
+        }
+        for (int i=0; i<mSessions.size(); i++) {
+            if (mSessions.get(i).mResumed) {
+                return;
+            }
+        }
+        mResumed = false;
+        if (mPackageIntentReceiver != null) {
+            mPackageIntentReceiver.unregisterReceiver();
+            mPackageIntentReceiver = null;
+        }
     }
 
     AppEntry getEntry(String packageName) {
@@ -772,7 +860,18 @@
         @Override
         public void handleMessage(Message msg) {
             // Always try rebuilding list first thing, if needed.
-            handleRebuildList();
+            ArrayList<Session> rebuildingSessions = null;
+            synchronized (mEntriesMap) {
+                if (mRebuildingSessions.size() > 0) {
+                    rebuildingSessions = new ArrayList<Session>(mRebuildingSessions);
+                    mRebuildingSessions.clear();
+                }
+            }
+            if (rebuildingSessions != null) {
+                for (int i=0; i<rebuildingSessions.size(); i++) {
+                    rebuildingSessions.get(i).handleRebuildList();
+                }
+            }
 
             switch (msg.what) {
                 case MSG_REBUILD_LIST: {
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index faa531a..c2e358c 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.applications.ApplicationsState.AppEntry;
 
 import android.app.Activity;
@@ -25,8 +26,12 @@
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.Fragment;
+import android.app.INotificationManager;
+import android.app.NotificationManager;
 import android.app.admin.DevicePolicyManager;
+import android.appwidget.AppWidgetManager;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -49,13 +54,15 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.preference.PreferenceActivity;
+import android.text.SpannableString;
+import android.text.TextUtils;
 import android.text.format.Formatter;
+import android.text.style.BulletSpan;
 import android.util.Log;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
-import android.content.ComponentName;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -65,6 +72,7 @@
 import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Switch;
 import android.widget.TextView;
 
 /**
@@ -87,8 +95,10 @@
 
     private PackageManager mPm;
     private IUsbManager mUsbManager;
+    private AppWidgetManager mAppWidgetManager;
     private DevicePolicyManager mDpm;
     private ApplicationsState mState;
+    private ApplicationsState.Session mSession;
     private ApplicationsState.AppEntry mAppEntry;
     private PackageInfo mPackageInfo;
     private CanBeOnSdCardChecker mCanBeOnSdCardChecker;
@@ -115,7 +125,8 @@
     private Button mForceStopButton;
     private Button mClearDataButton;
     private Button mMoveAppButton;
-    
+    private CompoundButton mNotificationSwitch;
+
     private PackageMoveObserver mPackageMoveObserver;
     
     private boolean mHaveSizes = false;
@@ -150,6 +161,7 @@
     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 static final int DLG_DISABLE_NOTIFICATIONS = DLG_BASE + 8;
     
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
@@ -268,6 +280,16 @@
         }
     }
 
+    private boolean isThisASystemPackage() {
+        try {
+            PackageInfo sys = mPm.getPackageInfo("android", PackageManager.GET_SIGNATURES);
+            return (mPackageInfo != null && mPackageInfo.signatures != null &&
+                    sys.signatures[0].equals(mPackageInfo.signatures[0]));
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
     private void initUninstallButtons() {
         mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
         boolean enabled = true;
@@ -287,9 +309,7 @@
                         intent.addCategory(Intent.CATEGORY_HOME);
                         intent.setPackage(mAppEntry.info.packageName);
                         List<ResolveInfo> homes = mPm.queryIntentActivities(intent, 0);
-                        if ((homes != null && homes.size() > 0) ||
-                                (mPackageInfo != null && mPackageInfo.signatures != null &&
-                                        sys.signatures[0].equals(mPackageInfo.signatures[0]))) {
+                        if ((homes != null && homes.size() > 0) || isThisASystemPackage()) {
                             // Disable button for core system applications.
                             mUninstallButton.setText(R.string.disable_text);
                         } else if (mAppEntry.info.enabled) {
@@ -319,15 +339,35 @@
         }
     }
 
+    private void initNotificationButton() {
+        INotificationManager nm = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        boolean enabled = true; // default on
+        try {
+            enabled = nm.areNotificationsEnabledForPackage(mAppEntry.info.packageName);
+        } catch (android.os.RemoteException ex) {
+            // this does not bode well
+        }
+        mNotificationSwitch.setChecked(enabled);
+        if (isThisASystemPackage()) {
+            mNotificationSwitch.setEnabled(false);
+        } else {
+            mNotificationSwitch.setEnabled(true);
+            mNotificationSwitch.setOnCheckedChangeListener(this);
+        }
+    }
+
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         
         mState = ApplicationsState.getInstance(getActivity().getApplication());
+        mSession = mState.newSession(this);
         mPm = getActivity().getPackageManager();
         IBinder b = ServiceManager.getService(Context.USB_SERVICE);
         mUsbManager = IUsbManager.Stub.asInterface(b);
+        mAppWidgetManager = AppWidgetManager.getInstance(getActivity());
         mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
 
         mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();
@@ -368,6 +408,8 @@
         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);
+        
+        mNotificationSwitch = (CompoundButton) view.findViewById(R.id.notification_switch);
 
         return view;
     }
@@ -397,7 +439,7 @@
     public void onResume() {
         super.onResume();
         
-        mState.resume(this);
+        mSession.resume();
         if (!refreshUi()) {
             setIntentAndFinish(true, true);
         }
@@ -406,7 +448,7 @@
     @Override
     public void onPause() {
         super.onPause();
-        mState.pause();
+        mSession.pause();
     }
 
     @Override
@@ -473,20 +515,55 @@
         // Intent list cannot be null. so pass empty list
         List<IntentFilter> intentList = new ArrayList<IntentFilter>();
         mPm.getPreferredActivities(intentList, prefActList, packageName);
-        if(localLOGV) Log.i(TAG, "Have "+prefActList.size()+" number of activities in prefered list");
+        if (localLOGV)
+            Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
         boolean hasUsbDefaults = false;
         try {
             hasUsbDefaults = mUsbManager.hasDefaults(packageName);
         } catch (RemoteException e) {
             Log.e(TAG, "mUsbManager.hasDefaults", e);
         }
-        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);
-            mActivitiesButton.setEnabled(false);
+        boolean hasBindAppWidgetPermission =
+                mAppWidgetManager.hasBindAppWidgetPermission(mAppEntry.info.packageName);
+
+        TextView autoLaunchTitleView = (TextView) mRootView.findViewById(R.id.auto_launch_title);
+        TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+        boolean autoLaunchEnabled = prefActList.size() > 0 || hasUsbDefaults;
+        if (!autoLaunchEnabled && !hasBindAppWidgetPermission) {
+            resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
         } else {
-            autoLaunchView.setText(R.string.auto_launch_enable_text);
+            boolean useBullets = hasBindAppWidgetPermission && autoLaunchEnabled;
+
+            if (hasBindAppWidgetPermission) {
+                autoLaunchTitleView.setText(R.string.auto_launch_label_generic);
+            } else {
+                autoLaunchTitleView.setText(R.string.auto_launch_label);
+            }
+
+            CharSequence text = null;
+            int bulletIndent = getResources()
+                    .getDimensionPixelSize(R.dimen.installed_app_details_bullet_offset);
+            if (autoLaunchEnabled) {
+                CharSequence autoLaunchEnableText = getText(R.string.auto_launch_enable_text);
+                SpannableString s = new SpannableString(autoLaunchEnableText);
+                if (useBullets) {
+                    s.setSpan(new BulletSpan(bulletIndent), 0, autoLaunchEnableText.length(), 0);
+                }
+                text = (text == null) ?
+                        TextUtils.concat(s, "\n") : TextUtils.concat(text, "\n", s, "\n");
+            }
+            if (hasBindAppWidgetPermission) {
+                CharSequence alwaysAllowBindAppWidgetsText =
+                        getText(R.string.always_allow_bind_appwidgets_text);
+                SpannableString s = new SpannableString(alwaysAllowBindAppWidgetsText);
+                if (useBullets) {
+                    s.setSpan(new BulletSpan(bulletIndent),
+                            0, alwaysAllowBindAppWidgetsText.length(), 0);
+                }
+                text = (text == null) ?
+                        TextUtils.concat(s, "\n") : TextUtils.concat(text, "\n", s, "\n");
+            }
+            autoLaunchView.setText(text);
             mActivitiesButton.setEnabled(true);
             mActivitiesButton.setOnClickListener(this);
         }
@@ -529,6 +606,13 @@
         return true;
     }
     
+    private void resetLaunchDefaultsUi(TextView title, TextView autoLaunchView) {
+        title.setText(R.string.auto_launch_label);
+        autoLaunchView.setText(R.string.auto_launch_disable_text);
+        // Disable clear activities button
+        mActivitiesButton.setEnabled(false);
+    }
+
     private void setIntentAndFinish(boolean finish, boolean appChanged) {
         if(localLOGV) Log.i(TAG, "appChanged="+appChanged);
         Intent intent = new Intent();
@@ -614,6 +698,7 @@
             initUninstallButtons();
             initDataButtons();
             initMoveButton();
+            initNotificationButton();
         } else {
             mMoveAppButton.setText(R.string.moving);
             mMoveAppButton.setEnabled(false);
@@ -780,6 +865,26 @@
                     })
                     .setNegativeButton(R.string.dlg_cancel, null)
                     .create();
+                case DLG_DISABLE_NOTIFICATIONS:
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(getActivity().getText(R.string.app_disable_notifications_dlg_title))
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(getActivity().getText(R.string.app_disable_notifications_dlg_text))
+                    .setPositiveButton(R.string.dlg_ok,
+                        new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            // Disable the package's notifications
+                            getOwner().setNotificationsEnabled(false);
+                        }
+                    })
+                    .setNegativeButton(R.string.dlg_cancel,
+                        new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            // Re-enable the checkbox
+                            getOwner().mNotificationSwitch.setChecked(true);
+                        }
+                    })
+                    .create();
             }
             throw new IllegalArgumentException("unknown id " + id);
         }
@@ -834,7 +939,7 @@
                     Activity.RESULT_CANCELED, null, null);
         }
     }
-    
+
     static class DisableChanger extends AsyncTask<Object, Object, Object> {
         final PackageManager mPm;
         final WeakReference<InstalledAppDetails> mActivity;
@@ -855,6 +960,18 @@
         }
     }
 
+    private void setNotificationsEnabled(boolean enabled) {
+        String packageName = mAppEntry.info.packageName;
+        INotificationManager nm = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        try {
+            final boolean enable = mNotificationSwitch.isChecked();
+            nm.setNotificationsEnabledForPackage(packageName, enabled);
+        } catch (android.os.RemoteException ex) {
+            mNotificationSwitch.setChecked(!enabled); // revert
+        }
+    }
+
     /*
      * Method implementing functionality of buttons clicked
      * @see android.view.View.OnClickListener#onClick(android.view.View)
@@ -884,13 +1001,19 @@
             } catch (RemoteException e) {
                 Log.e(TAG, "mUsbManager.clearDefaults", e);
             }
-            mActivitiesButton.setEnabled(false);
+            mAppWidgetManager.setBindAppWidgetPermission(packageName, false);
+            TextView autoLaunchTitleView =
+                    (TextView) mRootView.findViewById(R.id.auto_launch_title);
+            TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+            resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
         } else if(v == mClearDataButton) {
             if (mAppEntry.info.manageSpaceActivityName != null) {
-                Intent intent = new Intent(Intent.ACTION_DEFAULT);
-                intent.setClassName(mAppEntry.info.packageName,
-                        mAppEntry.info.manageSpaceActivityName);
-                startActivityForResult(intent, -1);
+                if (!Utils.isMonkeyRunning()) {
+                    Intent intent = new Intent(Intent.ACTION_DEFAULT);
+                    intent.setClassName(mAppEntry.info.packageName,
+                            mAppEntry.info.manageSpaceActivityName);
+                    startActivityForResult(intent, -1);
+                }
             } else {
                 showDialogInner(DLG_CLEAR_DATA, 0);
             }
@@ -925,6 +1048,12 @@
         } else if (buttonView == mEnableCompatibilityCB) {
             am.setPackageScreenCompatMode(packageName, isChecked ?
                     ActivityManager.COMPAT_MODE_ENABLED : ActivityManager.COMPAT_MODE_DISABLED);
+        } else if (buttonView == mNotificationSwitch) {
+            if (!isChecked) {
+                showDialogInner(DLG_DISABLE_NOTIFICATIONS, 0);
+            } else {
+                setNotificationsEnabled(true);
+            }
         }
     }
 }
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 948ddb0..1cc9dcc 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -16,22 +16,37 @@
 
 package com.android.settings.applications;
 
-import static com.android.settings.Utils.prepareCustomPreferencesList;
+import static android.net.NetworkPolicyManager.POLICY_NONE;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Fragment;
+import android.app.INotificationManager;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.NetworkPolicyManager;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
+import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.os.StatFs;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceFrameLayout;
 import android.provider.Settings;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.PagerTabStrip;
+import android.support.v4.view.ViewPager;
 import android.text.format.Formatter;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -41,27 +56,27 @@
 import android.view.View;
 import android.view.ViewGroup;
 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;
 import android.widget.Filterable;
-import android.widget.ImageView;
 import android.widget.ListView;
-import android.widget.TabHost;
 import android.widget.TextView;
 
+import com.android.internal.app.IMediaContainerService;
 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 com.android.settings.deviceinfo.StorageMeasurement;
+import com.android.settings.Utils;
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.List;
 
 final class CanBeOnSdCardChecker {
     final IPackageManager mPm;
@@ -86,8 +101,7 @@
         if ((info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
             canBe = true;
         } else {
-            if ((info.flags & ApplicationInfo.FLAG_FORWARD_LOCK) == 0 &&
-                    (info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+            if ((info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
                 if (info.installLocation == PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL ||
                         info.installLocation == PackageInfo.INSTALL_LOCATION_AUTO) {
                     canBe = true;
@@ -105,6 +119,11 @@
     }
 }
 
+interface AppClickListener {
+    void onItemClick(ManageApplications.TabInfo tab, AdapterView<?> parent,
+            View view, int position, long id);
+}
+
 /**
  * Activity to pick an application that will be used to display installation information and
  * options to uninstall/delete user data for system applications. This activity
@@ -112,14 +131,20 @@
  * intent.
  */
 public class ManageApplications extends Fragment implements
-        OnItemClickListener,
-        TabHost.TabContentFactory, TabHost.OnTabChangeListener {
+        AppClickListener, DialogInterface.OnClickListener,
+        DialogInterface.OnDismissListener {
+
     static final String TAG = "ManageApplications";
     static final boolean DEBUG = false;
-    
+
+    private static final String EXTRA_SORT_ORDER = "sortOrder";
+    private static final String EXTRA_SHOW_BACKGROUND = "showBackground";
+    private static final String EXTRA_DEFAULT_LIST_TYPE = "defaultListType";
+    private static final String EXTRA_RESET_DIALOG = "resetDialog";
+
     // attributes used as keys when passing values to InstalledAppDetails activity
     public static final String APP_CHG = "chg";
-    
+
     // constant value that can be used to check return code from sub activity.
     private static final int INSTALLED_APP_DETAILS = 1;
 
@@ -139,16 +164,270 @@
     public static final int SORT_ORDER_SIZE = MENU_OPTIONS_BASE + 5;
     public static final int SHOW_RUNNING_SERVICES = MENU_OPTIONS_BASE + 6;
     public static final int SHOW_BACKGROUND_PROCESSES = MENU_OPTIONS_BASE + 7;
+    public static final int RESET_APP_PREFERENCES = MENU_OPTIONS_BASE + 8;
     // sort order
     private int mSortOrder = SORT_ORDER_ALPHA;
-    // Filter value
-    private int mFilterApps = FILTER_APPS_THIRD_PARTY;
     
     private ApplicationsState mApplicationsState;
-    private ApplicationsAdapter mApplicationsAdapter;
-    
+
+    public static class TabInfo implements OnItemClickListener {
+        public final ManageApplications mOwner;
+        public final ApplicationsState mApplicationsState;
+        public final CharSequence mLabel;
+        public final int mListType;
+        public final int mFilter;
+        public final AppClickListener mClickListener;
+        public final CharSequence mInvalidSizeStr;
+        public final CharSequence mComputingSizeStr;
+        private final Bundle mSavedInstanceState;
+
+        public ApplicationsAdapter mApplications;
+        public LayoutInflater mInflater;
+        public View mRootView;
+
+        private IMediaContainerService mContainerService;
+
+        private View mLoadingContainer;
+
+        private View mListContainer;
+
+        // ListView used to display list
+        private ListView mListView;
+        // Custom view used to display running processes
+        private RunningProcessesView mRunningProcessesView;
+        
+        private LinearColorBar mColorBar;
+        private TextView mStorageChartLabel;
+        private TextView mUsedStorageText;
+        private TextView mFreeStorageText;
+        private long mFreeStorage = 0, mAppStorage = 0, mTotalStorage = 0;
+        private long mLastUsedStorage, mLastAppStorage, mLastFreeStorage;
+
+        final Runnable mRunningProcessesAvail = new Runnable() {
+            public void run() {
+                handleRunningProcessesAvail();
+            }
+        };
+
+        public TabInfo(ManageApplications owner, ApplicationsState apps,
+                CharSequence label, int listType, AppClickListener clickListener,
+                Bundle savedInstanceState) {
+            mOwner = owner;
+            mApplicationsState = apps;
+            mLabel = label;
+            mListType = listType;
+            switch (listType) {
+                case LIST_TYPE_DOWNLOADED: mFilter = FILTER_APPS_THIRD_PARTY; break;
+                case LIST_TYPE_SDCARD: mFilter = FILTER_APPS_SDCARD; break;
+                default: mFilter = FILTER_APPS_ALL; break;
+            }
+            mClickListener = clickListener;
+            mInvalidSizeStr = owner.getActivity().getText(R.string.invalid_size_value);
+            mComputingSizeStr = owner.getActivity().getText(R.string.computing_size);
+            mSavedInstanceState = savedInstanceState;
+        }
+
+        public void setContainerService(IMediaContainerService containerService) {
+            mContainerService = containerService;
+            updateStorageUsage();
+        }
+
+        public View build(LayoutInflater inflater, ViewGroup contentParent, View contentChild) {
+            if (mRootView != null) {
+                return mRootView;
+            }
+
+            mInflater = inflater;
+            mRootView = inflater.inflate(mListType == LIST_TYPE_RUNNING
+                    ? R.layout.manage_applications_running
+                    : R.layout.manage_applications_apps, null);
+            mLoadingContainer = mRootView.findViewById(R.id.loading_container);
+            mLoadingContainer.setVisibility(View.VISIBLE);
+            mListContainer = mRootView.findViewById(R.id.list_container);
+            if (mListContainer != null) {
+                // Create adapter and list view here
+                View emptyView = mListContainer.findViewById(com.android.internal.R.id.empty);
+                ListView lv = (ListView) mListContainer.findViewById(android.R.id.list);
+                if (emptyView != null) {
+                    lv.setEmptyView(emptyView);
+                }
+                lv.setOnItemClickListener(this);
+                lv.setSaveEnabled(true);
+                lv.setItemsCanFocus(true);
+                lv.setTextFilterEnabled(true);
+                mListView = lv;
+                mApplications = new ApplicationsAdapter(mApplicationsState, this, mFilter);
+                mListView.setAdapter(mApplications);
+                mListView.setRecyclerListener(mApplications);
+                mColorBar = (LinearColorBar)mListContainer.findViewById(R.id.storage_color_bar);
+                mStorageChartLabel = (TextView)mListContainer.findViewById(R.id.storageChartLabel);
+                mUsedStorageText = (TextView)mListContainer.findViewById(R.id.usedStorageText);
+                mFreeStorageText = (TextView)mListContainer.findViewById(R.id.freeStorageText);
+                Utils.prepareCustomPreferencesList(contentParent, contentChild, mListView, false);
+                if (mFilter == FILTER_APPS_SDCARD) {
+                    mStorageChartLabel.setText(mOwner.getActivity().getText(
+                            R.string.sd_card_storage));
+                } else {
+                    mStorageChartLabel.setText(mOwner.getActivity().getText(
+                            R.string.internal_storage));
+                }
+                applyCurrentStorage();
+            }
+            mRunningProcessesView = (RunningProcessesView)mRootView.findViewById(
+                    R.id.running_processes);
+            if (mRunningProcessesView != null) {
+                mRunningProcessesView.doCreate(mSavedInstanceState);
+            }
+
+            return mRootView;
+        }
+
+        public void detachView() {
+            if (mRootView != null) {
+                ViewGroup group = (ViewGroup)mRootView.getParent();
+                if (group != null) {
+                    group.removeView(mRootView);
+                }
+            }
+        }
+
+        public void resume(int sortOrder) {
+            if (mApplications != null) {
+                mApplications.resume(sortOrder);
+            }
+            if (mRunningProcessesView != null) {
+                boolean haveData = mRunningProcessesView.doResume(mOwner, mRunningProcessesAvail);
+                if (haveData) {
+                    mRunningProcessesView.setVisibility(View.VISIBLE);
+                    mLoadingContainer.setVisibility(View.INVISIBLE);
+                } else {
+                    mLoadingContainer.setVisibility(View.VISIBLE);
+                }
+            }
+        }
+
+        public void pause() {
+            if (mApplications != null) {
+                mApplications.pause();
+            }
+            if (mRunningProcessesView != null) {
+                mRunningProcessesView.doPause();
+            }
+        }
+
+        void updateStorageUsage() {
+            // Make sure a callback didn't come at an inopportune time.
+            if (mOwner.getActivity() == null) return;
+            // Doesn't make sense for stuff that is not an app list.
+            if (mApplications == null) return;
+
+            mFreeStorage = 0;
+            mAppStorage = 0;
+            mTotalStorage = 0;
+
+            if (mFilter == FILTER_APPS_SDCARD) {
+                if (mContainerService != null) {
+                    try {
+                        final long[] stats = mContainerService.getFileSystemStats(
+                                Environment.getExternalStorageDirectory().getPath());
+                        mTotalStorage = stats[0];
+                        mFreeStorage = stats[1];
+                    } catch (RemoteException e) {
+                        Log.w(TAG, "Problem in container service", e);
+                    }
+                }
+
+                if (mApplications != null) {
+                    final int N = mApplications.getCount();
+                    for (int i=0; i<N; i++) {
+                        ApplicationsState.AppEntry ae = mApplications.getAppEntry(i);
+                        mAppStorage += ae.externalCodeSize + ae.externalDataSize;
+                    }
+                }
+            } else {
+                if (mContainerService != null) {
+                    try {
+                        final long[] stats = mContainerService.getFileSystemStats(
+                                Environment.getDataDirectory().getPath());
+                        mTotalStorage = stats[0];
+                        mFreeStorage = stats[1];
+                    } catch (RemoteException e) {
+                        Log.w(TAG, "Problem in container service", e);
+                    }
+                }
+
+                final boolean emulatedStorage = Environment.isExternalStorageEmulated();
+                if (mApplications != null) {
+                    final int N = mApplications.getCount();
+                    for (int i=0; i<N; i++) {
+                        ApplicationsState.AppEntry ae = mApplications.getAppEntry(i);
+                        mAppStorage += ae.codeSize + ae.dataSize;
+                        if (emulatedStorage) {
+                            mAppStorage += ae.externalCodeSize + ae.externalDataSize;
+                        }
+                    }
+                }
+                mFreeStorage += mApplicationsState.sumCacheSizes();
+            }
+
+            applyCurrentStorage();
+        }
+
+        void applyCurrentStorage() {
+            // If view hierarchy is not yet created, no views to update.
+            if (mRootView == null) {
+                return;
+            }
+            if (mTotalStorage > 0) {
+                mColorBar.setRatios((mTotalStorage-mFreeStorage-mAppStorage)/(float)mTotalStorage,
+                        mAppStorage/(float)mTotalStorage, mFreeStorage/(float)mTotalStorage);
+                long usedStorage = mTotalStorage - mFreeStorage;
+                if (mLastUsedStorage != usedStorage) {
+                    mLastUsedStorage = usedStorage;
+                    String sizeStr = Formatter.formatShortFileSize(
+                            mOwner.getActivity(), usedStorage);
+                    mUsedStorageText.setText(mOwner.getActivity().getResources().getString(
+                            R.string.service_foreground_processes, sizeStr));
+                }
+                if (mLastFreeStorage != mFreeStorage) {
+                    mLastFreeStorage = mFreeStorage;
+                    String sizeStr = Formatter.formatShortFileSize(
+                            mOwner.getActivity(), mFreeStorage);
+                    mFreeStorageText.setText(mOwner.getActivity().getResources().getString(
+                            R.string.service_background_processes, sizeStr));
+                }
+            } else {
+                mColorBar.setRatios(0, 0, 0);
+                if (mLastUsedStorage != -1) {
+                    mLastUsedStorage = -1;
+                    mUsedStorageText.setText("");
+                }
+                if (mLastFreeStorage != -1) {
+                    mLastFreeStorage = -1;
+                    mFreeStorageText.setText("");
+                }
+            }
+        }
+
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            mClickListener.onItemClick(this, parent, view, position, id);
+        }
+
+        void handleRunningProcessesAvail() {
+            mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(
+                    mOwner.getActivity(), android.R.anim.fade_out));
+            mRunningProcessesView.startAnimation(AnimationUtils.loadAnimation(
+                    mOwner.getActivity(), android.R.anim.fade_in));
+            mRunningProcessesView.setVisibility(View.VISIBLE);
+            mLoadingContainer.setVisibility(View.GONE);
+        }
+    }
+    private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
+    TabInfo mCurTab = null;
+
     // Size resource used for packages whose size computation failed for some reason
-    private CharSequence mInvalidSizeStr;
+    CharSequence mInvalidSizeStr;
     private CharSequence mComputingSizeStr;
     
     // layout inflater object used to inflate views
@@ -156,85 +435,75 @@
     
     private String mCurrentPkgName;
     
-    private View mLoadingContainer;
-
-    private View mListContainer;
-
-    // ListView used to display list
-    private ListView mListView;
-    // Custom view used to display running processes
-    private RunningProcessesView mRunningProcessesView;
-    
-    LinearColorBar mColorBar;
-    TextView mStorageChartLabel;
-    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;
+    // These are for keeping track of activity and spinner switch state.
     private boolean mActivityResumed;
     
-    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;
+    static final int LIST_TYPE_DOWNLOADED = 0;
+    static final int LIST_TYPE_RUNNING = 1;
+    static final int LIST_TYPE_SDCARD = 2;
+    static final int LIST_TYPE_ALL = 3;
 
     private boolean mShowBackground = false;
     
-    // -------------- Copied from TabActivity --------------
+    private int mDefaultListType = -1;
 
-    private TabHost mTabHost;
-    private String mDefaultTab = null;
+    private ViewGroup mContentContainer;
+    private View mRootView;
+    private ViewPager mViewPager;
 
-    // -------------- Copied from TabActivity --------------
+    AlertDialog mResetDialog;
 
-    final Runnable mRunningProcessesAvail = new Runnable() {
-        public void run() {
-            handleRunningProcessesAvail();
+    class MyPagerAdapter extends PagerAdapter
+            implements ViewPager.OnPageChangeListener {
+        int mCurPos = 0;
+
+        @Override
+        public int getCount() {
+            return mTabs.size();
         }
-    };
-
-    // View Holder used when displaying views
-    static class AppViewHolder {
-        ApplicationsState.AppEntry entry;
-        TextView appName;
-        ImageView appIcon;
-        TextView appSize;
-        TextView disabled;
-        CheckBox checkBox;
         
-        void updateSizeText(ManageApplications ma, int whichSize) {
-            if (DEBUG) Log.i(TAG, "updateSizeText of " + entry.label + " " + entry
-                    + ": " + entry.sizeStr);
-            if (entry.sizeStr != null) {
-                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);
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+            TabInfo tab = mTabs.get(position);
+            View root = tab.build(mInflater, mContentContainer, mRootView);
+            container.addView(root);
+            return root;
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            container.removeView((View)object);
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object object) {
+            return view == object;
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return mTabs.get(position).mLabel;
+        }
+
+        @Override
+        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        }
+
+        @Override
+        public void onPageSelected(int position) {
+            mCurPos = position;
+        }
+
+        @Override
+        public void onPageScrollStateChanged(int state) {
+            if (state == ViewPager.SCROLL_STATE_IDLE) {
+                updateCurrentTab(mCurPos);
             }
         }
     }
-    
+
     /*
      * Custom adapter implementation for the ListView
      * This adapter maintains a map for each displayed application and its properties
@@ -244,14 +513,18 @@
      * the getId methods via the package name into the internal maps and indices.
      * The order of applications in the list is mirrored in mAppLocalList
      */
-    class ApplicationsAdapter extends BaseAdapter implements Filterable,
+    static class ApplicationsAdapter extends BaseAdapter implements Filterable,
             ApplicationsState.Callbacks, AbsListView.RecyclerListener {
         private final ApplicationsState mState;
+        private final ApplicationsState.Session mSession;
+        private final TabInfo mTab;
+        private final Context mContext;
         private final ArrayList<View> mActive = new ArrayList<View>();
+        private final int mFilterMode;
         private ArrayList<ApplicationsState.AppEntry> mBaseEntries;
         private ArrayList<ApplicationsState.AppEntry> mEntries;
         private boolean mResumed;
-        private int mLastFilterMode=-1, mLastSortMode=-1;
+        private int mLastSortMode=-1;
         private boolean mWaitingForData;
         private int mWhichSize = SIZE_TOTAL;
         CharSequence mCurFilterPrefix;
@@ -272,39 +545,41 @@
                 mCurFilterPrefix = constraint;
                 mEntries = (ArrayList<ApplicationsState.AppEntry>)results.values;
                 notifyDataSetChanged();
-                updateStorageUsage();
+                mTab.updateStorageUsage();
             }
         };
 
-        public ApplicationsAdapter(ApplicationsState state) {
+        public ApplicationsAdapter(ApplicationsState state, TabInfo tab, int filterMode) {
             mState = state;
+            mSession = state.newSession(this);
+            mTab = tab;
+            mContext = tab.mOwner.getActivity();
+            mFilterMode = filterMode;
         }
 
-        public void resume(int filter, int sort) {
+        public void resume(int sort) {
             if (DEBUG) Log.i(TAG, "Resume!  mResumed=" + mResumed);
             if (!mResumed) {
                 mResumed = true;
-                mState.resume(this);
-                mLastFilterMode = filter;
+                mSession.resume();
                 mLastSortMode = sort;
                 rebuild(true);
             } else {
-                rebuild(filter, sort);
+                rebuild(sort);
             }
         }
 
         public void pause() {
             if (mResumed) {
                 mResumed = false;
-                mState.pause();
+                mSession.pause();
             }
         }
 
-        public void rebuild(int filter, int sort) {
-            if (filter == mLastFilterMode && sort == mLastSortMode) {
+        public void rebuild(int sort) {
+            if (sort == mLastSortMode) {
                 return;
             }
-            mLastFilterMode = filter;
             mLastSortMode = sort;
             rebuild(true);
         }
@@ -319,7 +594,7 @@
             } else {
                 mWhichSize = SIZE_INTERNAL;
             }
-            switch (mLastFilterMode) {
+            switch (mFilterMode) {
                 case FILTER_APPS_THIRD_PARTY:
                     filterObj = ApplicationsState.THIRD_PARTY_FILTER;
                     break;
@@ -352,7 +627,7 @@
                     break;
             }
             ArrayList<ApplicationsState.AppEntry> entries
-                    = mState.rebuild(filterObj, comparatorObj);
+                    = mSession.rebuild(filterObj, comparatorObj);
             if (entries == null && !eraseold) {
                 // Don't have new list yet, but can continue using the old one.
                 return;
@@ -364,15 +639,15 @@
                 mEntries = null;
             }
             notifyDataSetChanged();
-            updateStorageUsage();
+            mTab.updateStorageUsage();
 
             if (entries == null) {
                 mWaitingForData = true;
-                mListContainer.setVisibility(View.INVISIBLE);
-                mLoadingContainer.setVisibility(View.VISIBLE);
+                mTab.mListContainer.setVisibility(View.INVISIBLE);
+                mTab.mLoadingContainer.setVisibility(View.VISIBLE);
             } else {
-                mListContainer.setVisibility(View.VISIBLE);
-                mLoadingContainer.setVisibility(View.GONE);
+                mTab.mListContainer.setVisibility(View.VISIBLE);
+                mTab.mLoadingContainer.setVisibility(View.GONE);
             }
         }
 
@@ -398,24 +673,24 @@
 
         @Override
         public void onRunningStateChanged(boolean running) {
-            getActivity().setProgressBarIndeterminateVisibility(running);
+            mTab.mOwner.getActivity().setProgressBarIndeterminateVisibility(running);
         }
 
         @Override
         public void onRebuildComplete(ArrayList<AppEntry> apps) {
-            if (mLoadingContainer.getVisibility() == View.VISIBLE) {
-                mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(
-                        getActivity(), android.R.anim.fade_out));
-                mListContainer.startAnimation(AnimationUtils.loadAnimation(
-                        getActivity(), android.R.anim.fade_in));
+            if (mTab.mLoadingContainer.getVisibility() == View.VISIBLE) {
+                mTab.mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(
+                        mContext, android.R.anim.fade_out));
+                mTab.mListContainer.startAnimation(AnimationUtils.loadAnimation(
+                        mContext, android.R.anim.fade_in));
             }
-            mListContainer.setVisibility(View.VISIBLE);
-            mLoadingContainer.setVisibility(View.GONE);
+            mTab.mListContainer.setVisibility(View.VISIBLE);
+            mTab.mLoadingContainer.setVisibility(View.GONE);
             mWaitingForData = false;
             mBaseEntries = apps;
             mEntries = applyPrefixFilter(mCurFilterPrefix, mBaseEntries);
             notifyDataSetChanged();
-            updateStorageUsage();
+            mTab.updateStorageUsage();
         }
 
         @Override
@@ -435,9 +710,9 @@
                 AppViewHolder holder = (AppViewHolder)mActive.get(i).getTag();
                 if (holder.entry.info.packageName.equals(packageName)) {
                     synchronized (holder.entry) {
-                        holder.updateSizeText(ManageApplications.this, mWhichSize);
+                        holder.updateSizeText(mTab.mInvalidSizeStr, mWhichSize);
                     }
-                    if (holder.entry.info.packageName.equals(mCurrentPkgName)
+                    if (holder.entry.info.packageName.equals(mTab.mOwner.mCurrentPkgName)
                             && mLastSortMode == SORT_ORDER_SIZE) {
                         // We got the size information for the last app the
                         // user viewed, and are sorting by size...  they may
@@ -445,7 +720,7 @@
                         // the list with the new size to reflect it to the user.
                         rebuild(false);
                     }
-                    updateStorageUsage();
+                    mTab.updateStorageUsage();
                     return;
                 }
             }
@@ -456,6 +731,7 @@
             if (mLastSortMode == SORT_ORDER_SIZE) {
                 rebuild(false);
             }
+            mTab.updateStorageUsage();
         }
         
         public int getCount() {
@@ -477,28 +753,8 @@
         public View getView(int position, View convertView, ViewGroup parent) {
             // A ViewHolder keeps references to children views to avoid unnecessary calls
             // to findViewById() on each row.
-            AppViewHolder holder;
-
-            // When convertView is not null, we can reuse it directly, there is no need
-            // to reinflate it. We only inflate a new View when the convertView supplied
-            // by ListView is null.
-            if (convertView == null) {
-                convertView = mInflater.inflate(R.layout.manage_applications_item, null);
-
-                // Creates a ViewHolder and store references to the two children views
-                // we want to bind data to.
-                holder = new AppViewHolder();
-                holder.appName = (TextView) convertView.findViewById(R.id.app_name);
-                holder.appIcon = (ImageView) convertView.findViewById(R.id.app_icon);
-                holder.appSize = (TextView) convertView.findViewById(R.id.app_size);
-                holder.disabled = (TextView) convertView.findViewById(R.id.app_disabled);
-                holder.checkBox = (CheckBox) convertView.findViewById(R.id.app_on_sdcard);
-                convertView.setTag(holder);
-            } else {
-                // Get the ViewHolder back to get fast access to the TextView
-                // and the ImageView.
-                holder = (AppViewHolder) convertView.getTag();
-            }
+            AppViewHolder holder = AppViewHolder.createOrRecycle(mTab.mInflater, convertView);
+            convertView = holder.rootView;
 
             // Bind the data efficiently with the holder
             ApplicationsState.AppEntry entry = mEntries.get(position);
@@ -506,7 +762,7 @@
                 holder.entry = entry;
                 if (entry.label != null) {
                     holder.appName.setText(entry.label);
-                    holder.appName.setTextColor(getActivity().getResources().getColorStateList(
+                    holder.appName.setTextColor(mContext.getResources().getColorStateList(
                             entry.info.enabled ? android.R.color.primary_text_dark
                                     : android.R.color.secondary_text_dark));
                 }
@@ -514,13 +770,13 @@
                 if (entry.icon != null) {
                     holder.appIcon.setImageDrawable(entry.icon);
                 }
-                holder.updateSizeText(ManageApplications.this, mWhichSize);
+                holder.updateSizeText(mTab.mInvalidSizeStr, mWhichSize);
                 if (InstalledAppDetails.SUPPORT_DISABLE_APPS) {
                     holder.disabled.setVisibility(entry.info.enabled ? View.GONE : View.VISIBLE);
                 } else {
                     holder.disabled.setVisibility(View.GONE);
                 }
-                if (mLastFilterMode == FILTER_APPS_SDCARD) {
+                if (mFilterMode == FILTER_APPS_SDCARD) {
                     holder.checkBox.setVisibility(View.VISIBLE);
                     holder.checkBox.setChecked((entry.info.flags
                             & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0);
@@ -551,10 +807,9 @@
         setHasOptionsMenu(true);
 
         mApplicationsState = ApplicationsState.getInstance(getActivity().getApplication());
-        mApplicationsAdapter = new ApplicationsAdapter(mApplicationsState);
         Intent intent = getActivity().getIntent();
         String action = intent.getAction();
-        String defaultTabTag = TAB_DOWNLOADED;
+        int defaultListType = LIST_TYPE_DOWNLOADED;
         String className = getArguments() != null
                 ? getArguments().getString("classname") : null;
         if (className == null) {
@@ -562,33 +817,54 @@
         }
         if (className.equals(RunningServicesActivity.class.getName())
                 || className.endsWith(".RunningServices")) {
-            defaultTabTag = TAB_RUNNING;
+            defaultListType = LIST_TYPE_RUNNING;
         } else if (className.equals(StorageUseActivity.class.getName())
                 || Intent.ACTION_MANAGE_PACKAGE_STORAGE.equals(action)
                 || className.endsWith(".StorageUse")) {
             mSortOrder = SORT_ORDER_SIZE;
-            mFilterApps = FILTER_APPS_ALL;
-            defaultTabTag = TAB_ALL;
+            defaultListType = LIST_TYPE_ALL;
         } else if (Settings.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS.equals(action)) {
-            // Select the all-apps tab, with the default sorting
-            defaultTabTag = TAB_ALL;
+            // Select the all-apps list, with the default sorting
+            defaultListType = LIST_TYPE_ALL;
         }
-        
+
         if (savedInstanceState != null) {
-            mSortOrder = savedInstanceState.getInt("sortOrder", mSortOrder);
-            mFilterApps = savedInstanceState.getInt("filterApps", mFilterApps);
-            String tmp = savedInstanceState.getString("defaultTabTag");
-            if (tmp != null) defaultTabTag = tmp;
-            mShowBackground = savedInstanceState.getBoolean("showBackground", false);
+            mSortOrder = savedInstanceState.getInt(EXTRA_SORT_ORDER, mSortOrder);
+            int tmp = savedInstanceState.getInt(EXTRA_DEFAULT_LIST_TYPE, -1);
+            if (tmp != -1) defaultListType = tmp;
+            mShowBackground = savedInstanceState.getBoolean(EXTRA_SHOW_BACKGROUND, false);
         }
-        
-        mDefaultTab = defaultTabTag;
-        
-        mDataFileStats = new StatFs("/data");
-        mSDCardFileStats = new StatFs(Environment.getExternalStorageDirectory().toString());
+
+        mDefaultListType = defaultListType;
+
+        final Intent containerIntent = new Intent().setComponent(
+                StorageMeasurement.DEFAULT_CONTAINER_COMPONENT);
+        getActivity().bindService(containerIntent, mContainerConnection, Context.BIND_AUTO_CREATE);
 
         mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value);
         mComputingSizeStr = getActivity().getText(R.string.computing_size);
+
+        TabInfo tab = new TabInfo(this, mApplicationsState,
+                getActivity().getString(R.string.filter_apps_third_party),
+                LIST_TYPE_DOWNLOADED, this, savedInstanceState);
+        mTabs.add(tab);
+
+        if (!Environment.isExternalStorageEmulated()) {
+            tab = new TabInfo(this, mApplicationsState,
+                    getActivity().getString(R.string.filter_apps_onsdcard),
+                    LIST_TYPE_SDCARD, this, savedInstanceState);
+            mTabs.add(tab);
+        }
+
+        tab = new TabInfo(this, mApplicationsState,
+                getActivity().getString(R.string.filter_apps_running),
+                LIST_TYPE_RUNNING, this, savedInstanceState);
+        mTabs.add(tab);
+
+        tab = new TabInfo(this, mApplicationsState,
+                getActivity().getString(R.string.filter_apps_all),
+                LIST_TYPE_ALL, this, savedInstanceState);
+        mTabs.add(tab);
     }
 
 
@@ -596,61 +872,41 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // initialize the inflater
         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
-        ListView lv = (ListView) mListContainer.findViewById(android.R.id.list);
-        View emptyView = mListContainer.findViewById(com.android.internal.R.id.empty);
-        if (emptyView != null) {
-            lv.setEmptyView(emptyView);
+
+        View rootView = mInflater.inflate(R.layout.manage_applications_content,
+                container, false);
+        mContentContainer = container;
+        mRootView = rootView;
+
+        mViewPager = (ViewPager) rootView.findViewById(R.id.pager);
+        MyPagerAdapter adapter = new MyPagerAdapter();
+        mViewPager.setAdapter(adapter);
+        mViewPager.setOnPageChangeListener(adapter);
+        PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
+        tabs.setTabIndicatorColorResource(android.R.color.holo_blue_light);
+
+        // We have to do this now because PreferenceFrameLayout looks at it
+        // only when the view is added.
+        if (container instanceof PreferenceFrameLayout) {
+            ((PreferenceFrameLayout.LayoutParams) rootView.getLayoutParams()).removeBorders = true;
         }
-        lv.setOnItemClickListener(this);
-        lv.setSaveEnabled(true);
-        lv.setItemsCanFocus(true);
-        lv.setOnItemClickListener(this);
-        lv.setTextFilterEnabled(true);
-        mListView = lv;
-        lv.setRecyclerListener(mApplicationsAdapter);
-        mListView.setAdapter(mApplicationsAdapter);
-        mColorBar = (LinearColorBar)mListContainer.findViewById(R.id.storage_color_bar);
-        mStorageChartLabel = (TextView)mListContainer.findViewById(R.id.storageChartLabel);
-        mUsedStorageText = (TextView)mListContainer.findViewById(R.id.usedStorageText);
-        mFreeStorageText = (TextView)mListContainer.findViewById(R.id.freeStorageText);
-        mRunningProcessesView = (RunningProcessesView)mRootView.findViewById(
-                R.id.running_processes);
 
-        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(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));
+        if (savedInstanceState != null && savedInstanceState.getBoolean(EXTRA_RESET_DIALOG)) {
+            buildResetDialog();
         }
-        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(getActivity().getString(R.string.filter_apps_all),
-                        getActivity().getResources().getDrawable(R.drawable.ic_tab_all))
-                .setContent(this));
-        tabHost.setCurrentTabByTag(mDefaultTab);
-        tabHost.setOnTabChangedListener(this);
 
-        // adjust padding around tabwidget as needed
-        prepareCustomPreferencesList(container, mTabHost, mListView, false);
+        if (savedInstanceState == null) {
+            // First time init: make sure view pager is showing the correct tab.
+            for (int i = 0; i < mTabs.size(); i++) {
+                TabInfo tab = mTabs.get(i);
+                if (tab.mListType == mDefaultListType) {
+                    mViewPager.setCurrentItem(i);
+                    break;
+                }
+            }
+        }
 
-        return mTabHost;
+        return rootView;
     }
 
     @Override
@@ -662,32 +918,50 @@
     public void onResume() {
         super.onResume();
         mActivityResumed = true;
-        showCurrentTab();
+        updateCurrentTab(mViewPager.getCurrentItem());
         updateOptionsMenu();
-        mTabHost.getTabWidget().setEnabled(true);
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt("sortOrder", mSortOrder);
-        outState.putInt("filterApps", mFilterApps);
-        if (mDefaultTab != null) {
-            outState.putString("defautTabTag", mDefaultTab);
+        outState.putInt(EXTRA_SORT_ORDER, mSortOrder);
+        if (mDefaultListType != -1) {
+            outState.putInt(EXTRA_DEFAULT_LIST_TYPE, mDefaultListType);
         }
-        outState.putBoolean("showBackground", mShowBackground);
+        outState.putBoolean(EXTRA_SHOW_BACKGROUND, mShowBackground);
+        if (mResetDialog != null) {
+            outState.putBoolean(EXTRA_RESET_DIALOG, true);
+        }
     }
 
     @Override
     public void onPause() {
         super.onPause();
         mActivityResumed = false;
-        mApplicationsAdapter.pause();
-        if (mResumedRunning) {
-            mRunningProcessesView.doPause();
-            mResumedRunning = false;
+        for (int i=0; i<mTabs.size(); i++) {
+            mTabs.get(i).pause();
         }
-        mTabHost.getTabWidget().setEnabled(false);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (mResetDialog != null) {
+            mResetDialog.dismiss();
+            mResetDialog = null;
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        // We are going to keep the tab data structures around, but they
+        // are no longer attached to their view hierarchy.
+        for (int i=0; i<mTabs.size(); i++) {
+            mTabs.get(i).detachView();
+        }
     }
 
     @Override
@@ -696,7 +970,17 @@
             mApplicationsState.requestSize(mCurrentPkgName);
         }
     }
-    
+
+    TabInfo tabForType(int type) {
+        for (int i = 0; i < mTabs.size(); i++) {
+            TabInfo tab = mTabs.get(i);
+            if (tab.mListType == type) {
+                return tab;
+            }
+        }
+        return null;
+    }
+
     // utility method used to start sub activity
     private void startApplicationDetailsActivity() {
         // start new fragment to display extended information
@@ -724,6 +1008,8 @@
                 .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);
+        menu.add(0, RESET_APP_PREFERENCES, 4, R.string.reset_app_preferences)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         updateOptionsMenu();
     }
     
@@ -736,7 +1022,13 @@
     public void onDestroyOptionsMenu() {
         mOptionsMenu = null;
     }
-    
+
+    @Override
+    public void onDestroy() {
+        getActivity().unbindService(mContainerConnection);
+        super.onDestroy();
+    }
+
     void updateOptionsMenu() {
         if (mOptionsMenu == null) {
             return;
@@ -746,18 +1038,112 @@
          * 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 != null
-                    ? mRunningProcessesView.mAdapter.getShowBackground() : false;
+        if (mCurTab != null && mCurTab.mListType == LIST_TYPE_RUNNING) {
+            TabInfo tab = tabForType(LIST_TYPE_RUNNING);
+            boolean showingBackground = tab != null && tab.mRunningProcessesView != null
+                    ? tab.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);
+            mOptionsMenu.findItem(RESET_APP_PREFERENCES).setVisible(false);
         } else {
             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);
+            mOptionsMenu.findItem(RESET_APP_PREFERENCES).setVisible(true);
+        }
+    }
+
+    void buildResetDialog() {
+        if (mResetDialog == null) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            builder.setTitle(R.string.reset_app_preferences_title);
+            builder.setMessage(R.string.reset_app_preferences_desc);
+            builder.setPositiveButton(R.string.reset_app_preferences_button, this);
+            builder.setNegativeButton(R.string.cancel, null);
+            mResetDialog = builder.show();
+            mResetDialog.setOnDismissListener(this);
+        }
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        if (mResetDialog == dialog) {
+            mResetDialog = null;
+        }
+    }
+
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (mResetDialog == dialog) {
+            final PackageManager pm = getActivity().getPackageManager();
+            final INotificationManager nm = INotificationManager.Stub.asInterface(
+                    ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+            final NetworkPolicyManager npm = NetworkPolicyManager.from(getActivity());
+            final Handler handler = new Handler(getActivity().getMainLooper());
+            (new AsyncTask<Void, Void, Void>() {
+                @Override protected Void doInBackground(Void... params) {
+                    List<ApplicationInfo> apps = pm.getInstalledApplications(
+                            PackageManager.GET_DISABLED_COMPONENTS);
+                    for (int i=0; i<apps.size(); i++) {
+                        ApplicationInfo app = apps.get(i);
+                        try {
+                            if (DEBUG) Log.v(TAG, "Enabling notifications: " + app.packageName);
+                            nm.setNotificationsEnabledForPackage(app.packageName, true);
+                        } catch (android.os.RemoteException ex) {
+                        }
+                        if (DEBUG) Log.v(TAG, "Clearing preferred: " + app.packageName);
+                        pm.clearPackagePreferredActivities(app.packageName);
+                        if (!app.enabled) {
+                            if (DEBUG) Log.v(TAG, "Enabling app: " + app.packageName);
+                            if (pm.getApplicationEnabledSetting(app.packageName)
+                                    == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
+                                pm.setApplicationEnabledSetting(app.packageName,
+                                        PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                                        PackageManager.DONT_KILL_APP);
+                            }
+                        }
+                    }
+                    // We should have cleared all of the preferred apps above;
+                    // just in case some may be lingering, retrieve whatever is
+                    // still set and remove it.
+                    ArrayList<IntentFilter> filters = new ArrayList<IntentFilter>();
+                    ArrayList<ComponentName> prefActivities = new ArrayList<ComponentName>();
+                    pm.getPreferredActivities(filters, prefActivities, null);
+                    for (int i=0; i<prefActivities.size(); i++) {
+                        if (DEBUG) Log.v(TAG, "Clearing preferred: "
+                                + prefActivities.get(i).getPackageName());
+                        pm.clearPackagePreferredActivities(prefActivities.get(i).getPackageName());
+                    }
+                    final int[] restrictedAppIds = npm.getAppsWithPolicy(
+                            POLICY_REJECT_METERED_BACKGROUND);
+                    for (int i : restrictedAppIds) {
+                        if (DEBUG) Log.v(TAG, "Clearing data policy: " + i);
+                        npm.setAppPolicy(i, POLICY_NONE);
+                    }
+                    handler.post(new Runnable() {
+                        @Override public void run() {
+                            if (DEBUG) Log.v(TAG, "Done clearing");
+                            if (getActivity() != null && mActivityResumed) {
+                                if (DEBUG) Log.v(TAG, "Updating UI!");
+                                for (int i=0; i<mTabs.size(); i++) {
+                                    TabInfo tab = mTabs.get(i);
+                                    if (tab.mApplications != null) {
+                                        tab.mApplications.pause();
+                                    }
+                                }
+                                if (mCurTab != null) {
+                                    mCurTab.resume(mSortOrder);
+                                }
+                            }
+                        }
+                    });
+                    return null;
+                }
+            }).execute();
         }
     }
 
@@ -766,200 +1152,78 @@
         int menuId = item.getItemId();
         if ((menuId == SORT_ORDER_ALPHA) || (menuId == SORT_ORDER_SIZE)) {
             mSortOrder = menuId;
-            if (mCurView != VIEW_RUNNING) {
-                mApplicationsAdapter.rebuild(mFilterApps, mSortOrder);
+            if (mCurTab != null && mCurTab.mApplications != null) {
+                mCurTab.mApplications.rebuild(mSortOrder);
             }
         } else if (menuId == SHOW_RUNNING_SERVICES) {
             mShowBackground = false;
-            mRunningProcessesView.mAdapter.setShowBackground(false);
+            if (mCurTab != null && mCurTab.mRunningProcessesView != null) {
+                mCurTab.mRunningProcessesView.mAdapter.setShowBackground(false);
+            }
         } else if (menuId == SHOW_BACKGROUND_PROCESSES) {
             mShowBackground = true;
-            mRunningProcessesView.mAdapter.setShowBackground(true);
+            if (mCurTab != null && mCurTab.mRunningProcessesView != null) {
+                mCurTab.mRunningProcessesView.mAdapter.setShowBackground(true);
+            }
+        } else if (menuId == RESET_APP_PREFERENCES) {
+            buildResetDialog();
+        } else {
+            // Handle the home button
+            return false;
         }
         updateOptionsMenu();
         return true;
     }
     
-    public void onItemClick(AdapterView<?> parent, View view, int position,
+    public void onItemClick(TabInfo tab, AdapterView<?> parent, View view, int position,
             long id) {
-        ApplicationsState.AppEntry entry = mApplicationsAdapter.getAppEntry(position);
-        mCurrentPkgName = entry.info.packageName;
-        startApplicationDetailsActivity();
-    }
-    
-    public View createTabContent(String tag) {
-        return mRootView;
-    }
-
-    static final int VIEW_NOTHING = 0;
-    static final int VIEW_LIST = 1;
-    static final int VIEW_RUNNING = 2;
-
-    void updateStorageUsage() {
-        if (mCurView == VIEW_RUNNING) {
-            return;
+        if (tab.mApplications != null && tab.mApplications.getCount() > position) {
+            ApplicationsState.AppEntry entry = tab.mApplications.getAppEntry(position);
+            mCurrentPkgName = entry.info.packageName;
+            startApplicationDetailsActivity();
         }
+    }
 
-        long freeStorage = 0;
-        long appStorage = 0;
-        long totalStorage = 0;
-        CharSequence newLabel = null;
+    public void updateCurrentTab(int position) {
+        TabInfo tab = mTabs.get(position);
+        mCurTab = tab;
 
-        if (mFilterApps == FILTER_APPS_SDCARD) {
-            if (mLastShowedInternalStorage) {
-                mLastShowedInternalStorage = false;
-            }
-            newLabel = getActivity().getText(R.string.sd_card_storage);
-            mSDCardFileStats.restat(Environment.getExternalStorageDirectory().toString());
-            try {
-                totalStorage = (long)mSDCardFileStats.getBlockCount() *
-                        mSDCardFileStats.getBlockSize();
-                freeStorage = (long) mSDCardFileStats.getAvailableBlocks() *
-                mSDCardFileStats.getBlockSize();
-            } 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;
-            }
+        // Put things in the correct paused/resumed state.
+        if (mActivityResumed) {
+            mCurTab.build(mInflater, mContentContainer, mRootView);
+            mCurTab.resume(mSortOrder);
         } else {
-            if (!mLastShowedInternalStorage) {
-                mLastShowedInternalStorage = true;
-            }
-            newLabel = getActivity().getText(R.string.internal_storage);
-            mDataFileStats.restat("/data");
-            try {
-                totalStorage = (long)mDataFileStats.getBlockCount() *
-                        mDataFileStats.getBlockSize();
-                freeStorage = (long) mDataFileStats.getAvailableBlocks() *
-                    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();
+            mCurTab.pause();
         }
-        if (newLabel != null) {
-            mStorageChartLabel.setText(newLabel);
-        }
-        if (totalStorage > 0) {
-            mColorBar.setRatios((totalStorage-freeStorage-appStorage)/(float)totalStorage,
-                    appStorage/(float)totalStorage, freeStorage/(float)totalStorage);
-            long usedStorage = totalStorage - freeStorage;
-            if (mLastUsedStorage != usedStorage) {
-                mLastUsedStorage = usedStorage;
-                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(getActivity(), freeStorage);
-                mFreeStorageText.setText(getActivity().getResources().getString(
-                        R.string.service_background_processes, sizeStr));
-            }
-        } else {
-            mColorBar.setRatios(0, 0, 0);
-            if (mLastUsedStorage != -1) {
-                mLastUsedStorage = -1;
-                mUsedStorageText.setText("");
-            }
-            if (mLastFreeStorage != -1) {
-                mLastFreeStorage = -1;
-                mFreeStorageText.setText("");
+        for (int i=0; i<mTabs.size(); i++) {
+            TabInfo t = mTabs.get(i);
+            if (t != mCurTab) {
+                t.pause();
             }
         }
-    }
 
-    private void selectView(int which) {
-        if (which == VIEW_LIST) {
-            if (mResumedRunning) {
-                mRunningProcessesView.doPause();
-                mResumedRunning = false;
-            }
-            if (mCurView != which) {
-                mRunningProcessesView.setVisibility(View.GONE);
-                mListContainer.setVisibility(View.VISIBLE);
-                mLoadingContainer.setVisibility(View.GONE);
-            }
-            if (mActivityResumed) {
-                mApplicationsAdapter.resume(mFilterApps, mSortOrder);
-            }
-        } else if (which == VIEW_RUNNING) {
-            if (!mCreatedRunning) {
-                mRunningProcessesView.doCreate(null);
-                mRunningProcessesView.mAdapter.setShowBackground(mShowBackground);
-                mCreatedRunning = true;
-            }
-            boolean haveData = true;
-            if (mActivityResumed && !mResumedRunning) {
-                haveData = mRunningProcessesView.doResume(this, mRunningProcessesAvail);
-                mResumedRunning = true;
-            }
-            mApplicationsAdapter.pause();
-            if (mCurView != which) {
-                if (haveData) {
-                    mRunningProcessesView.setVisibility(View.VISIBLE);
-                } else {
-                    mLoadingContainer.setVisibility(View.VISIBLE);
-                }
-                mListContainer.setVisibility(View.GONE);
-            }
-        }
-        mCurView = which;
+        mCurTab.updateStorageUsage();
+        updateOptionsMenu();
         final Activity host = getActivity();
         if (host != null) {
             host.invalidateOptionsMenu();
         }
     }
 
-    void handleRunningProcessesAvail() {
-        if (mCurView == VIEW_RUNNING) {
-            mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(
-                    getActivity(), android.R.anim.fade_out));
-            mRunningProcessesView.startAnimation(AnimationUtils.loadAnimation(
-                    getActivity(), android.R.anim.fade_in));
-            mRunningProcessesView.setVisibility(View.VISIBLE);
-            mLoadingContainer.setVisibility(View.GONE);
-        }
-    }
+    private volatile IMediaContainerService mContainerService;
 
-    public void showCurrentTab() {
-        String tabId = mDefaultTab = mTabHost.getCurrentTabTag();
-        int newOption;
-        if (TAB_DOWNLOADED.equalsIgnoreCase(tabId)) {
-            newOption = FILTER_APPS_THIRD_PARTY;
-        } else if (TAB_ALL.equalsIgnoreCase(tabId)) {
-            newOption = FILTER_APPS_ALL;
-        } else if (TAB_SDCARD.equalsIgnoreCase(tabId)) {
-            newOption = FILTER_APPS_SDCARD;
-        } else if (TAB_RUNNING.equalsIgnoreCase(tabId)) {
-            ((InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE))
-                    .hideSoftInputFromWindow(
-                            getActivity().getWindow().getDecorView().getWindowToken(), 0);
-            selectView(VIEW_RUNNING);
-            return;
-        } else {
-            // Invalid option. Do nothing
-            return;
+    private final ServiceConnection mContainerConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mContainerService = IMediaContainerService.Stub.asInterface(service);
+            for (int i=0; i<mTabs.size(); i++) {
+                mTabs.get(i).setContainerService(mContainerService);
+            }
         }
-        
-        mFilterApps = newOption;
-        selectView(VIEW_LIST);
-        updateStorageUsage();
-        updateOptionsMenu();
-    }
 
-    public void onTabChanged(String tabId) {
-        showCurrentTab();
-    }
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mContainerService = null;
+        }
+    };
 }
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index 08cb0e0..f91abd6 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -553,6 +553,7 @@
 
     @Override
     public void onRefreshUi(int what) {
+        if (getActivity() == null) return;
         switch (what) {
             case REFRESH_TIME:
                 updateTimes();
diff --git a/src/com/android/settings/bluetooth/BluetoothEventManager.java b/src/com/android/settings/bluetooth/BluetoothEventManager.java
index 9140b25..a6d9bcf 100644
--- a/src/com/android/settings/bluetooth/BluetoothEventManager.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventManager.java
@@ -139,8 +139,6 @@
     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);
diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index 4996858..b80e42a 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -30,10 +30,14 @@
 import android.text.InputFilter;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.android.settings.R;
 
@@ -94,19 +98,23 @@
                 .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);
-                                }
+                                String deviceName = mDeviceNameView.getText().toString();
+                                setDeviceName(deviceName);
                             }
                         })
                 .setNegativeButton(android.R.string.cancel, null)
                 .create();
+        mAlertDialog.getWindow().setSoftInputMode(
+                WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
 
         return mAlertDialog;
     }
 
+    private void setDeviceName(String deviceName) {
+        Log.d(TAG, "Setting device name to " + deviceName);
+        mLocalAdapter.setName(deviceName);
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putString(KEY_NAME, mDeviceNameView.getText().toString());
@@ -123,6 +131,18 @@
         });
         mDeviceNameView.setText(deviceName);    // set initial value before adding listener
         mDeviceNameView.addTextChangedListener(this);
+        mDeviceNameView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    setDeviceName(v.getText().toString());
+                    mAlertDialog.dismiss();
+                    return true;    // action handled
+                } else {
+                    return false;   // not handled
+                }
+            }
+        });
         return view;
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 7c8cb6e..d30e428 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -182,6 +182,7 @@
                 .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);
+        super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
@@ -378,4 +379,9 @@
             preference.setOnSettingsClickListener(mDeviceProfilesListener);
         }
     }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_bluetooth;
+    }
 }
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index 07a7316..529312d 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -173,6 +173,11 @@
 
         mDialog = builder.create();
         mDialog.show();
+
+        if (getResources().getBoolean(R.bool.auto_confirm_bluetooth_activation_dialog) == true) {
+            // dismiss dialog immediately if settings say so
+            onClick(null, DialogInterface.BUTTON_POSITIVE);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
index 9b5946b..5c4b828 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
@@ -62,6 +62,12 @@
         }
 
         createDialog();
+
+        if (getResources().getBoolean(R.bool.auto_confirm_bluetooth_activation_dialog) == true) {
+            // dismiss dialog immediately if settings say so
+            onClick(null, BUTTON_POSITIVE);
+            dismiss();
+        }
     }
 
     void createDialog() {
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 728e558..cb344bf 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -44,6 +44,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 
 public class Memory extends SettingsPreferenceFragment {
     private static final String TAG = "MemorySettings";
@@ -51,8 +52,6 @@
     private static final int DLG_CONFIRM_UNMOUNT = 1;
     private static final int DLG_ERROR_UNMOUNT = 2;
 
-    private static final int MENU_ID_USB = Menu.FIRST;
-
     private Resources mResources;
 
     // The mountToggle Preference that has last been clicked.
@@ -92,9 +91,6 @@
         }
 
         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++) {
@@ -106,8 +102,13 @@
             mStorageVolumePreferenceCategories[i].init();
         }
 
-        // only show options menu if we are not using the legacy USB mass storage support
-        setHasOptionsMenu(!massStorageEnabled);
+        setHasOptionsMenu(true);
+    }
+
+    private boolean isMassStorageEnabled() {
+        // mass storage is enabled if primary volume supports it
+        final StorageVolume[] storageVolumes = mStorageManager.getVolumeList();
+        return (storageVolumes.length > 0 && storageVolumes[0].allowMassStorage());
     }
 
     @Override
@@ -163,15 +164,19 @@
 
     @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);
+        inflater.inflate(R.menu.storage, menu);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        final MenuItem usb = menu.findItem(R.id.storage_usb);
+        usb.setVisible(!isMassStorageEnabled());
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case MENU_ID_USB:
+            case R.id.storage_usb:
                 if (getActivity() instanceof PreferenceActivity) {
                     ((PreferenceActivity) getActivity()).startPreferencePanel(
                             UsbSettings.class.getCanonicalName(),
@@ -204,7 +209,10 @@
             StorageVolumePreferenceCategory svpc = mStorageVolumePreferenceCategories[i];
             Intent intent = svpc.intentForClick(preference);
             if (intent != null) {
-                startActivity(intent);
+                // Don't go across app boundary if monkey is running
+                if (!Utils.isMonkeyRunning()) {
+                    startActivity(intent);
+                }
                 return true;
             }
 
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 434dfe7..d4fea37 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -329,7 +329,8 @@
 
     private void updateNetworkType() {
         // Whether EDGE, UMTS, etc...
-        setSummary(KEY_NETWORK_TYPE, TelephonyProperties.PROPERTY_DATA_NETWORK_TYPE, sUnknown);
+        setSummaryText(KEY_NETWORK_TYPE, mTelephonyManager.getNetworkTypeName() +
+                ":" + mTelephonyManager.getNetworkType());
     }
 
     private void updateDataState() {
diff --git a/src/com/android/settings/deviceinfo/StorageMeasurement.java b/src/com/android/settings/deviceinfo/StorageMeasurement.java
index b4004e9..2792d09 100644
--- a/src/com/android/settings/deviceinfo/StorageMeasurement.java
+++ b/src/com/android/settings/deviceinfo/StorageMeasurement.java
@@ -31,7 +31,7 @@
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
-import android.os.StatFs;
+import android.os.RemoteException;
 import android.os.storage.StorageVolume;
 import android.util.Log;
 
@@ -53,7 +53,7 @@
  * know about by just keeping an array of measurement types of the following
  * properties:
  *
- *   Filesystem stats (using StatFs)
+ *   Filesystem stats (using DefaultContainerService)
  *   Directory measurements (using DefaultContainerService.measureDir)
  *   Application measurements (using PackageManager)
  *
@@ -81,7 +81,7 @@
 
     private static final String DEFAULT_CONTAINER_PACKAGE = "com.android.defcontainer";
 
-    private static final ComponentName DEFAULT_CONTAINER_COMPONENT = new ComponentName(
+    public static final ComponentName DEFAULT_CONTAINER_COMPONENT = new ComponentName(
             DEFAULT_CONTAINER_PACKAGE, "com.android.defcontainer.DefaultContainerService");
 
     private final MeasurementHandler mHandler;
@@ -258,8 +258,6 @@
                         return;
                     }
 
-                    measureApproximateStorage();
-
                     synchronized (mLock) {
                         if (mBound) {
                             removeMessages(MSG_DISCONNECT);
@@ -274,6 +272,7 @@
                 }
                 case MSG_CONNECTED: {
                     IMediaContainerService imcs = (IMediaContainerService) msg.obj;
+                    measureApproximateStorage(imcs);
                     measureExactStorage(imcs);
                     break;
                 }
@@ -367,15 +366,16 @@
             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;
+        private void measureApproximateStorage(IMediaContainerService imcs) {
+            final String path = mStorageVolume != null ? mStorageVolume.getPath()
+                    : Environment.getDataDirectory().getPath();
+            try {
+                final long[] stats = imcs.getFileSystemStats(path);
+                mTotalSize = stats[0];
+                mAvailSize = stats[1];
+            } catch (RemoteException e) {
+                Log.w(TAG, "Problem in container service", e);
+            }
 
             sendInternalApproximateUpdate();
         }
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
index 39a08d8..bbf1d01 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -162,7 +162,7 @@
         mResources = resources;
         mStorageVolume = storageVolume;
         mStorageManager = storageManager;
-        setTitle(storageVolume != null ? storageVolume.getDescription()
+        setTitle(storageVolume != null ? storageVolume.getDescription(context)
                 : resources.getText(R.string.internal_storage));
         mMeasurement = StorageMeasurement.getInstance(context, storageVolume, isPrimary);
         mMeasurement.setReceiver(this);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index b813ec6..fa2b02d 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -21,6 +21,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.hardware.SensorManager;
+import android.net.Uri;
 import android.os.BatteryStats;
 import android.os.BatteryStats.Uid;
 import android.os.Bundle;
@@ -37,6 +38,7 @@
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.telephony.SignalStrength;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.Menu;
@@ -72,6 +74,7 @@
 
     private static final int MENU_STATS_TYPE = Menu.FIRST;
     private static final int MENU_STATS_REFRESH = Menu.FIRST + 1;
+    private static final int MENU_HELP = Menu.FIRST + 2;
 
     private static BatteryStatsImpl sStatsXfer;
 
@@ -318,6 +321,16 @@
                 .setAlphabeticShortcut('r');
         refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+
+        String helpUrl;
+        if (!TextUtils.isEmpty(helpUrl = getResources().getString(R.string.help_url_battery))) {
+            final MenuItem help = menu.add(0, MENU_HELP, 0, R.string.help_label);
+            Intent helpIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(helpUrl));
+            helpIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+            help.setIntent(helpIntent);
+            help.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
index 952146d..28b8616 100644
--- a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
+++ b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
@@ -34,8 +34,7 @@
     private SettingsPreferenceFragment mFragment;
     private TextView mTitleText;
     private TextView mSummaryText;
-    private View mCheckBox;
-    private ImageView mSetingsButton;
+    private ImageView mSettingsButton;
     private Intent mSettingsIntent;
 
     public CheckBoxAndSettingsPreference(Context context, AttributeSet attrs) {
@@ -47,28 +46,28 @@
     @Override
     protected void onBindView(View view) {
         super.onBindView(view);
-        mCheckBox = view.findViewById(R.id.inputmethod_pref);
-        mCheckBox.setOnClickListener(
+        View textLayout = view.findViewById(R.id.inputmethod_pref);
+        textLayout.setOnClickListener(
                 new OnClickListener() {
                     @Override
                     public void onClick(View arg0) {
                         onCheckBoxClicked();
                     }
                 });
-        mSetingsButton = (ImageView)view.findViewById(R.id.inputmethod_settings);
+
+        mSettingsButton = (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(
+        mSettingsButton.setOnClickListener(
                 new OnClickListener() {
                     @Override
-                    public void onClick(View arg0) {
-                        onSettingsButtonClicked(arg0);
+                    public void onClick(View clickedView) {
+                        onSettingsButtonClicked();
                     }
                 });
         enableSettingsButton();
     }
 
-
     @Override
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
@@ -88,23 +87,23 @@
         }
     }
 
-    protected void onSettingsButtonClicked(View arg0) {
+    protected void onSettingsButtonClicked() {
         if (mFragment != null && mSettingsIntent != null) {
             mFragment.startActivity(mSettingsIntent);
         }
     }
 
     private void enableSettingsButton() {
-        if (mSetingsButton != null) {
+        if (mSettingsButton != null) {
             if (mSettingsIntent == null) {
-                mSetingsButton.setVisibility(View.GONE);
+                mSettingsButton.setVisibility(View.GONE);
             } else {
                 final boolean checked = isChecked();
-                mSetingsButton.setEnabled(checked);
-                mSetingsButton.setClickable(checked);
-                mSetingsButton.setFocusable(checked);
+                mSettingsButton.setEnabled(checked);
+                mSettingsButton.setClickable(checked);
+                mSettingsButton.setFocusable(checked);
                 if (!checked) {
-                    mSetingsButton.setAlpha(DISABLED_ALPHA);
+                    mSettingsButton.setAlpha(DISABLED_ALPHA);
                 }
             }
         }
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index aa2bcf4..9624c4a 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings.inputmethod;
 
 import com.android.settings.R;
+import com.android.settings.Settings.KeyboardLayoutPickerActivity;
 import com.android.settings.Settings.SpellCheckersSettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -29,27 +30,30 @@
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.ContentObserver;
+import android.hardware.input.InputManager;
+import android.hardware.input.KeyboardLayout;
 import android.os.Bundle;
 import android.os.Handler;
 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.InputDevice;
 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;
+import java.util.TreeSet;
 
 public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener{
+        implements Preference.OnPreferenceChangeListener, InputManager.InputDeviceListener,
+        KeyboardLayoutDialogFragment.OnSetupKeyboardLayoutsListener {
 
     private static final String KEY_PHONE_LANGUAGE = "phone_language";
     private static final String KEY_CURRENT_INPUT_METHOD = "current_input_method";
@@ -68,17 +72,22 @@
 
     private int mDefaultInputMethodSelectorVisibility = 0;
     private ListPreference mShowInputMethodSelectorPref;
-    private Preference mLanguagePref;
-    private ArrayList<InputMethodPreference> mInputMethodPreferenceList =
-            new ArrayList<InputMethodPreference>();
-    private boolean mHaveHardKeyboard;
+    private PreferenceCategory mKeyboardSettingsCategory;
     private PreferenceCategory mHardKeyboardCategory;
+    private PreferenceCategory mGameControllerCategory;
+    private Preference mLanguagePref;
+    private final ArrayList<InputMethodPreference> mInputMethodPreferenceList =
+            new ArrayList<InputMethodPreference>();
+    private final ArrayList<PreferenceScreen> mHardKeyboardPreferenceList =
+            new ArrayList<PreferenceScreen>();
+    private InputManager mIm;
     private InputMethodManager mImm;
     private List<InputMethodInfo> mImis;
     private boolean mIsOnlyImeSettings;
     private Handler mHandler;
     @SuppressWarnings("unused")
     private SettingsObserver mSettingsObserver;
+    private Intent mIntentWaitingForResult;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -108,18 +117,58 @@
 
         new VoiceInputOutputSettings(this).onCreate();
 
-        // Hard keyboard
-        final Configuration config = getResources().getConfiguration();
-        mHaveHardKeyboard = (config.keyboard == Configuration.KEYBOARD_QWERTY);
+        // Get references to dynamically constructed categories.
+        mHardKeyboardCategory = (PreferenceCategory)findPreference("hard_keyboard");
+        mKeyboardSettingsCategory = (PreferenceCategory)findPreference(
+                "keyboard_settings_category");
+        mGameControllerCategory = (PreferenceCategory)findPreference(
+                "game_controller_settings_category");
 
-        // IME
+        // Filter out irrelevant features if invoked from IME settings button.
         mIsOnlyImeSettings = Settings.ACTION_INPUT_METHOD_SETTINGS.equals(
                 getActivity().getIntent().getAction());
         getActivity().getIntent().setAction(null);
+        if (mIsOnlyImeSettings) {
+            getPreferenceScreen().removeAll();
+            getPreferenceScreen().addPreference(mHardKeyboardCategory);
+            if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
+                getPreferenceScreen().addPreference(mShowInputMethodSelectorPref);
+            }
+            getPreferenceScreen().addPreference(mKeyboardSettingsCategory);
+        }
+
+        // Build IME preference category.
         mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
         mImis = mImm.getInputMethodList();
-        createImePreferenceHierarchy((PreferenceGroup)findPreference("keyboard_settings_category"));
 
+        mKeyboardSettingsCategory.removeAll();
+        if (!mIsOnlyImeSettings) {
+            final PreferenceScreen currentIme = new PreferenceScreen(getActivity(), null);
+            currentIme.setKey(KEY_CURRENT_INPUT_METHOD);
+            currentIme.setTitle(getResources().getString(R.string.current_input_method));
+            mKeyboardSettingsCategory.addPreference(currentIme);
+        }
+
+        mInputMethodPreferenceList.clear();
+        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);
+        }
+
+        if (!mInputMethodPreferenceList.isEmpty()) {
+            Collections.sort(mInputMethodPreferenceList);
+            for (int i = 0; i < N; ++i) {
+                mKeyboardSettingsCategory.addPreference(mInputMethodPreferenceList.get(i));
+            }
+        }
+
+        // Build hard keyboard and game controller preference categories.
+        mIm = (InputManager)getActivity().getSystemService(Context.INPUT_SERVICE);
+        updateInputDevices();
+
+        // Spell Checker
         final Intent intent = new Intent(Intent.ACTION_MAIN);
         intent.setClass(getActivity(), SpellCheckersSettingsActivity.class);
         final SpellCheckersPreference scp = ((SpellCheckersPreference)findPreference(
@@ -143,7 +192,7 @@
 
     private void updateUserDictionaryPreference(Preference userDictionaryPreference) {
         final Activity activity = getActivity();
-        final Set<String> localeList = UserDictionaryList.getUserDictionaryLocalesList(activity);
+        final TreeSet<String> localeList = UserDictionaryList.getUserDictionaryLocalesSet(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.
@@ -153,12 +202,14 @@
                     new Intent(UserDictionaryList.USER_DICTIONARY_SETTINGS_INTENT_ACTION);
             userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
             userDictionaryPreference.setIntent(intent);
+            userDictionaryPreference.setFragment(
+                    com.android.settings.UserDictionarySettings.class.getName());
             // If the size of localeList is 0, we don't set the locale parameter in the
             // extras. This will be interpreted by the UserDictionarySettings class as
             // meaning "the current locale".
-            // Note that with the current code for UserDictionaryList#getUserDictionaryLocalesList()
+            // Note that with the current code for UserDictionaryList#getUserDictionaryLocalesSet()
             // the locale list always has at least one element, since it always includes the current
-            // locale explicitly. @see UserDictionaryList.getUserDictionaryLocalesList().
+            // locale explicitly. @see UserDictionaryList.getUserDictionaryLocalesSet().
             if (localeList.size() == 1) {
                 final String locale = (String)localeList.toArray()[0];
                 userDictionaryPreference.getExtras().putString("locale", locale);
@@ -172,7 +223,10 @@
     @Override
     public void onResume() {
         super.onResume();
+
+        mIm.registerInputDeviceListener(this, null);
         mSettingsObserver.resume();
+
         if (!mIsOnlyImeSettings) {
             if (mLanguagePref != null) {
                 Configuration conf = getResources().getConfiguration();
@@ -190,7 +244,7 @@
         }
 
         // Hard keyboard
-        if (mHaveHardKeyboard) {
+        if (!mHardKeyboardPreferenceList.isEmpty()) {
             for (int i = 0; i < sHardKeyboardKeys.length; ++i) {
                 CheckBoxPreference chkPref = (CheckBoxPreference)
                         mHardKeyboardCategory.findPreference(sHardKeyboardKeys[i]);
@@ -199,6 +253,8 @@
             }
         }
 
+        updateInputDevices();
+
         // IME
         InputMethodAndSubtypeUtil.loadInputMethodSubtypeList(
                 this, getContentResolver(), mImis, null);
@@ -208,12 +264,30 @@
     @Override
     public void onPause() {
         super.onPause();
+
         mSettingsObserver.pause();
+        mIm.unregisterInputDeviceListener(this);
+
         if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
             mShowInputMethodSelectorPref.setOnPreferenceChangeListener(null);
         }
         InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(
-                this, getContentResolver(), mImis, mHaveHardKeyboard);
+                this, getContentResolver(), mImis, !mHardKeyboardPreferenceList.isEmpty());
+    }
+
+    @Override
+    public void onInputDeviceAdded(int deviceId) {
+        updateInputDevices();
+    }
+
+    @Override
+    public void onInputDeviceChanged(int deviceId) {
+        updateInputDevices();
+    }
+
+    @Override
+    public void onInputDeviceRemoved(int deviceId) {
+        updateInputDevices();
     }
 
     @Override
@@ -232,7 +306,7 @@
             }
         } else if (preference instanceof CheckBoxPreference) {
             final CheckBoxPreference chkPref = (CheckBoxPreference) preference;
-            if (mHaveHardKeyboard) {
+            if (!mHardKeyboardPreferenceList.isEmpty()) {
                 for (int i = 0; i < sHardKeyboardKeys.length; ++i) {
                     if (chkPref == mHardKeyboardCategory.findPreference(sHardKeyboardKeys[i])) {
                         System.putInt(getContentResolver(), sSystemSettingNames[i],
@@ -241,6 +315,11 @@
                     }
                 }
             }
+            if (chkPref == mGameControllerCategory.findPreference("vibrate_input_devices")) {
+                System.putInt(getContentResolver(), Settings.System.VIBRATE_INPUT_DEVICES,
+                        chkPref.isChecked() ? 1 : 0);
+                return true;
+            }
         }
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
@@ -317,49 +396,120 @@
         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);
+    private void updateInputDevices() {
+        updateHardKeyboards();
+        updateGameControllers();
+    }
+
+    private void updateHardKeyboards() {
+        mHardKeyboardPreferenceList.clear();
+        if (getResources().getConfiguration().keyboard == Configuration.KEYBOARD_QWERTY) {
+            final int[] devices = InputDevice.getDeviceIds();
+            for (int i = 0; i < devices.length; i++) {
+                InputDevice device = InputDevice.getDevice(devices[i]);
+                if (device != null
+                        && !device.isVirtual()
+                        && device.isFullKeyboard()) {
+                    final String inputDeviceDescriptor = device.getDescriptor();
+                    final String keyboardLayoutDescriptor =
+                            mIm.getCurrentKeyboardLayoutForInputDevice(inputDeviceDescriptor);
+                    final KeyboardLayout keyboardLayout = keyboardLayoutDescriptor != null ?
+                            mIm.getKeyboardLayout(keyboardLayoutDescriptor) : null;
+
+                    final PreferenceScreen pref = new PreferenceScreen(getActivity(), null);
+                    pref.setTitle(device.getName());
+                    if (keyboardLayout != null) {
+                        pref.setSummary(keyboardLayout.toString());
+                    } else {
+                        pref.setSummary(R.string.keyboard_layout_default_label);
+                    }
+                    pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+                        @Override
+                        public boolean onPreferenceClick(Preference preference) {
+                            showKeyboardLayoutDialog(inputDeviceDescriptor);
+                            return true;
+                        }
+                    });
+                    mHardKeyboardPreferenceList.add(pref);
+                }
             }
         }
-        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);
-        }
+        if (!mHardKeyboardPreferenceList.isEmpty()) {
+            for (int i = mHardKeyboardCategory.getPreferenceCount(); i-- > 0; ) {
+                final Preference pref = mHardKeyboardCategory.getPreference(i);
+                if (pref.getOrder() < 1000) {
+                    mHardKeyboardCategory.removePreference(pref);
+                }
+            }
 
-        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(mHardKeyboardPreferenceList);
+            final int count = mHardKeyboardPreferenceList.size();
+            for (int i = 0; i < count; i++) {
+                final Preference pref = mHardKeyboardPreferenceList.get(i);
+                pref.setOrder(i);
+                mHardKeyboardCategory.addPreference(pref);
+            }
 
-        Collections.sort(mInputMethodPreferenceList);
-        for (int i = 0; i < N; ++i) {
-            root.addPreference(mInputMethodPreferenceList.get(i));
+            getPreferenceScreen().addPreference(mHardKeyboardCategory);
+        } else {
+            getPreferenceScreen().removePreference(mHardKeyboardCategory);
         }
     }
 
+    private void showKeyboardLayoutDialog(String inputDeviceDescriptor) {
+        KeyboardLayoutDialogFragment fragment =
+                new KeyboardLayoutDialogFragment(inputDeviceDescriptor);
+        fragment.setTargetFragment(this, 0);
+        fragment.show(getActivity().getFragmentManager(), "keyboardLayout");
+    }
+
+    @Override
+    public void onSetupKeyboardLayouts(String inputDeviceDescriptor) {
+        final Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClass(getActivity(), KeyboardLayoutPickerActivity.class);
+        intent.putExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_DESCRIPTOR,
+                inputDeviceDescriptor);
+        mIntentWaitingForResult = intent;
+        startActivityForResult(intent, 0);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (mIntentWaitingForResult != null) {
+            String inputDeviceDescriptor = mIntentWaitingForResult.getStringExtra(
+                    KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_DESCRIPTOR);
+            mIntentWaitingForResult = null;
+            showKeyboardLayoutDialog(inputDeviceDescriptor);
+        }
+    }
+
+    private void updateGameControllers() {
+        if (haveInputDeviceWithVibrator()) {
+            getPreferenceScreen().addPreference(mGameControllerCategory);
+
+            CheckBoxPreference chkPref = (CheckBoxPreference)
+                    mGameControllerCategory.findPreference("vibrate_input_devices");
+            chkPref.setChecked(System.getInt(getContentResolver(),
+                    Settings.System.VIBRATE_INPUT_DEVICES, 1) > 0);
+        } else {
+            getPreferenceScreen().removePreference(mGameControllerCategory);
+        }
+    }
+
+    private boolean haveInputDeviceWithVibrator() {
+        final int[] devices = InputDevice.getDeviceIds();
+        for (int i = 0; i < devices.length; i++) {
+            InputDevice device = InputDevice.getDevice(devices[i]);
+            if (device != null && !device.isVirtual() && device.getVibrator().hasVibrator()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private class SettingsObserver extends ContentObserver {
         private Context mContext;
 
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index cb4058f..c7d8c89 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -36,6 +37,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class InputMethodAndSubtypeUtil {
@@ -46,6 +48,7 @@
     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 Locale ENGLISH_LOCALE = new Locale("en");
 
     private static final TextUtils.SimpleStringSplitter sStringInputMethodSplitter
             = new TextUtils.SimpleStringSplitter(INPUT_METHOD_SEPARATER);
@@ -183,7 +186,7 @@
                 getEnabledInputMethodsAndSubtypeList(resolver);
         HashSet<String> disabledSystemIMEs = getDisabledSystemIMEs(resolver);
 
-        final boolean onlyOneIME = inputMethodInfos.size() == 1;
+        final int imiCount = inputMethodInfos.size();
         boolean needsToResetSelectedSubtype = false;
         for (InputMethodInfo imi : inputMethodInfos) {
             final String imiId = imi.getId();
@@ -193,11 +196,11 @@
             // pref is instance of CheckBoxPreference in the Configure input method screen.
             final boolean isImeChecked = (pref instanceof CheckBoxPreference) ?
                     ((CheckBoxPreference) pref).isChecked()
-                            : enabledIMEAndSubtypesMap.containsKey(imiId);
+                    : 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 ((!hasHardKeyboard && isAlwaysCheckedIme(imi, context.getActivity(), imiCount))
+                    || isImeChecked) {
                 if (!enabledIMEAndSubtypesMap.containsKey(imiId)) {
                     // imiId has just been enabled
                     enabledIMEAndSubtypesMap.put(imiId, new HashSet<String>());
@@ -373,4 +376,47 @@
     public static boolean isAuxiliaryIme(InputMethodInfo imi) {
         return imi.isAuxiliaryIme();
     }
+
+    public static boolean isAlwaysCheckedIme(InputMethodInfo imi, Context context, int imiCount) {
+        if (imiCount <= 1) {
+            return true;
+        }
+        if (!isSystemIme(imi)) {
+            return false;
+        }
+        if (isAuxiliaryIme(imi)) {
+            return false;
+        }
+        if (isValidDefaultIme(imi, context)) {
+            return true;
+        }
+        return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage());
+    }
+
+    private static boolean isValidDefaultIme(InputMethodInfo imi, Context context) {
+        if (imi.getIsDefaultResourceId() != 0) {
+            try {
+                Resources res = context.createPackageContext(
+                        imi.getPackageName(), 0).getResources();
+                if (res.getBoolean(imi.getIsDefaultResourceId())
+                        && containsSubtypeOf(imi, context.getResources().getConfiguration().
+                                locale.getLanguage())) {
+                    return true;
+                }
+            } catch (PackageManager.NameNotFoundException ex) {
+            } catch (Resources.NotFoundException ex) {
+            }
+        }
+        return false;
+    }
+
+    private static boolean containsSubtypeOf(InputMethodInfo imi, String language) {
+        final int N = imi.getSubtypeCount();
+        for (int i = 0; i < N; ++i) {
+            if (imi.getSubtypeAt(i).getLocale().startsWith(language)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index 4ecdb8e..f555d21 100644
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -39,6 +39,7 @@
 import android.view.inputmethod.InputMethodSubtype;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.util.Comparator;
 import java.util.List;
@@ -51,6 +52,7 @@
     private final InputMethodInfo mImi;
     private final InputMethodManager mImm;
     private final Intent mSettingsIntent;
+    private final boolean mAlwaysChecked;
     private final boolean mIsSystemIme;
 
     private AlertDialog mDialog = null;
@@ -66,10 +68,10 @@
                 return;
             }
             if (isChecked()) {
-                setChecked(false);
+                setChecked(false, true /* save */);
             } else {
                 if (mIsSystemIme) {
-                    setChecked(true);
+                    setChecked(true, true /* save */);
                 } else {
                     showSecurityWarnDialog(mImi, InputMethodPreference.this);
                 }
@@ -87,9 +89,10 @@
         mImm = imm;
         mImi = imi;
         updateSummary();
+        mAlwaysChecked = InputMethodAndSubtypeUtil.isAlwaysCheckedIme(
+                imi, fragment.getActivity(), imiCount);
         mIsSystemIme = InputMethodAndSubtypeUtil.isSystemIme(imi);
-        final boolean isAuxIme = InputMethodAndSubtypeUtil.isAuxiliaryIme(imi);
-        if (imiCount <= 1 || (mIsSystemIme && !isAuxIme)) {
+        if (mAlwaysChecked) {
             setEnabled(false);
         }
     }
@@ -126,8 +129,12 @@
                                 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 String msg = mFragment.getString(
+                                        R.string.failed_to_open_app_settings_toast,
+                                        mImi.loadLabel(
+                                                mFragment.getActivity().getPackageManager()));
+                                Toast.makeText(
+                                        mFragment.getActivity(), msg, Toast.LENGTH_LONG).show();
                             }
                         }
                     });
@@ -222,14 +229,25 @@
         setSummary(summary);
     }
 
-    @Override
-    public void setChecked(boolean checked) {
+    /**
+     * Sets the checkbox state and optionally saves the settings.
+     * @param checked whether to check the box
+     * @param save whether to save IME settings
+     */
+    public void setChecked(boolean checked, boolean save) {
         super.setChecked(checked);
-        saveImeSettings();
+        if (save) {
+            saveImeSettings();
+        }
         updateSummary();
     }
 
-    private void showSecurityWarnDialog(InputMethodInfo imi, final CheckBoxPreference chkPref) {
+    @Override
+    public void setChecked(boolean checked) {
+        setChecked(checked, false);
+    }
+
+    private void showSecurityWarnDialog(InputMethodInfo imi, final InputMethodPreference chkPref) {
         if (mDialog != null && mDialog.isShowing()) {
             mDialog.dismiss();
         }
@@ -241,7 +259,7 @@
                         new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        chkPref.setChecked(true);
+                        chkPref.setChecked(true, true);
                     }
                 })
                 .setNegativeButton(android.R.string.cancel,
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
new file mode 100644
index 0000000..a232a0f
--- /dev/null
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
@@ -0,0 +1,354 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import com.android.settings.R;
+import com.android.settings.Settings.KeyboardLayoutPickerActivity;
+
+import android.app.AlertDialog;
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.AsyncTaskLoader;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.Loader;
+import android.content.res.Resources;
+import android.hardware.input.InputManager;
+import android.hardware.input.KeyboardLayout;
+import android.hardware.input.InputManager.InputDeviceListener;
+import android.os.Bundle;
+import android.view.InputDevice;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.CheckedTextView;
+import android.widget.RadioButton;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class KeyboardLayoutDialogFragment extends DialogFragment
+        implements InputDeviceListener, LoaderCallbacks<KeyboardLayoutDialogFragment.Keyboards> {
+    private static final String KEY_INPUT_DEVICE_DESCRIPTOR = "inputDeviceDescriptor";
+
+    private String mInputDeviceDescriptor;
+    private int mInputDeviceId = -1;
+    private InputManager mIm;
+    private KeyboardLayoutAdapter mAdapter;
+
+    public KeyboardLayoutDialogFragment() {
+    }
+
+    public KeyboardLayoutDialogFragment(String inputDeviceDescriptor) {
+        mInputDeviceDescriptor = inputDeviceDescriptor;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+
+        Context context = activity.getBaseContext();
+        mIm = (InputManager)context.getSystemService(Context.INPUT_SERVICE);
+        mAdapter = new KeyboardLayoutAdapter(context);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            mInputDeviceDescriptor = savedInstanceState.getString(KEY_INPUT_DEVICE_DESCRIPTOR);
+        }
+
+        getLoaderManager().initLoader(0, null, this);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(KEY_INPUT_DEVICE_DESCRIPTOR, mInputDeviceDescriptor);
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Context context = getActivity();
+        LayoutInflater inflater = LayoutInflater.from(context);
+        AlertDialog.Builder builder = new AlertDialog.Builder(context)
+            .setTitle(R.string.keyboard_layout_dialog_title)
+            .setPositiveButton(R.string.keyboard_layout_dialog_setup_button,
+                    new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            onSetupLayoutsButtonClicked();
+                        }
+                    })
+            .setSingleChoiceItems(mAdapter, -1,
+                    new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            onKeyboardLayoutClicked(which);
+                        }
+                    })
+            .setView(inflater.inflate(R.layout.keyboard_layout_dialog_switch_hint, null));
+        updateSwitchHintVisibility();
+        return builder.create();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mIm.registerInputDeviceListener(this, null);
+
+        InputDevice inputDevice = mIm.getInputDeviceByDescriptor(mInputDeviceDescriptor);
+        if (inputDevice == null) {
+            dismiss();
+            return;
+        }
+        mInputDeviceId = inputDevice.getId();
+    }
+
+    @Override
+    public void onPause() {
+        mIm.unregisterInputDeviceListener(this);
+        mInputDeviceId = -1;
+
+        super.onPause();
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        super.onCancel(dialog);
+        dismiss();
+    }
+
+    private void onSetupLayoutsButtonClicked() {
+        ((OnSetupKeyboardLayoutsListener)getTargetFragment()).onSetupKeyboardLayouts(
+                mInputDeviceDescriptor);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        show(getActivity().getFragmentManager(), "layout");
+    }
+
+    private void onKeyboardLayoutClicked(int which) {
+        if (which >= 0 && which < mAdapter.getCount()) {
+            KeyboardLayout keyboardLayout = mAdapter.getItem(which);
+            if (keyboardLayout != null) {
+                mIm.setCurrentKeyboardLayoutForInputDevice(mInputDeviceDescriptor,
+                        keyboardLayout.getDescriptor());
+            }
+            dismiss();
+        }
+    }
+
+    @Override
+    public Loader<Keyboards> onCreateLoader(int id, Bundle args) {
+        return new KeyboardLayoutLoader(getActivity().getBaseContext(), mInputDeviceDescriptor);
+    }
+
+    @Override
+    public void onLoadFinished(Loader<Keyboards> loader, Keyboards data) {
+        mAdapter.clear();
+        mAdapter.addAll(data.keyboardLayouts);
+        mAdapter.setCheckedItem(data.current);
+        AlertDialog dialog = (AlertDialog)getDialog();
+        if (dialog != null) {
+            dialog.getListView().setItemChecked(data.current, true);
+        }
+        updateSwitchHintVisibility();
+    }
+
+    @Override
+    public void onLoaderReset(Loader<Keyboards> loader) {
+        mAdapter.clear();
+        updateSwitchHintVisibility();
+    }
+
+    @Override
+    public void onInputDeviceAdded(int deviceId) {
+    }
+
+    @Override
+    public void onInputDeviceChanged(int deviceId) {
+        if (mInputDeviceId >= 0 && deviceId == mInputDeviceId) {
+            getLoaderManager().restartLoader(0, null, this);
+        }
+    }
+
+    @Override
+    public void onInputDeviceRemoved(int deviceId) {
+        if (mInputDeviceId >= 0 && deviceId == mInputDeviceId) {
+            dismiss();
+        }
+    }
+
+    private void updateSwitchHintVisibility() {
+        AlertDialog dialog = (AlertDialog)getDialog();
+        if (dialog != null) {
+            View customPanel = dialog.findViewById(com.android.internal.R.id.customPanel);
+            customPanel.setVisibility(mAdapter.getCount() > 1 ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    private static final class KeyboardLayoutAdapter extends ArrayAdapter<KeyboardLayout> {
+        private final LayoutInflater mInflater;
+        private int mCheckedItem = -1;
+
+        public KeyboardLayoutAdapter(Context context) {
+            super(context, com.android.internal.R.layout.simple_list_item_2_single_choice);
+            mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        }
+
+        public void setCheckedItem(int position) {
+            mCheckedItem = position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            KeyboardLayout item = getItem(position);
+            String label, collection;
+            if (item != null) {
+                label = item.getLabel();
+                collection = item.getCollection();
+            } else {
+                label = getContext().getString(R.string.keyboard_layout_default_label);
+                collection = "";
+            }
+
+            boolean checked = (position == mCheckedItem);
+            if (collection.isEmpty()) {
+                return inflateOneLine(convertView, parent, label, checked);
+            } else {
+                return inflateTwoLine(convertView, parent, label, collection, checked);
+            }
+        }
+
+        private View inflateOneLine(View convertView, ViewGroup parent,
+                String label, boolean checked) {
+            View view = convertView;
+            if (view == null || isTwoLine(view)) {
+                view = mInflater.inflate(
+                        com.android.internal.R.layout.simple_list_item_single_choice,
+                        parent, false);
+                setTwoLine(view, false);
+            }
+            CheckedTextView headline = (CheckedTextView) view.findViewById(android.R.id.text1);
+            headline.setText(label);
+            headline.setChecked(checked);
+            return view;
+        }
+
+        private View inflateTwoLine(View convertView, ViewGroup parent,
+                String label, String collection, boolean checked) {
+            View view = convertView;
+            if (view == null || !isTwoLine(view)) {
+                view = mInflater.inflate(
+                        com.android.internal.R.layout.simple_list_item_2_single_choice,
+                        parent, false);
+                setTwoLine(view, true);
+            }
+            TextView headline = (TextView) view.findViewById(android.R.id.text1);
+            TextView subText = (TextView) view.findViewById(android.R.id.text2);
+            RadioButton radioButton =
+                    (RadioButton)view.findViewById(com.android.internal.R.id.radio);
+            headline.setText(label);
+            subText.setText(collection);
+            radioButton.setChecked(checked);
+            return view;
+        }
+
+        private static boolean isTwoLine(View view) {
+            return view.getTag() == Boolean.TRUE;
+        }
+
+        private static void setTwoLine(View view, boolean twoLine) {
+            view.setTag(Boolean.valueOf(twoLine));
+        }
+    }
+
+    private static final class KeyboardLayoutLoader extends AsyncTaskLoader<Keyboards> {
+        private final String mInputDeviceDescriptor;
+
+        public KeyboardLayoutLoader(Context context, String inputDeviceDescriptor) {
+            super(context);
+            mInputDeviceDescriptor = inputDeviceDescriptor;
+        }
+
+        @Override
+        public Keyboards loadInBackground() {
+            Keyboards keyboards = new Keyboards();
+            InputManager im = (InputManager)getContext().getSystemService(Context.INPUT_SERVICE);
+            String[] keyboardLayoutDescriptors = im.getKeyboardLayoutsForInputDevice(
+                    mInputDeviceDescriptor);
+            for (String keyboardLayoutDescriptor : keyboardLayoutDescriptors) {
+                KeyboardLayout keyboardLayout = im.getKeyboardLayout(keyboardLayoutDescriptor);
+                if (keyboardLayout != null) {
+                    keyboards.keyboardLayouts.add(keyboardLayout);
+                }
+            }
+            Collections.sort(keyboards.keyboardLayouts);
+
+            String currentKeyboardLayoutDescriptor =
+                    im.getCurrentKeyboardLayoutForInputDevice(mInputDeviceDescriptor);
+            if (currentKeyboardLayoutDescriptor != null) {
+                final int numKeyboardLayouts = keyboards.keyboardLayouts.size();
+                for (int i = 0; i < numKeyboardLayouts; i++) {
+                    if (keyboards.keyboardLayouts.get(i).getDescriptor().equals(
+                            currentKeyboardLayoutDescriptor)) {
+                        keyboards.current = i;
+                        break;
+                    }
+                }
+            }
+
+            if (keyboards.keyboardLayouts.isEmpty()) {
+                keyboards.keyboardLayouts.add(null); // default layout
+                keyboards.current = 0;
+            }
+            return keyboards;
+        }
+
+        @Override
+        protected void onStartLoading() {
+            super.onStartLoading();
+            forceLoad();
+        }
+
+        @Override
+        protected void onStopLoading() {
+            super.onStopLoading();
+            cancelLoad();
+        }
+    }
+
+    public static final class Keyboards {
+        public final ArrayList<KeyboardLayout> keyboardLayouts = new ArrayList<KeyboardLayout>();
+        public int current = -1;
+    }
+
+    public interface OnSetupKeyboardLayoutsListener {
+        public void onSetupKeyboardLayouts(String inputDeviceDescriptor);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
new file mode 100644
index 0000000..932dd10
--- /dev/null
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import android.content.Context;
+import android.hardware.input.InputManager;
+import android.hardware.input.InputManager.InputDeviceListener;
+import android.hardware.input.KeyboardLayout;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.view.InputDevice;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+public class KeyboardLayoutPickerFragment extends SettingsPreferenceFragment
+        implements InputDeviceListener {
+    private String mInputDeviceDescriptor;
+    private int mInputDeviceId = -1;
+    private InputManager mIm;
+    private KeyboardLayout[] mKeyboardLayouts;
+    private HashMap<CheckBoxPreference, KeyboardLayout> mPreferenceMap =
+            new HashMap<CheckBoxPreference, KeyboardLayout>();
+
+    /**
+     * Intent extra: The input device descriptor of the keyboard whose keyboard
+     * layout is to be changed.
+     */
+    public static final String EXTRA_INPUT_DEVICE_DESCRIPTOR = "input_device_descriptor";
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mInputDeviceDescriptor = getActivity().getIntent().getStringExtra(
+                EXTRA_INPUT_DEVICE_DESCRIPTOR);
+        if (mInputDeviceDescriptor == null) {
+            getActivity().finish();
+        }
+
+        mIm = (InputManager)getSystemService(Context.INPUT_SERVICE);
+        mKeyboardLayouts = mIm.getKeyboardLayouts();
+        Arrays.sort(mKeyboardLayouts);
+        setPreferenceScreen(createPreferenceHierarchy());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mIm.registerInputDeviceListener(this, null);
+
+        InputDevice inputDevice = mIm.getInputDeviceByDescriptor(mInputDeviceDescriptor);
+        if (inputDevice == null) {
+            getActivity().finish();
+            return;
+        }
+        mInputDeviceId = inputDevice.getId();
+
+        updateCheckedState();
+    }
+
+    @Override
+    public void onPause() {
+        mIm.unregisterInputDeviceListener(this);
+        mInputDeviceId = -1;
+
+        super.onPause();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
+            Preference preference) {
+        if (preference instanceof CheckBoxPreference) {
+            CheckBoxPreference checkboxPref = (CheckBoxPreference)preference;
+            KeyboardLayout layout = mPreferenceMap.get(checkboxPref);
+            if (layout != null) {
+                boolean checked = checkboxPref.isChecked();
+                if (checked) {
+                    mIm.addKeyboardLayoutForInputDevice(mInputDeviceDescriptor,
+                            layout.getDescriptor());
+                } else {
+                    mIm.removeKeyboardLayoutForInputDevice(mInputDeviceDescriptor,
+                            layout.getDescriptor());
+                }
+                return true;
+            }
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    @Override
+    public void onInputDeviceAdded(int deviceId) {
+    }
+
+    @Override
+    public void onInputDeviceChanged(int deviceId) {
+        if (mInputDeviceId >= 0 && deviceId == mInputDeviceId) {
+            updateCheckedState();
+        }
+    }
+
+    @Override
+    public void onInputDeviceRemoved(int deviceId) {
+        if (mInputDeviceId >= 0 && deviceId == mInputDeviceId) {
+            getActivity().finish();
+        }
+    }
+
+    private PreferenceScreen createPreferenceHierarchy() {
+        PreferenceScreen root = getPreferenceManager().createPreferenceScreen(getActivity());
+        Context context = getActivity();
+
+        for (KeyboardLayout layout : mKeyboardLayouts) {
+            CheckBoxPreference pref = new CheckBoxPreference(context);
+            pref.setTitle(layout.getLabel());
+            pref.setSummary(layout.getCollection());
+            root.addPreference(pref);
+            mPreferenceMap.put(pref, layout);
+        }
+        return root;
+    }
+
+    private void updateCheckedState() {
+        String[] enabledKeyboardLayouts = mIm.getKeyboardLayoutsForInputDevice(
+                mInputDeviceDescriptor);
+        Arrays.sort(enabledKeyboardLayouts);
+
+        for (Map.Entry<CheckBoxPreference, KeyboardLayout> entry : mPreferenceMap.entrySet()) {
+            entry.getKey().setChecked(Arrays.binarySearch(enabledKeyboardLayouts,
+                    entry.getValue().getDescriptor()) >= 0);
+        }
+    }
+}
diff --git a/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java b/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
index 2a62017..5b28142 100644
--- a/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
+++ b/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
@@ -19,6 +19,7 @@
 import com.android.settings.R;
 
 import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -33,6 +34,7 @@
 import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.TextView;
+import android.widget.Toast;
 
 public class SingleSpellCheckerPreference extends Preference {
     private static final float DISABLED_ALPHA = 0.4f;
@@ -177,7 +179,13 @@
 
     private void onSettingsButtonClicked(View arg0) {
         if (mFragment != null && mSettingsIntent != null) {
-            mFragment.startActivity(mSettingsIntent);
+            try {
+                mFragment.startActivity(mSettingsIntent);
+            } catch (ActivityNotFoundException e) {
+                final String msg = mFragment.getString(R.string.failed_to_open_app_settings_toast,
+                        mSpellCheckerInfo.loadLabel(mFragment.getActivity().getPackageManager()));
+                Toast.makeText(mFragment.getActivity(), msg, Toast.LENGTH_LONG).show();
+            }
         }
     }
 
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
new file mode 100644
index 0000000..e52ab7a
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -0,0 +1,78 @@
+/*
+ * 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.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+public class UserDictionaryAddWordActivity extends Activity {
+
+    private static final String STATE_KEY_IS_OPEN = "isOpen";
+
+    public static final String MODE_EDIT_ACTION = "com.android.settings.USER_DICTIONARY_EDIT";
+    public static final String MODE_INSERT_ACTION = "com.android.settings.USER_DICTIONARY_INSERT";
+
+    private UserDictionaryAddWordContents mContents;
+
+    @Override
+    public void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.user_dictionary_add_word);
+        final Intent intent = getIntent();
+        final String action = intent.getAction();
+        final int mode;
+        if (MODE_EDIT_ACTION.equals(action)) {
+            mode = UserDictionaryAddWordContents.MODE_EDIT;
+        } else if (MODE_INSERT_ACTION.equals(action)) {
+            mode = UserDictionaryAddWordContents.MODE_INSERT;
+        } else {
+            // Can never come here because we only support these two actions in the manifest
+            throw new RuntimeException("Unsupported action: " + action);
+        }
+
+        // The following will get the EXTRA_WORD and EXTRA_LOCALE fields that are in the intent.
+        // We do need to add the action by hand, because UserDictionaryAddWordContents expects
+        // it to be in the bundle, in the EXTRA_MODE key.
+        final Bundle args = intent.getExtras();
+        args.putInt(UserDictionaryAddWordContents.EXTRA_MODE, mode);
+
+        if (null != savedInstanceState) {
+            // Override options if we have a saved state.
+            args.putAll(savedInstanceState);
+        }
+
+        mContents = new UserDictionaryAddWordContents(getWindow().getDecorView(), args);
+    }
+
+    @Override
+    public void onSaveInstanceState(final Bundle outState) {
+        mContents.saveStateIntoBundle(outState);
+    }
+
+    public void onClickCancel(final View v) {
+        finish();
+    }
+
+    public void onClickConfirm(final View v) {
+        mContents.apply(this);
+        finish();
+    }
+}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
new file mode 100644
index 0000000..e46b19c
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -0,0 +1,231 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.provider.UserDictionary;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.EditText;
+
+import com.android.settings.R;
+import com.android.settings.UserDictionarySettings;
+import com.android.settings.Utils;
+
+import java.util.ArrayList;
+import java.util.Locale;
+import java.util.TreeSet;
+
+/**
+ * A container class to factor common code to UserDictionaryAddWordFragment
+ * and UserDictionaryAddWordActivity.
+ */
+public class UserDictionaryAddWordContents {
+    public static final String EXTRA_MODE = "mode";
+    public static final String EXTRA_WORD = "word";
+    public static final String EXTRA_SHORTCUT = "shortcut";
+    public static final String EXTRA_LOCALE = "locale";
+
+    public static final int MODE_EDIT = 0;
+    public static final int MODE_INSERT = 1;
+
+    private static final int FREQUENCY_FOR_USER_DICTIONARY_ADDS = 250;
+
+    private final int mMode; // Either MODE_EDIT or MODE_INSERT
+    private final EditText mWordEditText;
+    private final EditText mShortcutEditText;
+    private String mLocale;
+    private final String mOldWord;
+    private final String mOldShortcut;
+
+    /* package */ UserDictionaryAddWordContents(final View view, final Bundle args) {
+        mWordEditText = (EditText)view.findViewById(R.id.user_dictionary_add_word_text);
+        mShortcutEditText = (EditText)view.findViewById(R.id.user_dictionary_add_shortcut);
+        final String word = args.getString(EXTRA_WORD);
+        if (null != word) {
+            mWordEditText.setText(word);
+            mWordEditText.setSelection(word.length());
+        }
+        final String shortcut = args.getString(EXTRA_SHORTCUT);
+        if (null != shortcut && null != mShortcutEditText) {
+            mShortcutEditText.setText(shortcut);
+        }
+        mMode = args.getInt(EXTRA_MODE); // default return value for #getInt() is 0 = MODE_EDIT
+        mOldWord = args.getString(EXTRA_WORD);
+        mOldShortcut = args.getString(EXTRA_SHORTCUT);
+        updateLocale(args.getString(EXTRA_LOCALE));
+    }
+
+    // locale may be null, this means default locale
+    // It may also be the empty string, which means "all locales"
+    /* package */ void updateLocale(final String locale) {
+        mLocale = null == locale ? Locale.getDefault().toString() : locale;
+    }
+
+    /* package */ void saveStateIntoBundle(final Bundle outState) {
+        outState.putString(EXTRA_WORD, mWordEditText.getText().toString());
+        if (null != mShortcutEditText) {
+            outState.putString(EXTRA_SHORTCUT, mShortcutEditText.getText().toString());
+        }
+        outState.putString(EXTRA_LOCALE, mLocale);
+    }
+
+    /* package */ void delete(final Context context) {
+        if (MODE_EDIT == mMode && !TextUtils.isEmpty(mOldWord)) {
+            // Mode edit: remove the old entry.
+            final ContentResolver resolver = context.getContentResolver();
+            UserDictionarySettings.deleteWord(mOldWord, mOldShortcut, resolver);
+        }
+        // If we are in add mode, nothing was added, so we don't need to do anything.
+    }
+
+    /* package */ void apply(final Context context) {
+        final ContentResolver resolver = context.getContentResolver();
+        if (MODE_EDIT == mMode && !TextUtils.isEmpty(mOldWord)) {
+            // Mode edit: remove the old entry.
+            UserDictionarySettings.deleteWord(mOldWord, mOldShortcut, resolver);
+        }
+        final String newWord = mWordEditText.getText().toString();
+        final String newShortcut;
+        if (null == mShortcutEditText) {
+            newShortcut = null;
+        } else {
+            final String tmpShortcut = mShortcutEditText.getText().toString();
+            if (TextUtils.isEmpty(tmpShortcut)) {
+                newShortcut = null;
+            } else {
+                newShortcut = tmpShortcut;
+            }
+        }
+        if (TextUtils.isEmpty(newWord)) {
+            // If the word is somehow empty, don't insert it.
+            return;
+        }
+        // If there is no shortcut, and the word already exists in the database, then we
+        // should not insert, because either A. the word exists with no shortcut, in which
+        // case the exact same thing we want to insert is already there, or B. the word
+        // exists with at least one shortcut, in which case it has priority on our word.
+        if (hasWord(newWord, context)) return;
+
+        // Disallow duplicates. If the same word with no shortcut is defined, remove it; if
+        // the same word with the same shortcut is defined, remove it; but we don't mind if
+        // there is the same word with a different, non-empty shortcut.
+        UserDictionarySettings.deleteWord(newWord, null, resolver);
+        if (!TextUtils.isEmpty(newShortcut)) {
+            // If newShortcut is empty we just deleted this, no need to do it again
+            UserDictionarySettings.deleteWord(newWord, newShortcut, resolver);
+        }
+
+        // In this class we use the empty string to represent 'all locales' and mLocale cannot
+        // be null. However the addWord method takes null to mean 'all locales'.
+        UserDictionary.Words.addWord(context, newWord.toString(),
+                FREQUENCY_FOR_USER_DICTIONARY_ADDS, newShortcut,
+                TextUtils.isEmpty(mLocale) ? null : Utils.createLocaleFromString(mLocale));
+    }
+
+    private static final String[] HAS_WORD_PROJECTION = { UserDictionary.Words.WORD };
+    private static final String HAS_WORD_SELECTION_ONE_LOCALE = UserDictionary.Words.WORD
+            + "=? AND " + UserDictionary.Words.LOCALE + "=?";
+    private static final String HAS_WORD_SELECTION_ALL_LOCALES = UserDictionary.Words.WORD
+            + "=? AND " + UserDictionary.Words.LOCALE + " is null";
+    private boolean hasWord(final String word, final Context context) {
+        final Cursor cursor;
+        // mLocale == "" indicates this is an entry for all languages. Here, mLocale can't
+        // be null at all (it's ensured by the updateLocale method).
+        if ("".equals(mLocale)) {
+            cursor = context.getContentResolver().query(UserDictionary.Words.CONTENT_URI,
+                      HAS_WORD_PROJECTION, HAS_WORD_SELECTION_ALL_LOCALES,
+                      new String[] { word }, null /* sort order */);
+        } else {
+            cursor = context.getContentResolver().query(UserDictionary.Words.CONTENT_URI,
+                      HAS_WORD_PROJECTION, HAS_WORD_SELECTION_ONE_LOCALE,
+                      new String[] { word, mLocale }, null /* sort order */);
+        }
+        try {
+            if (null == cursor) return false;
+            return cursor.getCount() > 0;
+        } finally {
+            if (null != cursor) cursor.close();
+        }
+    }
+
+    public static class LocaleRenderer {
+        private final String mLocaleString;
+        private final String mDescription;
+        // LocaleString may NOT be null.
+        public LocaleRenderer(final Context context, final String localeString) {
+            mLocaleString = localeString;
+            if (null == localeString) {
+                mDescription = context.getString(R.string.user_dict_settings_more_languages);
+            } else if ("".equals(localeString)) {
+                mDescription = context.getString(R.string.user_dict_settings_all_languages);
+            } else {
+                mDescription = Utils.createLocaleFromString(localeString).getDisplayName();
+            }
+        }
+        @Override
+        public String toString() {
+            return mDescription;
+        }
+        public String getLocaleString() {
+            return mLocaleString;
+        }
+        // "More languages..." is null ; "All languages" is the empty string.
+        public boolean isMoreLanguages() {
+            return null == mLocaleString;
+        }
+    }
+
+    private static void addLocaleDisplayNameToList(final Context context,
+            final ArrayList<LocaleRenderer> list, final String locale) {
+        if (null != locale) {
+            list.add(new LocaleRenderer(context, locale));
+        }
+    }
+
+    // Helper method to get the list of locales to display for this word
+    public ArrayList<LocaleRenderer> getLocalesList(final Activity activity) {
+        final TreeSet<String> locales = UserDictionaryList.getUserDictionaryLocalesSet(activity);
+        // Remove our locale if it's in, because we're always gonna put it at the top
+        locales.remove(mLocale); // mLocale may not be null
+        final String systemLocale = Locale.getDefault().toString();
+        // The system locale should be inside. We want it at the 2nd spot.
+        locales.remove(systemLocale); // system locale may not be null
+        locales.remove(""); // Remove the empty string if it's there
+        final ArrayList<LocaleRenderer> localesList = new ArrayList<LocaleRenderer>();
+        // Add the passed locale, then the system locale at the top of the list. Add an
+        // "all languages" entry at the bottom of the list.
+        addLocaleDisplayNameToList(activity, localesList, mLocale);
+        if (!systemLocale.equals(mLocale)) {
+            addLocaleDisplayNameToList(activity, localesList, systemLocale);
+        }
+        for (final String l : locales) {
+            // TODO: sort in unicode order
+            addLocaleDisplayNameToList(activity, localesList, l);
+        }
+        if (!"".equals(mLocale)) {
+            // If mLocale is "", then we already inserted the "all languages" item, so don't do it
+            addLocaleDisplayNameToList(activity, localesList, ""); // meaning: all languages
+        }
+        localesList.add(new LocaleRenderer(activity, null)); // meaning: select another locale
+        return localesList;
+    }
+}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
new file mode 100644
index 0000000..97ffa19
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
@@ -0,0 +1,148 @@
+/*
+ * 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.
+ */
+package com.android.settings.inputmethod;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+
+import com.android.settings.R;
+import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer;
+
+import java.util.ArrayList;
+import java.util.Locale;
+
+/**
+ * Fragment to add a word/shortcut to the user dictionary.
+ *
+ * As opposed to the UserDictionaryActivity, this is only invoked within Settings
+ * from the UserDictionarySettings.
+ */
+public class UserDictionaryAddWordFragment extends Fragment
+        implements AdapterView.OnItemSelectedListener,
+        com.android.internal.app.LocalePicker.LocaleSelectionListener {
+
+    private static final int OPTIONS_MENU_DELETE = Menu.FIRST;
+
+    private UserDictionaryAddWordContents mContents;
+    private View mRootView;
+    private boolean mIsDeleting = false;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+        mRootView = inflater.inflate(R.layout.user_dictionary_add_word_fullscreen, null);
+        mIsDeleting = false;
+        if (null == mContents) {
+            mContents = new UserDictionaryAddWordContents(mRootView, getArguments());
+        }
+        return mRootView;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem actionItem = menu.add(0, OPTIONS_MENU_DELETE, 0, R.string.delete)
+                .setIcon(android.R.drawable.ic_menu_delete);
+        actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
+                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+    }
+
+    /**
+     * Callback for the framework when a menu option is pressed.
+     *
+     * This class only supports the delete menu item.
+     * @param MenuItem the item that was pressed
+     * @return false to allow normal menu processing to proceed, true to consume it here
+     */
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == OPTIONS_MENU_DELETE) {
+            mContents.delete(getActivity());
+            mIsDeleting = true;
+            getActivity().onBackPressed();
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        // We are being shown: display the word
+        updateSpinner();
+    }
+
+    private void updateSpinner() {
+        final ArrayList<LocaleRenderer> localesList = mContents.getLocalesList(getActivity());
+
+        final Spinner localeSpinner =
+                (Spinner)mRootView.findViewById(R.id.user_dictionary_add_locale);
+        final ArrayAdapter<LocaleRenderer> adapter = new ArrayAdapter<LocaleRenderer>(getActivity(),
+                android.R.layout.simple_spinner_item, localesList);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        localeSpinner.setAdapter(adapter);
+        localeSpinner.setOnItemSelectedListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        // We are being hidden: commit changes to the user dictionary, unless we were deleting it
+        if (!mIsDeleting) {
+            mContents.apply(getActivity());
+        }
+    }
+
+    @Override
+    public void onItemSelected(final AdapterView<?> parent, final View view, final int pos,
+            final long id) {
+        final LocaleRenderer locale = (LocaleRenderer)parent.getItemAtPosition(pos);
+        if (locale.isMoreLanguages()) {
+            PreferenceActivity preferenceActivity = (PreferenceActivity)getActivity();
+            preferenceActivity.startPreferenceFragment(new UserDictionaryLocalePicker(this), true);
+        } else {
+            mContents.updateLocale(locale.getLocaleString());
+        }
+    }
+
+    @Override
+    public void onNothingSelected(final AdapterView<?> parent) {
+        // I'm not sure we can come here, but if we do, that's the right thing to do.
+        final Bundle args = getArguments();
+        mContents.updateLocale(args.getString(UserDictionaryAddWordContents.EXTRA_LOCALE));
+    }
+
+    // Called by the locale picker
+    @Override
+    public void onLocaleSelected(final Locale locale) {
+        mContents.updateLocale(locale.toString());
+        getActivity().onBackPressed();
+    }
+}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index 6b1ca7b..5390be6 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -29,7 +29,6 @@
 import android.provider.UserDictionary;
 
 import java.util.Locale;
-import java.util.Set;
 import java.util.TreeSet;
 
 public class UserDictionaryList extends SettingsPreferenceFragment {
@@ -43,12 +42,12 @@
         setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity()));
     }
 
-    static Set<String> getUserDictionaryLocalesList(Activity activity) {
+    static TreeSet<String> getUserDictionaryLocalesSet(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>();
+        final TreeSet<String> localeList = new TreeSet<String>();
         if (null == cursor) {
             // The user dictionary service is not present or disabled. Return null.
             return null;
@@ -70,7 +69,8 @@
     protected void createUserDictSettings(PreferenceGroup userDictGroup) {
         final Activity activity = getActivity();
         userDictGroup.removeAll();
-        final Set<String> localeList = UserDictionaryList.getUserDictionaryLocalesList(activity);
+        final TreeSet<String> localeList =
+                UserDictionaryList.getUserDictionaryLocalesSet(activity);
 
         if (localeList.isEmpty()) {
             userDictGroup.addPreference(createUserDictionaryPreference(null, activity));
@@ -100,6 +100,7 @@
             newPref.getExtras().putString("locale", locale);
         }
         newPref.setIntent(intent);
+        newPref.setFragment(com.android.settings.UserDictionarySettings.class.getName());
         return newPref;
     }
 
diff --git a/src/com/android/settings/inputmethod/UserDictionaryLocalePicker.java b/src/com/android/settings/inputmethod/UserDictionaryLocalePicker.java
new file mode 100644
index 0000000..b9ccdfd
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionaryLocalePicker.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import java.util.Locale;
+
+public class UserDictionaryLocalePicker extends com.android.internal.app.LocalePicker {
+    public UserDictionaryLocalePicker(final UserDictionaryAddWordFragment parent) {
+        super();
+        setLocaleSelectionListener(parent);
+    }
+}
diff --git a/src/com/android/settings/net/ChartDataLoader.java b/src/com/android/settings/net/ChartDataLoader.java
index 09e6e3b..e0336b7 100644
--- a/src/com/android/settings/net/ChartDataLoader.java
+++ b/src/com/android/settings/net/ChartDataLoader.java
@@ -21,41 +21,44 @@
 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.text.format.DateUtils.HOUR_IN_MILLIS;
 
 import android.content.AsyncTaskLoader;
 import android.content.Context;
-import android.net.INetworkStatsService;
+import android.net.INetworkStatsSession;
 import android.net.NetworkStatsHistory;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
 import android.os.RemoteException;
 
+import com.android.settings.DataUsageSummary.AppItem;
+
 /**
  * Loader for historical chart data for both network and UID details.
  */
 public class ChartDataLoader extends AsyncTaskLoader<ChartData> {
     private static final String KEY_TEMPLATE = "template";
-    private static final String KEY_UIDS = "uids";
+    private static final String KEY_APP = "app";
     private static final String KEY_FIELDS = "fields";
 
-    private final INetworkStatsService mStatsService;
+    private final INetworkStatsSession mSession;
     private final Bundle mArgs;
 
-    public static Bundle buildArgs(NetworkTemplate template, int[] uids) {
-        return buildArgs(template, uids, FIELD_RX_BYTES | FIELD_TX_BYTES);
+    public static Bundle buildArgs(NetworkTemplate template, AppItem app) {
+        return buildArgs(template, app, FIELD_RX_BYTES | FIELD_TX_BYTES);
     }
 
-    public static Bundle buildArgs(NetworkTemplate template, int[] uids, int fields) {
+    public static Bundle buildArgs(NetworkTemplate template, AppItem app, int fields) {
         final Bundle args = new Bundle();
         args.putParcelable(KEY_TEMPLATE, template);
-        args.putIntArray(KEY_UIDS, uids);
+        args.putParcelable(KEY_APP, app);
         args.putInt(KEY_FIELDS, fields);
         return args;
     }
 
-    public ChartDataLoader(Context context, INetworkStatsService statsService, Bundle args) {
+    public ChartDataLoader(Context context, INetworkStatsSession session, Bundle args) {
         super(context);
-        mStatsService = statsService;
+        mSession = session;
         mArgs = args;
     }
 
@@ -68,11 +71,11 @@
     @Override
     public ChartData loadInBackground() {
         final NetworkTemplate template = mArgs.getParcelable(KEY_TEMPLATE);
-        final int[] uids = mArgs.getIntArray(KEY_UIDS);
+        final AppItem app = mArgs.getParcelable(KEY_APP);
         final int fields = mArgs.getInt(KEY_FIELDS);
 
         try {
-            return loadInBackground(template, uids, fields);
+            return loadInBackground(template, app, fields);
         } 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.
@@ -80,26 +83,31 @@
         }
     }
 
-    private ChartData loadInBackground(NetworkTemplate template, int[] uids, int fields)
+    private ChartData loadInBackground(NetworkTemplate template, AppItem app, int fields)
             throws RemoteException {
         final ChartData data = new ChartData();
-        data.network = mStatsService.getHistoryForNetwork(template, fields);
+        data.network = mSession.getHistoryForNetwork(template, fields);
 
-        if (uids != null) {
-            data.detailDefault = null;
-            data.detailForeground = null;
-
+        if (app != null) {
             // load stats for current uid and template
-            for (int uid : uids) {
+            final int size = app.uids.size();
+            for (int i = 0; i < size; i++) {
+                final int uid = app.uids.keyAt(i);
                 data.detailDefault = collectHistoryForUid(
                         template, uid, SET_DEFAULT, data.detailDefault);
                 data.detailForeground = collectHistoryForUid(
                         template, uid, SET_FOREGROUND, data.detailForeground);
             }
 
-            data.detail = new NetworkStatsHistory(data.detailForeground.getBucketDuration());
-            data.detail.recordEntireHistory(data.detailDefault);
-            data.detail.recordEntireHistory(data.detailForeground);
+            if (size > 0) {
+                data.detail = new NetworkStatsHistory(data.detailForeground.getBucketDuration());
+                data.detail.recordEntireHistory(data.detailDefault);
+                data.detail.recordEntireHistory(data.detailForeground);
+            } else {
+                data.detailDefault = new NetworkStatsHistory(HOUR_IN_MILLIS);
+                data.detailForeground = new NetworkStatsHistory(HOUR_IN_MILLIS);
+                data.detail = new NetworkStatsHistory(HOUR_IN_MILLIS);
+            }
         }
 
         return data;
@@ -124,7 +132,7 @@
     private NetworkStatsHistory collectHistoryForUid(
             NetworkTemplate template, int uid, int set, NetworkStatsHistory existing)
             throws RemoteException {
-        final NetworkStatsHistory history = mStatsService.getHistoryForUid(
+        final NetworkStatsHistory history = mSession.getHistoryForUid(
                 template, uid, set, TAG_NONE, FIELD_RX_BYTES | FIELD_TX_BYTES);
 
         if (existing != null) {
diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java
new file mode 100644
index 0000000..ad12311
--- /dev/null
+++ b/src/com/android/settings/net/DataUsageMeteredSettings.java
@@ -0,0 +1,144 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.net;
+
+import static android.net.NetworkPolicy.LIMIT_DISABLED;
+import static android.net.wifi.WifiInfo.removeDoubleQuotes;
+import static com.android.settings.DataUsageSummary.hasReadyMobileRadio;
+import static com.android.settings.DataUsageSummary.hasWifiRadio;
+
+import android.content.Context;
+import android.net.NetworkPolicy;
+import android.net.NetworkPolicyManager;
+import android.net.NetworkTemplate;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.telephony.TelephonyManager;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+/**
+ * Panel to configure {@link NetworkPolicy#metered} for networks.
+ */
+public class DataUsageMeteredSettings extends SettingsPreferenceFragment {
+
+    private static final boolean SHOW_MOBILE_CATEGORY = false;
+
+    private NetworkPolicyManager mPolicyManager;
+    private WifiManager mWifiManager;
+
+    private NetworkPolicyEditor mPolicyEditor;
+
+    private PreferenceCategory mMobileCategory;
+    private PreferenceCategory mWifiCategory;
+    private Preference mWifiDisabled;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        final Context context = getActivity();
+
+        mPolicyManager = NetworkPolicyManager.from(context);
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+
+        mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
+        mPolicyEditor.read();
+
+        addPreferencesFromResource(R.xml.data_usage_metered_prefs);
+        mMobileCategory = (PreferenceCategory) findPreference("mobile");
+        mWifiCategory = (PreferenceCategory) findPreference("wifi");
+        mWifiDisabled = findPreference("wifi_disabled");
+
+        updateNetworks(context);
+    }
+
+    private void updateNetworks(Context context) {
+        if (SHOW_MOBILE_CATEGORY && hasReadyMobileRadio(context)) {
+            mMobileCategory.removeAll();
+            mMobileCategory.addPreference(buildMobilePref(context));
+        } else {
+            getPreferenceScreen().removePreference(mMobileCategory);
+        }
+
+        mWifiCategory.removeAll();
+        if (hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {
+            for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {
+                if (config.SSID != null) {
+                    mWifiCategory.addPreference(buildWifiPref(context, config));
+                }
+            }
+        } else {
+            mWifiCategory.addPreference(mWifiDisabled);
+        }
+    }
+
+    private Preference buildMobilePref(Context context) {
+        final TelephonyManager tele = TelephonyManager.from(context);
+        final NetworkTemplate template = NetworkTemplate.buildTemplateMobileAll(
+                tele.getSubscriberId());
+        final MeteredPreference pref = new MeteredPreference(context, template);
+        pref.setTitle(tele.getNetworkOperatorName());
+        return pref;
+    }
+
+    private Preference buildWifiPref(Context context, WifiConfiguration config) {
+        final String networkId = removeDoubleQuotes(config.SSID);
+        final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);
+        final MeteredPreference pref = new MeteredPreference(context, template);
+        pref.setTitle(networkId);
+        return pref;
+    }
+
+    private class MeteredPreference extends CheckBoxPreference {
+        private final NetworkTemplate mTemplate;
+        private boolean mBinding;
+
+        public MeteredPreference(Context context, NetworkTemplate template) {
+            super(context);
+            mTemplate = template;
+
+            setPersistent(false);
+
+            mBinding = true;
+            final NetworkPolicy policy = mPolicyEditor.getPolicy(template);
+            if (policy != null) {
+                if (policy.limitBytes != LIMIT_DISABLED) {
+                    setChecked(true);
+                    setEnabled(false);
+                } else {
+                    setChecked(policy.metered);
+                }
+            } else {
+                setChecked(false);
+            }
+            mBinding = false;
+        }
+
+        @Override
+        protected void notifyChanged() {
+            super.notifyChanged();
+            if (!mBinding) {
+                mPolicyEditor.setPolicyMetered(mTemplate, isChecked());
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/net/NetworkPolicyEditor.java b/src/com/android/settings/net/NetworkPolicyEditor.java
index 5ba8ca4..5fe4c06 100644
--- a/src/com/android/settings/net/NetworkPolicyEditor.java
+++ b/src/com/android/settings/net/NetworkPolicyEditor.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.net;
 
+import static android.net.NetworkPolicy.CYCLE_NONE;
 import static android.net.NetworkPolicy.LIMIT_DISABLED;
 import static android.net.NetworkPolicy.SNOOZE_NEVER;
 import static android.net.NetworkPolicy.WARNING_DISABLED;
@@ -27,11 +28,10 @@
 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.NetworkPolicyManager;
 import android.net.NetworkTemplate;
 import android.os.AsyncTask;
-import android.os.RemoteException;
 import android.text.format.Time;
 
 import com.android.internal.util.Objects;
@@ -43,27 +43,23 @@
 
 /**
  * Utility class to modify list of {@link NetworkPolicy}. Specifically knows
- * about which policies can coexist. Not thread safe.
+ * about which policies can coexist. This editor offers thread safety when
+ * talking with {@link NetworkPolicyManager}.
  */
 public class NetworkPolicyEditor {
     // TODO: be more robust when missing policies from service
 
     public static final boolean ENABLE_SPLIT_POLICIES = false;
 
-    private INetworkPolicyManager mPolicyService;
+    private NetworkPolicyManager mPolicyManager;
     private ArrayList<NetworkPolicy> mPolicies = Lists.newArrayList();
 
-    public NetworkPolicyEditor(INetworkPolicyManager policyService) {
-        mPolicyService = checkNotNull(policyService);
+    public NetworkPolicyEditor(NetworkPolicyManager policyManager) {
+        mPolicyManager = checkNotNull(policyManager);
     }
 
     public void read() {
-        final NetworkPolicy[] policies;
-        try {
-            policies = mPolicyService.getNetworkPolicies();
-        } catch (RemoteException e) {
-            throw new RuntimeException("problem reading policies", e);
-        }
+        final NetworkPolicy[] policies = mPolicyManager.getNetworkPolicies();
 
         boolean modified = false;
         mPolicies.clear();
@@ -78,12 +74,6 @@
                 modified = true;
             }
 
-            // drop any WIFI policies that were defined
-            if (policy.template.getMatchRule() == MATCH_WIFI) {
-                modified = true;
-                continue;
-            }
-
             mPolicies.add(policy);
         }
 
@@ -109,11 +99,7 @@
     }
 
     public void write(NetworkPolicy[] policies) {
-        try {
-            mPolicyService.setNetworkPolicies(policies);
-        } catch (RemoteException e) {
-            throw new RuntimeException("problem writing policies", e);
-        }
+        mPolicyManager.setNetworkPolicies(policies);
     }
 
     public boolean hasLimitedPolicy(NetworkTemplate template) {
@@ -139,24 +125,39 @@
         return null;
     }
 
+    @Deprecated
     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;
+        final int cycleDay;
+        final String cycleTimezone;
+        final boolean metered;
 
-        return new NetworkPolicy(
-                template, cycleDay, WARNING_DISABLED, LIMIT_DISABLED, SNOOZE_NEVER);
+        if (template.getMatchRule() == MATCH_WIFI) {
+            cycleDay = CYCLE_NONE;
+            cycleTimezone = Time.TIMEZONE_UTC;
+            metered = false;
+        } else {
+            final Time time = new Time();
+            time.setToNow();
+            cycleDay = time.monthDay;
+            cycleTimezone = time.timezone;
+            metered = true;
+        }
+
+        return new NetworkPolicy(template, cycleDay, cycleTimezone, WARNING_DISABLED,
+                LIMIT_DISABLED, SNOOZE_NEVER, SNOOZE_NEVER, metered, true);
     }
 
     public int getPolicyCycleDay(NetworkTemplate template) {
         return getPolicy(template).cycleDay;
     }
 
-    public void setPolicyCycleDay(NetworkTemplate template, int cycleDay) {
+    public void setPolicyCycleDay(NetworkTemplate template, int cycleDay, String cycleTimezone) {
         final NetworkPolicy policy = getOrCreatePolicy(template);
         policy.cycleDay = cycleDay;
-        policy.lastSnooze = SNOOZE_NEVER;
+        policy.cycleTimezone = cycleTimezone;
+        policy.inferred = false;
+        policy.clearSnooze();
         writeAsync();
     }
 
@@ -167,7 +168,8 @@
     public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) {
         final NetworkPolicy policy = getOrCreatePolicy(template);
         policy.warningBytes = warningBytes;
-        policy.lastSnooze = SNOOZE_NEVER;
+        policy.inferred = false;
+        policy.clearSnooze();
         writeAsync();
     }
 
@@ -178,10 +180,50 @@
     public void setPolicyLimitBytes(NetworkTemplate template, long limitBytes) {
         final NetworkPolicy policy = getOrCreatePolicy(template);
         policy.limitBytes = limitBytes;
-        policy.lastSnooze = SNOOZE_NEVER;
+        policy.inferred = false;
+        policy.clearSnooze();
         writeAsync();
     }
 
+    public boolean getPolicyMetered(NetworkTemplate template) {
+        final NetworkPolicy policy = getPolicy(template);
+        if (policy != null) {
+            return policy.metered;
+        } else {
+            return false;
+        }
+    }
+
+    public void setPolicyMetered(NetworkTemplate template, boolean metered) {
+        boolean modified = false;
+
+        NetworkPolicy policy = getPolicy(template);
+        if (metered) {
+            if (policy == null) {
+                policy = buildDefaultPolicy(template);
+                policy.metered = true;
+                policy.inferred = false;
+                mPolicies.add(policy);
+                modified = true;
+            } else if (!policy.metered) {
+                policy.metered = true;
+                policy.inferred = false;
+                modified = true;
+            }
+
+        } else {
+            if (policy == null) {
+                // ignore when policy doesn't exist
+            } else if (policy.metered) {
+                policy.metered = false;
+                policy.inferred = false;
+                modified = true;
+            }
+        }
+
+        if (modified) writeAsync();
+    }
+
     /**
      * Remove any split {@link NetworkPolicy}.
      */
@@ -198,6 +240,7 @@
         return modified;
     }
 
+    @Deprecated
     public boolean isMobilePolicySplit(String subscriberId) {
         boolean has3g = false;
         boolean has4g = false;
@@ -217,6 +260,7 @@
         return has3g && has4g;
     }
 
+    @Deprecated
     public void setMobilePolicySplit(String subscriberId, boolean split) {
         if (setMobilePolicySplitInternal(subscriberId, split)) {
             writeAsync();
@@ -229,6 +273,7 @@
      *
      * @return {@code true} when any {@link NetworkPolicy} was mutated.
      */
+    @Deprecated
     private boolean setMobilePolicySplitInternal(String subscriberId, boolean split) {
         final boolean beforeSplit = isMobilePolicySplit(subscriberId);
 
@@ -249,21 +294,21 @@
                     : policy4g;
             mPolicies.remove(policy3g);
             mPolicies.remove(policy4g);
-            mPolicies.add(
-                    new NetworkPolicy(templateAll, restrictive.cycleDay, restrictive.warningBytes,
-                            restrictive.limitBytes, SNOOZE_NEVER));
+            mPolicies.add(new NetworkPolicy(templateAll, restrictive.cycleDay,
+                    restrictive.cycleTimezone, restrictive.warningBytes, restrictive.limitBytes,
+                    SNOOZE_NEVER, SNOOZE_NEVER, restrictive.metered, restrictive.inferred));
             return true;
 
         } 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));
+            mPolicies.add(new NetworkPolicy(template3g, policyAll.cycleDay, policyAll.cycleTimezone,
+                    policyAll.warningBytes, policyAll.limitBytes, SNOOZE_NEVER, SNOOZE_NEVER,
+                    policyAll.metered, policyAll.inferred));
+            mPolicies.add(new NetworkPolicy(template4g, policyAll.cycleDay, policyAll.cycleTimezone,
+                    policyAll.warningBytes, policyAll.limitBytes, SNOOZE_NEVER, SNOOZE_NEVER,
+                    policyAll.metered, policyAll.inferred));
             return true;
         } else {
             return false;
diff --git a/src/com/android/settings/net/SummaryForAllUidLoader.java b/src/com/android/settings/net/SummaryForAllUidLoader.java
index c01de45..68dc799 100644
--- a/src/com/android/settings/net/SummaryForAllUidLoader.java
+++ b/src/com/android/settings/net/SummaryForAllUidLoader.java
@@ -18,7 +18,7 @@
 
 import android.content.AsyncTaskLoader;
 import android.content.Context;
-import android.net.INetworkStatsService;
+import android.net.INetworkStatsSession;
 import android.net.NetworkStats;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
@@ -29,7 +29,7 @@
     private static final String KEY_START = "start";
     private static final String KEY_END = "end";
 
-    private final INetworkStatsService mStatsService;
+    private final INetworkStatsSession mSession;
     private final Bundle mArgs;
 
     public static Bundle buildArgs(NetworkTemplate template, long start, long end) {
@@ -40,10 +40,9 @@
         return args;
     }
 
-    public SummaryForAllUidLoader(
-            Context context, INetworkStatsService statsService, Bundle args) {
+    public SummaryForAllUidLoader(Context context, INetworkStatsSession session, Bundle args) {
         super(context);
-        mStatsService = statsService;
+        mSession = session;
         mArgs = args;
     }
 
@@ -60,7 +59,7 @@
         final long end = mArgs.getLong(KEY_END);
 
         try {
-            return mStatsService.getSummaryForAllUid(template, start, end, false);
+            return mSession.getSummaryForAllUid(template, start, end, false);
         } catch (RemoteException e) {
             return null;
         }
diff --git a/src/com/android/settings/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java
index 57d585b..dd2b8c0 100644
--- a/src/com/android/settings/net/UidDetailProvider.java
+++ b/src/com/android/settings/net/UidDetailProvider.java
@@ -22,6 +22,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.TrafficStats;
 import android.text.TextUtils;
@@ -39,21 +40,42 @@
         mUidDetailCache = new SparseArray<UidDetail>();
     }
 
-    public synchronized void clearCache() {
-        mUidDetailCache.clear();
+    public void clearCache() {
+        synchronized (mUidDetailCache) {
+            mUidDetailCache.clear();
+        }
     }
 
     /**
      * Resolve best descriptive label for the given UID.
      */
-    public synchronized UidDetail getUidDetail(int uid, boolean blocking) {
-        final UidDetail cached = mUidDetailCache.get(uid);
-        if (cached != null) {
-            return cached;
+    public UidDetail getUidDetail(int uid, boolean blocking) {
+        UidDetail detail;
+
+        synchronized (mUidDetailCache) {
+            detail = mUidDetailCache.get(uid);
+        }
+
+        if (detail != null) {
+            return detail;
         } else if (!blocking) {
             return null;
         }
 
+        detail = buildUidDetail(uid);
+
+        synchronized (mUidDetailCache) {
+            mUidDetailCache.put(uid, detail);
+        }
+
+        return detail;
+    }
+
+    /**
+     * Build {@link UidDetail} object, blocking until all {@link Drawable}
+     * lookup is finished.
+     */
+    private UidDetail buildUidDetail(int uid) {
         final Resources res = mContext.getResources();
         final PackageManager pm = mContext.getPackageManager();
 
@@ -66,19 +88,16 @@
             case android.os.Process.SYSTEM_UID:
                 detail.label = res.getString(R.string.process_kernel_label);
                 detail.icon = pm.getDefaultActivityIcon();
-                mUidDetailCache.put(uid, detail);
                 return detail;
             case TrafficStats.UID_REMOVED:
                 detail.label = res.getString(R.string.data_usage_uninstalled_apps);
                 detail.icon = pm.getDefaultActivityIcon();
-                mUidDetailCache.put(uid, detail);
                 return detail;
             case TrafficStats.UID_TETHERING:
                 final ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(
                         Context.CONNECTIVITY_SERVICE);
                 detail.label = res.getString(Utils.getTetheringLabel(cm));
                 detail.icon = pm.getDefaultActivityIcon();
-                mUidDetailCache.put(uid, detail);
                 return detail;
         }
 
@@ -113,7 +132,6 @@
             detail.label = Integer.toString(uid);
         }
 
-        mUidDetailCache.put(uid, detail);
         return detail;
     }
 }
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 517eade..fbcdb4f 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -192,23 +192,6 @@
         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);
-                final Locale newLocale = new Locale(locale[0], locale[1], locale[2]);
-                final Locale engineLocale = mTts.getLanguage();
-
-                if (!newLocale.equals(engineLocale)) {
-                    if (DBG) Log.d(TAG, "Loading language ahead of sample check : " + locale);
-                    mTts.setLanguage(newLocale);
-                }
-            }
-        }
-    }
-
     /**
      * Ask the current default engine to return a string of sample text to be
      * spoken to the user.
@@ -218,7 +201,6 @@
 
         if (TextUtils.isEmpty(currentEngine)) currentEngine = mTts.getDefaultEngine();
 
-        maybeUpdateTtsLanguage(currentEngine);
         Locale currentLocale = mTts.getLanguage();
 
         // TODO: This is currently a hidden private API. The intent extras
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index 18d1fdb..fcc2f2e 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -51,6 +51,25 @@
     private Preference mInstallVoicesPreference;
     private Intent mEngineSettingsIntent;
 
+    private TextToSpeech mTts;
+
+    private final TextToSpeech.OnInitListener mTtsInitListener = new TextToSpeech.OnInitListener() {
+        @Override
+        public void onInit(int status) {
+            if (status != TextToSpeech.SUCCESS) {
+                finishFragment();
+            } else {
+                getActivity().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        mLocalePreference.setEnabled(true);
+                        updateVoiceDetails();
+                    }
+                });
+            }
+        }
+    };
+
     public TtsEngineSettingsFragment() {
         super();
     }
@@ -83,7 +102,15 @@
         }
         mInstallVoicesPreference.setEnabled(false);
 
-        updateVoiceDetails();
+        mLocalePreference.setEnabled(false);
+        mTts = new TextToSpeech(getActivity().getApplicationContext(), mTtsInitListener,
+                getEngineName());
+    }
+
+    @Override
+    public void onDestroy() {
+        mTts.shutdown();
+        super.onDestroy();
     }
 
     private void updateVoiceDetails() {
@@ -153,8 +180,7 @@
             mLocalePreference.setValueIndex(selectedLanguageIndex);
         } else {
             mLocalePreference.setValueIndex(0);
-            mEnginesHelper.updateLocalePrefForEngine(getEngineName(),
-                    availableLangs.get(0));
+            updateLanguageTo(availableLangs.get(0));
         }
     }
 
@@ -191,13 +217,23 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mLocalePreference) {
-            mEnginesHelper.updateLocalePrefForEngine(getEngineName(), (String) newValue);
+            updateLanguageTo((String) newValue);
             return true;
         }
 
         return false;
     }
 
+    private void updateLanguageTo(String locale) {
+        mEnginesHelper.updateLocalePrefForEngine(getEngineName(), locale);
+        if (getEngineName().equals(mTts.getCurrentEngine())) {
+            String[] localeArray = TtsEngines.parseLocalePref(locale);
+            if (localeArray != null) {
+                mTts.setLanguage(new Locale(localeArray[0], localeArray[1], localeArray[2]));
+            }
+        }
+    }
+
     private String getEngineName() {
         return getArguments().getString(TtsEnginePreference.FRAGMENT_ARGS_NAME);
     }
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
new file mode 100644
index 0000000..84cabe9
--- /dev/null
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -0,0 +1,285 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.users;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+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.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.settings.DialogCreatable;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.util.HashMap;
+import java.util.List;
+
+public class UserDetailsSettings extends SettingsPreferenceFragment
+        implements Preference.OnPreferenceChangeListener, DialogCreatable {
+
+    private static final String TAG = "UserDetailsSettings";
+
+    private static final int MENU_REMOVE_USER = Menu.FIRST;
+    private static final int DIALOG_CONFIRM_REMOVE = 1;
+
+    private static final String KEY_USER_NAME = "user_name";
+    private static final String KEY_INSTALLED_APPS = "market_apps_category";
+    private static final String KEY_SYSTEM_APPS = "system_apps_category";
+    public static final String EXTRA_USER_ID = "user_id";
+
+    private static final String[] SYSTEM_APPS = {
+            "com.google.android.browser",
+            "com.google.android.gm",
+            "com.google.android.youtube"
+    };
+
+    static class AppState {
+        boolean dirty;
+        boolean enabled;
+
+        AppState(boolean enabled) {
+            this.enabled = enabled;
+        }
+    }
+
+    private HashMap<String, AppState> mAppStates = new HashMap<String, AppState>();
+    private PreferenceGroup mSystemAppGroup;
+    private PreferenceGroup mInstalledAppGroup;
+    private EditTextPreference mNamePref;
+
+    private IPackageManager mIPm;
+    private PackageManager mPm;
+    private int mUserId;
+    private boolean mNewUser;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.user_details);
+        Bundle args = getArguments();
+        mNewUser = args == null || args.getInt(EXTRA_USER_ID, -1) == -1;
+        mUserId = mNewUser ? -1 : args.getInt(EXTRA_USER_ID, -1);
+        mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
+
+        if (mUserId == -1) {
+            try {
+                mUserId = mIPm.createUser(getString(R.string.user_new_user_name), 0).id;
+            } catch (RemoteException re) {
+            }
+        }
+        mSystemAppGroup = (PreferenceGroup) findPreference(KEY_SYSTEM_APPS);
+        mInstalledAppGroup = (PreferenceGroup) findPreference(KEY_INSTALLED_APPS);
+        mNamePref = (EditTextPreference) findPreference(KEY_USER_NAME);
+        mNamePref.setOnPreferenceChangeListener(this);
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mPm = getActivity().getPackageManager();
+        if (mUserId > 0) {
+            initExistingUser();
+        } else {
+            initNewUser();
+        }
+        refreshApps();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem addAccountItem = menu.add(0, MENU_REMOVE_USER, 0,
+                mNewUser ? R.string.user_discard_user_menu : R.string.user_remove_user_menu);
+        addAccountItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
+                | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final int itemId = item.getItemId();
+        if (itemId == MENU_REMOVE_USER) {
+            onRemoveUserClicked();
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void initExistingUser() {
+        List<UserInfo> users = mPm.getUsers();
+        UserInfo foundUser = null;
+        for (UserInfo user : users) {
+            if (user.id == mUserId) {
+                foundUser = user;
+                break;
+            }
+        }
+        if (foundUser != null) {
+            mNamePref.setSummary(foundUser.name);
+            mNamePref.setText(foundUser.name);
+        }
+    }
+
+    private void initNewUser() {
+        // TODO: Check if there's already a "New user" and localize
+        mNamePref.setText(getString(R.string.user_new_user_name));
+        mNamePref.setSummary(getString(R.string.user_new_user_name));
+    }
+
+    private void onRemoveUserClicked() {
+        if (mNewUser) {
+            removeUserNow();
+        } else {
+            showDialog(DIALOG_CONFIRM_REMOVE);
+        }
+    }
+
+    private void removeUserNow() {
+        try {
+            mIPm.removeUser(mUserId);
+        } catch (RemoteException re) {
+            // Couldn't remove user. Shouldn't happen
+            Log.e(TAG, "Couldn't remove user " + mUserId + "\n" + re);
+        }
+        finish();
+    }
+
+    private void insertAppInfo(PreferenceGroup group, HashMap<String, AppState> appStateMap,
+            PackageInfo info, boolean defaultState) {
+        if (info != null) {
+            String pkgName = info.packageName;
+            String name = info.applicationInfo.loadLabel(mPm).toString();
+            Drawable icon = info.applicationInfo.loadIcon(mPm);
+            AppState appState = appStateMap.get(info.packageName);
+            boolean enabled = appState == null ? defaultState : appState.enabled;
+            CheckBoxPreference appPref = new CheckBoxPreference(getActivity());
+            appPref.setTitle(name != null ? name : pkgName);
+            appPref.setIcon(icon);
+            appPref.setChecked(enabled);
+            appPref.setKey(pkgName);
+            appPref.setPersistent(false);
+            appPref.setOnPreferenceChangeListener(this);
+            group.addPreference(appPref);
+        }
+    }
+
+    private void refreshApps() {
+        mSystemAppGroup.removeAll();
+        mInstalledAppGroup.removeAll();
+
+        boolean firstTime = mAppStates.isEmpty();
+
+        final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
+        mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+        List<ResolveInfo> apps = mPm.queryIntentActivities(mainIntent, 0);
+
+        for (ResolveInfo resolveInfo : apps) {
+            PackageInfo info;
+            try {
+                info = mIPm.getPackageInfo(resolveInfo.activityInfo.packageName,
+                        0 /* flags */,
+                    mUserId < 0 ? 0 : mUserId);
+            } catch (RemoteException re) {
+                continue;
+            }
+            if (firstTime) {
+                mAppStates.put(resolveInfo.activityInfo.packageName,
+                        new AppState(info.applicationInfo.enabled));
+            }
+            if ((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                if (mSystemAppGroup.findPreference(info.packageName) != null) {
+                    continue;
+                }
+                insertAppInfo(mSystemAppGroup, mAppStates, info, false);
+            } else {
+                if (mInstalledAppGroup.findPreference(info.packageName) != null) {
+                    continue;
+                }
+                insertAppInfo(mInstalledAppGroup, mAppStates, info, false);
+            }
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference instanceof CheckBoxPreference) {
+            String packageName = preference.getKey();
+            int newState = ((Boolean) newValue) ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                    : PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
+            try {
+                mIPm.setApplicationEnabledSetting(packageName, newState, 0, mUserId);
+            } catch (RemoteException re) {
+                Log.e(TAG, "Unable to change enabled state of package " + packageName
+                        + " for user " + mUserId);
+            }
+        } else if (preference == mNamePref) {
+            String name = (String) newValue;
+            if (TextUtils.isEmpty(name)) {
+                return false;
+            }
+            try {
+                mIPm.updateUserName(mUserId, (String) newValue);
+                mNamePref.setSummary((String) newValue);
+            } catch (RemoteException re) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_CONFIRM_REMOVE:
+                return new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.user_confirm_remove_title)
+                    .setMessage(R.string.user_confirm_remove_message)
+                    .setPositiveButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                removeUserNow();
+                            }
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create();
+            default:
+                return null;
+        }
+    }
+}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
new file mode 100644
index 0000000..9380586
--- /dev/null
+++ b/src/com/android/settings/users/UserSettings.java
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.users;
+
+import android.content.pm.UserInfo;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceGroup;
+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.List;
+
+public class UserSettings extends SettingsPreferenceFragment
+        implements OnPreferenceClickListener {
+
+    private static final String KEY_USER_LIST = "user_list";
+    private static final int MENU_ADD_USER = Menu.FIRST;
+
+    private PreferenceGroup mUserListCategory;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.user_settings);
+        mUserListCategory = (PreferenceGroup) findPreference(KEY_USER_LIST);
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateUserList();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem addAccountItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
+        addAccountItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
+                | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final int itemId = item.getItemId();
+        if (itemId == MENU_ADD_USER) {
+            onAddUserClicked();
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void onAddUserClicked() {
+        ((PreferenceActivity) getActivity()).startPreferencePanel(
+                UserDetailsSettings.class.getName(), null, R.string.user_details_title,
+                null, this, 0);
+    }
+
+    private void updateUserList() {
+        List<UserInfo> users = getActivity().getPackageManager().getUsers();
+
+        mUserListCategory.removeAll();
+        for (UserInfo user : users) {
+            if (user.id == 0) continue;
+            Preference pref = new Preference(getActivity());
+            pref.setTitle(user.name);
+            pref.setOnPreferenceClickListener(this);
+            pref.setKey("id=" + user.id);
+            mUserListCategory.addPreference(pref);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference pref) {
+        String sid = pref.getKey();
+        if (sid != null && sid.startsWith("id=")) {
+            int id = Integer.parseInt(sid.substring(3));
+            Bundle args = new Bundle();
+            args.putInt(UserDetailsSettings.EXTRA_USER_ID, id);
+            ((PreferenceActivity) getActivity()).startPreferencePanel(
+                    UserDetailsSettings.class.getName(),
+                    args, 0, pref.getTitle(), this, 0);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index aaae887..ca85d99 100644
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -102,8 +102,10 @@
         mName.setText(mProfile.name);
         mType.setSelection(mProfile.type);
         mServer.setText(mProfile.server);
-        mUsername.setText(mProfile.username);
-        mPassword.setText(mProfile.password);
+        if (mProfile.saveLogin) {
+            mUsername.setText(mProfile.username);
+            mPassword.setText(mProfile.password);
+        }
         mSearchDomains.setText(mProfile.searchDomains);
         mDnsServers.setText(mProfile.dnsServers);
         mRoutes.setText(mProfile.routes);
@@ -111,7 +113,7 @@
         mL2tpSecret.setText(mProfile.l2tpSecret);
         mIpsecIdentifier.setText(mProfile.ipsecIdentifier);
         mIpsecSecret.setText(mProfile.ipsecSecret);
-        loadCertificates(mIpsecUserCert, Credentials.USER_CERTIFICATE,
+        loadCertificates(mIpsecUserCert, Credentials.USER_PRIVATE_KEY,
                 0, mProfile.ipsecUserCert);
         loadCertificates(mIpsecCaCert, Credentials.CA_CERTIFICATE,
                 R.string.vpn_no_ca_cert, mProfile.ipsecCaCert);
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 655306a..a26623b 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -38,6 +38,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.Toast;
 
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
@@ -324,10 +325,12 @@
     private String[] getDefaultNetwork() throws Exception {
         LinkProperties network = mService.getActiveLinkProperties();
         if (network == null) {
+            Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show();
             throw new IllegalStateException("Network is not available");
         }
         String interfaze = network.getInterfaceName();
         if (interfaze == null) {
+            Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show();
             throw new IllegalStateException("Cannot get the default interface");
         }
         String gateway = null;
@@ -339,6 +342,7 @@
             }
         }
         if (gateway == null) {
+            Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show();
             throw new IllegalStateException("Cannot get the default gateway");
         }
         return new String[] {interfaze, gateway};
@@ -356,9 +360,12 @@
         String caCert = "";
         String serverCert = "";
         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);
+            /*
+             * VPN has a special exception in keystore to allow it to use system
+             * UID certs.
+             */
+            privateKey = Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert;
+            byte[] value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecUserCert);
             userCert = (value == null) ? null : new String(value, Charsets.UTF_8);
         }
         if (!profile.ipsecCaCert.isEmpty()) {
@@ -370,7 +377,7 @@
             serverCert = (value == null) ? null : new String(value, Charsets.UTF_8);
         }
         if (privateKey == null || userCert == null || caCert == null || serverCert == null) {
-            // TODO: find out a proper way to handle this. Delete these keys?
+            Toast.makeText(getActivity(), R.string.vpn_missing_cert, Toast.LENGTH_LONG).show();
             throw new IllegalStateException("Cannot load credentials");
         }
 
@@ -457,6 +464,11 @@
         }
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_vpn;
+    }
+
     private class VpnPreference extends Preference {
         private VpnProfile mProfile;
         private int mState = -1;
diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
index f10ea5e..19de100 100644
--- a/src/com/android/settings/widget/ChartDataUsageView.java
+++ b/src/com/android/settings/widget/ChartDataUsageView.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.widget;
 
+import static android.net.TrafficStats.GB_IN_BYTES;
+import static android.net.TrafficStats.MB_IN_BYTES;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.NetworkPolicy;
@@ -26,6 +29,7 @@
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
+import android.text.format.Time;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -34,16 +38,15 @@
 import com.android.settings.R;
 import com.android.settings.widget.ChartSweepView.OnSweepListener;
 
+import java.util.Arrays;
+import java.util.Calendar;
+
 /**
  * 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;
 
@@ -234,7 +237,7 @@
         final long maxSweep = Math.max(mSweepWarning.getValue(), mSweepLimit.getValue());
         final long maxSeries = Math.max(mSeries.getMaxVisible(), mDetailSeries.getMaxVisible());
         final long maxVisible = Math.max(maxSeries, maxSweep) * 12 / 10;
-        final long maxDefault = Math.max(maxVisible, 2 * GB_IN_BYTES);
+        final long maxDefault = Math.max(maxVisible, 50 * MB_IN_BYTES);
         newMax = Math.max(maxDefault, newMax);
 
         // only invalidate when vertMax actually changed
@@ -293,7 +296,7 @@
     }
 
     private OnSweepListener mHorizListener = new OnSweepListener() {
-        /** {@inheritDoc} */
+        @Override
         public void onSweep(ChartSweepView sweep, boolean sweepDone) {
             updatePrimaryRange();
 
@@ -303,7 +306,7 @@
             }
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void requestEdit(ChartSweepView sweep) {
             // ignored
         }
@@ -321,7 +324,7 @@
     }
 
     private OnSweepListener mVertListener = new OnSweepListener() {
-        /** {@inheritDoc} */
+        @Override
         public void onSweep(ChartSweepView sweep, boolean sweepDone) {
             if (sweepDone) {
                 clearUpdateAxisDelayed(sweep);
@@ -338,7 +341,7 @@
             }
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void requestEdit(ChartSweepView sweep) {
             if (sweep == mSweepWarning && mListener != null) {
                 mListener.requestWarningEdit();
@@ -450,7 +453,7 @@
     }
 
     public static class TimeAxis implements ChartAxis {
-        private static final long TICK_INTERVAL = DateUtils.DAY_IN_MILLIS * 7;
+        private static final int FIRST_DAY_OF_WEEK = Calendar.getInstance().getFirstDayOfWeek() - 1;
 
         private long mMin;
         private long mMax;
@@ -466,7 +469,7 @@
             return Objects.hashCode(mMin, mMax, mSize);
         }
 
-        /** {@inheritDoc} */
+        @Override
         public boolean setBounds(long min, long max) {
             if (mMin != min || mMax != max) {
                 mMin = min;
@@ -477,7 +480,7 @@
             }
         }
 
-        /** {@inheritDoc} */
+        @Override
         public boolean setSize(float size) {
             if (mSize != size) {
                 mSize = size;
@@ -487,35 +490,49 @@
             }
         }
 
-        /** {@inheritDoc} */
+        @Override
         public float convertToPoint(long value) {
             return (mSize * (value - mMin)) / (mMax - mMin);
         }
 
-        /** {@inheritDoc} */
+        @Override
         public long convertToValue(float point) {
             return (long) (mMin + ((point * (mMax - mMin)) / mSize));
         }
 
-        /** {@inheritDoc} */
+        @Override
         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} */
+        @Override
         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)));
+            final float[] ticks = new float[32];
+            int i = 0;
+
+            // tick mark for first day of each week
+            final Time time = new Time();
+            time.set(mMax);
+            time.monthDay -= time.weekDay - FIRST_DAY_OF_WEEK;
+            time.hour = time.minute = time.second = 0;
+
+            time.normalize(true);
+            long timeMillis = time.toMillis(true);
+            while (timeMillis > mMin) {
+                if (timeMillis <= mMax) {
+                    ticks[i++] = convertToPoint(timeMillis);
+                }
+                time.monthDay -= 7;
+                time.normalize(true);
+                timeMillis = time.toMillis(true);
             }
-            return tickPoints;
+
+            return Arrays.copyOf(ticks, i);
         }
 
-        /** {@inheritDoc} */
+        @Override
         public int shouldAdjustAxis(long value) {
             // time axis never adjusts
             return 0;
@@ -527,12 +544,14 @@
         private long mMax;
         private float mSize;
 
+        private static final boolean LOG_SCALE = false;
+
         @Override
         public int hashCode() {
             return Objects.hashCode(mMin, mMax, mSize);
         }
 
-        /** {@inheritDoc} */
+        @Override
         public boolean setBounds(long min, long max) {
             if (mMin != min || mMax != max) {
                 mMin = min;
@@ -543,7 +562,7 @@
             }
         }
 
-        /** {@inheritDoc} */
+        @Override
         public boolean setSize(float size) {
             if (mSize != size) {
                 mSize = size;
@@ -553,27 +572,35 @@
             }
         }
 
-        /** {@inheritDoc} */
+        @Override
         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);
+            if (LOG_SCALE) {
+                // 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);
+            } else {
+                return (mSize * (value - mMin)) / (mMax - mMin);
+            }
         }
 
-        /** {@inheritDoc} */
+        @Override
         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)));
+            if (LOG_SCALE) {
+                final double normalized = point / mSize;
+                final double fraction = 1.3102228476089056629
+                        * Math.pow(normalized, 2.7111774693164631640);
+                return (long) (mMin + (fraction * (mMax - mMin)));
+            } else {
+                return (long) (mMin + ((point * (mMax - mMin)) / mSize));
+            }
         }
 
         private static final Object sSpanSize = new Object();
         private static final Object sSpanUnit = new Object();
 
-        /** {@inheritDoc} */
+        @Override
         public long buildLabel(Resources res, SpannableStringBuilder builder, long value) {
 
             final CharSequence unit;
@@ -598,26 +625,18 @@
                 resultRounded = unitFactor * Math.round(result);
             }
 
-            final int[] sizeBounds = findOrCreateSpan(builder, sSpanSize, "^1");
-            builder.replace(sizeBounds[0], sizeBounds[1], size);
-            final int[] unitBounds = findOrCreateSpan(builder, sSpanUnit, "^2");
-            builder.replace(unitBounds[0], unitBounds[1], unit);
+            setText(builder, sSpanSize, size, "^1");
+            setText(builder, sSpanUnit, unit, "^2");
 
             return (long) resultRounded;
         }
 
-        /** {@inheritDoc} */
+        @Override
         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;
-            }
 
+            // target about 16 ticks on screen, rounded to nearest power of 2
+            final long tickJump = roundUpToPowerOfTwo(range / 16);
             final int tickCount = (int) (range / tickJump);
             final float[] tickPoints = new float[tickCount];
             long value = mMin;
@@ -629,7 +648,7 @@
             return tickPoints;
         }
 
-        /** {@inheritDoc} */
+        @Override
         public int shouldAdjustAxis(long value) {
             final float point = convertToPoint(value);
             if (point < mSize * 0.1) {
@@ -642,8 +661,8 @@
         }
     }
 
-    private static int[] findOrCreateSpan(
-            SpannableStringBuilder builder, Object key, CharSequence bootstrap) {
+    private static void setText(
+            SpannableStringBuilder builder, Object key, CharSequence text, String bootstrap) {
         int start = builder.getSpanStart(key);
         int end = builder.getSpanEnd(key);
         if (start == -1) {
@@ -651,7 +670,24 @@
             end = start + bootstrap.length();
             builder.setSpan(key, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
         }
-        return new int[] { start, end };
+        builder.replace(start, end, text);
     }
 
+    private static long roundUpToPowerOfTwo(long i) {
+        // NOTE: borrowed from Hashtable.roundUpToPowerOfTwo()
+
+        i--; // If input is a power of two, shift its high-order bit right
+
+        // "Smear" the high-order bit all the way to the right
+        i |= i >>>  1;
+        i |= i >>>  2;
+        i |= i >>>  4;
+        i |= i >>>  8;
+        i |= i >>> 16;
+        i |= i >>> 32;
+
+        i++;
+
+        return i > 0 ? i : Long.MAX_VALUE;
+    }
 }
diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java
index b930c62..f358ada 100644
--- a/src/com/android/settings/widget/ChartGridView.java
+++ b/src/com/android/settings/widget/ChartGridView.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.widget;
 
+import static com.android.settings.DataUsageSummary.formatDateRange;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -30,7 +32,6 @@
 import android.util.TypedValue;
 import android.view.View;
 
-import com.android.settings.DataUsageSummary;
 import com.android.settings.R;
 import com.google.common.base.Preconditions;
 
@@ -82,8 +83,8 @@
 
     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));
+        mLayoutStart = makeLayout(formatDateRange(context, start, start));
+        mLayoutEnd = makeLayout(formatDateRange(context, end, end));
         invalidate();
     }
 
diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java
index 7a4617b..5a37bfc 100644
--- a/src/com/android/settings/widget/ChartNetworkSeriesView.java
+++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java
@@ -44,6 +44,8 @@
     private static final String TAG = "ChartNetworkSeriesView";
     private static final boolean LOGD = false;
 
+    private static final boolean ESTIMATE_ENABLED = false;
+
     private ChartAxis mHoriz;
     private ChartAxis mVert;
 
@@ -252,37 +254,39 @@
 
         mMax = totalData;
 
-        // build estimated data
-        mPathEstimate.moveTo(lastX, lastY);
+        if (ESTIMATE_ENABLED) {
+            // build estimated data
+            mPathEstimate.moveTo(lastX, lastY);
 
-        final long now = System.currentTimeMillis();
-        final long bucketDuration = mStats.getBucketDuration();
+            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
+            // 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;
 
-            totalData += (longWindow * 7 + shortWindow * 3) / 10;
+            long futureTime = 0;
+            while (lastX < width) {
+                futureTime += bucketDuration;
 
-            lastX = mHoriz.convertToPoint(lastTime + futureTime);
-            lastY = mVert.convertToPoint(totalData);
+                // 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;
 
-            mPathEstimate.lineTo(lastX, lastY);
+                totalData += (longWindow * 7 + shortWindow * 3) / 10;
+
+                lastX = mHoriz.convertToPoint(lastTime + futureTime);
+                lastY = mVert.convertToPoint(totalData);
+
+                mPathEstimate.lineTo(lastX, lastY);
+            }
+
+            mMaxEstimate = totalData;
         }
 
-        mMaxEstimate = totalData;
-
         invalidate();
     }
 
@@ -291,7 +295,7 @@
     }
 
     public void setEstimateVisible(boolean estimateVisible) {
-        mEstimateVisible = estimateVisible;
+        mEstimateVisible = ESTIMATE_ENABLED ? estimateVisible : false;
         invalidate();
     }
 
diff --git a/src/com/android/settings/widget/InvertedChartAxis.java b/src/com/android/settings/widget/InvertedChartAxis.java
index 2d820d9..6875749 100644
--- a/src/com/android/settings/widget/InvertedChartAxis.java
+++ b/src/com/android/settings/widget/InvertedChartAxis.java
@@ -30,33 +30,33 @@
         mWrapped = wrapped;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean setBounds(long min, long max) {
         return mWrapped.setBounds(min, max);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean setSize(float size) {
         mSize = size;
         return mWrapped.setSize(size);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public float convertToPoint(long value) {
         return mSize - mWrapped.convertToPoint(value);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public long convertToValue(float point) {
         return mWrapped.convertToValue(mSize - point);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public long buildLabel(Resources res, SpannableStringBuilder builder, long value) {
         return mWrapped.buildLabel(res, builder, value);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public float[] getTickPoints() {
         final float[] points = mWrapped.getTickPoints();
         for (int i = 0; i < points.length; i++) {
@@ -65,7 +65,7 @@
         return points;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public int shouldAdjustAxis(long value) {
         return mWrapped.shouldAdjustAxis(value);
     }
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 656d072..1d411f7 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -97,9 +97,9 @@
     /**
      * Minimum and maximum brightnesses.  Don't go to 0 since that makes the display unusable
      */
-    private static final int MINIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_DIM + 10;
-    private static final int MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON;
-    private static final int DEFAULT_BACKLIGHT = (int) (android.os.Power.BRIGHTNESS_ON * 0.4f);
+    private static final int MINIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_DIM + 10;
+    private static final int MAXIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_ON;
+    private static final int DEFAULT_BACKLIGHT = (int) (android.os.PowerManager.BRIGHTNESS_ON * 0.4f);
     /** Minimum brightness at which the indicator is shown at half-full and ON */
     private static final int HALF_BRIGHTNESS_THRESHOLD = (int) (0.3 * MAXIMUM_BACKLIGHT);
     /** Minimum brightness at which the indicator is shown at full */
@@ -605,9 +605,10 @@
 
     @Override
     public void onEnabled(Context context) {
+        Class clazz = com.android.settings.widget.SettingsAppWidgetProvider.class;
         PackageManager pm = context.getPackageManager();
         pm.setComponentEnabledSetting(
-                new ComponentName("com.android.settings", ".widget.SettingsAppWidgetProvider"),
+                new ComponentName(context.getPackageName(), clazz.getName()),
                 PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
                 PackageManager.DONT_KILL_APP);
         checkObserver(context);
@@ -618,7 +619,7 @@
         Class clazz = com.android.settings.widget.SettingsAppWidgetProvider.class;
         PackageManager pm = context.getPackageManager();
         pm.setComponentEnabledSetting(
-                new ComponentName("com.android.settings", ".widget.SettingsAppWidgetProvider"),
+                new ComponentName(context.getPackageName(), clazz.getName()),
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                 PackageManager.DONT_KILL_APP);
         if (sSettingsObserver != null) {
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index c213512..bb50d2a 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -43,7 +43,7 @@
     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 static final String KEY_POOR_NETWORK_DETECTION = "wifi_poor_network_detection";
 
     private WifiManager mWifiManager;
 
@@ -73,14 +73,15 @@
                 Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
         notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
 
-        CheckBoxPreference watchdogEnabled =
-            (CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG);
-        if (watchdogEnabled != null) {
-            watchdogEnabled.setChecked(Secure.getInt(getContentResolver(),
-                        Secure.WIFI_WATCHDOG_ON, 1) == 1);
-
-            //TODO: Bring this back after changing watchdog behavior
-            getPreferenceScreen().removePreference(watchdogEnabled);
+        CheckBoxPreference poorNetworkDetection =
+            (CheckBoxPreference) findPreference(KEY_POOR_NETWORK_DETECTION);
+        if (poorNetworkDetection != null) {
+            if (Utils.isWifiOnly(getActivity())) {
+                getPreferenceScreen().removePreference(poorNetworkDetection);
+            } else {
+                poorNetworkDetection.setChecked(Secure.getInt(getContentResolver(),
+                        Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1);
+            }
         }
 
         ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
@@ -143,9 +144,9 @@
             Secure.putInt(getContentResolver(),
                     Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
                     ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
-        } else if (KEY_ENABLE_WIFI_WATCHDOG.equals(key)) {
+        } else if (KEY_POOR_NETWORK_DETECTION.equals(key)) {
             Secure.putInt(getContentResolver(),
-                    Secure.WIFI_WATCHDOG_ON,
+                    Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
                     ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
         } else {
             return super.onPreferenceTreeClick(screen, preference);
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index c64a225..2598a0e 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -33,12 +33,13 @@
 import android.net.wifi.WifiConfiguration.ProxySettings;
 import android.net.wifi.WifiConfiguration.Status;
 import android.net.wifi.WifiInfo;
-import android.net.wifi.WpsInfo;
+import android.os.Handler;
 import android.security.Credentials;
 import android.security.KeyStore;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,6 +47,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -61,7 +63,9 @@
  */
 public class WifiConfigController implements TextWatcher,
         View.OnClickListener, AdapterView.OnItemSelectedListener {
-    private static final String KEYSTORE_SPACE = "keystore://";
+    private static final String KEYSTORE_SPACE = WifiConfiguration.KEYSTORE_URI;
+
+    private static final String PHASE2_PREFIX = "auth=";
 
     private final WifiConfigUiBase mConfigUi;
     private final View mView;
@@ -87,12 +91,6 @@
     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;
@@ -105,7 +103,6 @@
 
     private static final String TAG = "WifiConfigController";
 
-    private Spinner mNetworkSetupSpinner;
     private Spinner mIpSettingsSpinner;
     private TextView mIpAddressView;
     private TextView mGatewayView;
@@ -125,12 +122,16 @@
     // True when this instance is used in SetupWizard XL context.
     private final boolean mInXlSetupWizard;
 
+    private final Handler mTextViewChangedHandler;
+
     static boolean requireKeyStore(WifiConfiguration config) {
         if (config == null) {
             return false;
         }
-        String values[] = {config.ca_cert.value(), config.client_cert.value(),
-                config.private_key.value()};
+        if (!TextUtils.isEmpty(config.key_id.value())) {
+            return true;
+        }
+        String values[] = { config.ca_cert.value(), config.client_cert.value() };
         for (String value : values) {
             if (value != null && value.startsWith(KEYSTORE_SPACE)) {
                 return true;
@@ -150,9 +151,15 @@
                 accessPoint.security;
         mEdit = edit;
 
+        mTextViewChangedHandler = new Handler();
         final Context context = mConfigUi.getContext();
         final Resources resources = context.getResources();
 
+        mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
+        mIpSettingsSpinner.setOnItemSelectedListener(this);
+        mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
+        mProxySettingsSpinner.setOnItemSelectedListener(this);
+
         if (mAccessPoint == null) { // new network
             mConfigUi.setTitle(R.string.wifi_add_network);
 
@@ -172,15 +179,16 @@
             } else {
                 mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
             }
+
+            showIpConfigFields();
+            showProxyFields();
+            mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
+            mView.findViewById(R.id.wifi_advanced_togglebox).setOnClickListener(this);
+
             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();
@@ -222,18 +230,6 @@
                 } 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) {
@@ -277,15 +273,14 @@
     }
 
     /* show submit button if password, ip and proxy settings are valid */
-    private void enableSubmitIfAppropriate() {
+    void enableSubmitIfAppropriate() {
         Button submit = mConfigUi.getSubmitButton();
         if (submit == null) return;
-        boolean enabled = false;
 
+        boolean enabled = false;
         boolean passwordInvalid = false;
 
-        /* Check password invalidity for manual network set up alone */
-        if (chosenNetworkSetupMethod() == MANUAL &&
+        if (mPasswordView != null &&
             ((mAccessPointSecurity == AccessPoint.SECURITY_WEP && mPasswordView.length() == 0) ||
             (mAccessPointSecurity == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8))) {
             passwordInvalid = true;
@@ -364,16 +359,19 @@
                 config.eap.setValue((String) mEapMethodSpinner.getSelectedItem());
 
                 config.phase2.setValue((mPhase2Spinner.getSelectedItemPosition() == 0) ? "" :
-                        "auth=" + mPhase2Spinner.getSelectedItem());
+                        PHASE2_PREFIX + 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 +
+                final boolean isEmptyKeyId = (mEapUserCertSpinner.getSelectedItemPosition() == 0);
+                config.key_id.setValue(isEmptyKeyId ? "" : Credentials.USER_PRIVATE_KEY +
                         (String) mEapUserCertSpinner.getSelectedItem());
+                config.engine.setValue(isEmptyKeyId ? WifiConfiguration.ENGINE_DISABLE :
+                        WifiConfiguration.ENGINE_ENABLE);
+                config.engine_id.setValue(isEmptyKeyId ? "" : WifiConfiguration.KEYSTORE_ENGINE_ID);
                 config.identity.setValue((mEapIdentityView.length() == 0) ? "" :
                         mEapIdentityView.getText().toString());
                 config.anonymous_identity.setValue((mEapAnonymousView.length() == 0) ? "" :
@@ -411,7 +409,7 @@
                 mProxySettingsSpinner.getSelectedItemPosition() == PROXY_STATIC) ?
                 ProxySettings.STATIC : ProxySettings.NONE;
 
-        if (mProxySettings == ProxySettings.STATIC) {
+        if (mProxySettings == ProxySettings.STATIC && mProxyHostView != null) {
             String host = mProxyHostView.getText().toString();
             String portStr = mProxyPortView.getText().toString();
             String exclusionList = mProxyExclusionListView.getText().toString();
@@ -434,7 +432,11 @@
     }
 
     private int validateIpConfigFields(LinkProperties linkProperties) {
+        if (mIpAddressView == null) return 0;
+
         String ipAddr = mIpAddressView.getText().toString();
+        if (TextUtils.isEmpty(ipAddr)) return R.string.wifi_ip_settings_invalid_ip_address;
+
         InetAddress inetAddr = null;
         try {
             inetAddr = NetworkUtils.numericToInetAddress(ipAddr);
@@ -445,31 +447,52 @@
         int networkPrefixLength = -1;
         try {
             networkPrefixLength = Integer.parseInt(mNetworkPrefixLengthView.getText().toString());
+            if (networkPrefixLength < 0 || networkPrefixLength > 32) {
+                return R.string.wifi_ip_settings_invalid_network_prefix_length;
+            }
+            linkProperties.addLinkAddress(new LinkAddress(inetAddr, networkPrefixLength));
         } catch (NumberFormatException e) {
-            // Use -1
+            // Set the hint as default after user types in ip address
+            mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString(
+                    R.string.wifi_network_prefix_length_hint));
         }
-        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;
+        if (TextUtils.isEmpty(gateway)) {
+            try {
+                //Extract a default gateway from IP address
+                InetAddress netPart = NetworkUtils.getNetworkPart(inetAddr, networkPrefixLength);
+                byte[] addr = netPart.getAddress();
+                addr[addr.length-1] = 1;
+                mGatewayView.setText(InetAddress.getByAddress(addr).getHostAddress());
+            } catch (RuntimeException ee) {
+            } catch (java.net.UnknownHostException u) {
+            }
+        } else {
+            InetAddress gatewayAddr = null;
+            try {
+                gatewayAddr = NetworkUtils.numericToInetAddress(gateway);
+            } catch (IllegalArgumentException e) {
+                return R.string.wifi_ip_settings_invalid_gateway;
+            }
+            linkProperties.addRoute(new RouteInfo(gatewayAddr));
         }
-        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;
+
+        if (TextUtils.isEmpty(dns)) {
+            //If everything else is valid, provide hint as a default option
+            mDns1View.setText(mConfigUi.getContext().getString(R.string.wifi_dns1_hint));
+        } else {
+            try {
+                dnsAddr = NetworkUtils.numericToInetAddress(dns);
+            } catch (IllegalArgumentException e) {
+                return R.string.wifi_ip_settings_invalid_dns;
+            }
+            linkProperties.addDns(dnsAddr);
         }
-        linkProperties.addDns(dnsAddr);
+
         if (mDns2View.length() > 0) {
             dns = mDns2View.getText().toString();
             try {
@@ -482,39 +505,6 @@
         return 0;
     }
 
-    int chosenNetworkSetupMethod() {
-        if (mNetworkSetupSpinner != null) {
-            return mNetworkSetupSpinner.getSelectedItemPosition();
-        }
-        return MANUAL;
-    }
-
-    WpsInfo getWpsConfig() {
-        WpsInfo config = new WpsInfo();
-        switch (mNetworkSetupSpinner.getSelectedItemPosition()) {
-            case WPS_PBC:
-                config.setup = WpsInfo.PBC;
-                break;
-            case WPS_KEYPAD:
-                config.setup = WpsInfo.KEYPAD;
-                break;
-            case WPS_DISPLAY:
-                config.setup = WpsInfo.DISPLAY;
-                break;
-            default:
-                config.setup = WpsInfo.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.
@@ -560,11 +550,18 @@
             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,
+
+                final String phase2Method = config.phase2.value();
+                if (phase2Method != null && phase2Method.startsWith(PHASE2_PREFIX)) {
+                    setSelection(mPhase2Spinner, phase2Method.substring(PHASE2_PREFIX.length()));
+                } else {
+                    setSelection(mPhase2Spinner, phase2Method);
+                }
+
+                setCertificate(mEapCaCertSpinner, KEYSTORE_SPACE + Credentials.CA_CERTIFICATE,
                         config.ca_cert.value());
                 setCertificate(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY,
-                        config.private_key.value());
+                        config.key_id.value());
                 mEapIdentityView.setText(config.identity.value());
                 mEapAnonymousView.setText(config.anonymous_identity.value());
             }
@@ -585,33 +582,6 @@
             mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
         }
     }
-    
-    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_KEYPAD) {
-            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;
@@ -724,7 +694,6 @@
     }
 
     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()));
         }
@@ -749,7 +718,11 @@
 
     @Override
     public void afterTextChanged(Editable s) {
-        enableSubmitIfAppropriate();
+        mTextViewChangedHandler.post(new Runnable() {
+                public void run() {
+                    enableSubmitIfAppropriate();
+                }
+            });
     }
 
     @Override
@@ -765,10 +738,14 @@
     @Override
     public void onClick(View view) {
         if (view.getId() == R.id.show_password) {
+            int pos = mPasswordView.getSelectionEnd();
             mPasswordView.setInputType(
                     InputType.TYPE_CLASS_TEXT | (((CheckBox) view).isChecked() ?
                             InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
                                 InputType.TYPE_TEXT_VARIATION_PASSWORD));
+            if (pos >= 0) {
+                ((EditText)mPasswordView).setSelection(pos);
+            }
         } else if (view.getId() == R.id.wifi_advanced_togglebox) {
             if (((CheckBox) view).isChecked()) {
                 mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.VISIBLE);
@@ -785,8 +762,6 @@
             showSecurityFields();
         } else if (parent == mEapMethodSpinner) {
             showSecurityFields();
-        } else if (parent == mNetworkSetupSpinner) {
-            showNetworkSetupFields();
         } else if (parent == mProxySettingsSpinner) {
             showProxyFields();
         } else {
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index f980d0c..82b0cc6 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -56,6 +56,9 @@
         setInverseBackgroundForced(true);
         mController = new WifiConfigController(this, mView, mAccessPoint, mEdit);
         super.onCreate(savedInstanceState);
+        /* During creation, the submit button can be unavailable to determine
+         * visibility. Right after creation, update button visibility */
+        mController.enableSubmitIfAppropriate();
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java
index 6a2f865..12612b5 100644
--- a/src/com/android/settings/wifi/WifiPickerActivity.java
+++ b/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -29,6 +29,8 @@
     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";
+    private static final String EXTRA_WIFI_SHOW_ACTION_BAR = "wifi_show_action_bar";
+    private static final String EXTRA_WIFI_SHOW_MENUS = "wifi_show_menus";
 
     @Override
     public Intent getIntent() {
@@ -67,6 +69,14 @@
             intent.putExtra(EXTRA_PREFS_SET_BACK_TEXT,
                     orgIntent.getStringExtra(EXTRA_PREFS_SET_BACK_TEXT));
         }
+        if (orgIntent.hasExtra(EXTRA_WIFI_SHOW_ACTION_BAR)) {
+            intent.putExtra(EXTRA_WIFI_SHOW_ACTION_BAR,
+                    orgIntent.getBooleanExtra(EXTRA_WIFI_SHOW_ACTION_BAR, true));
+        }
+        if (orgIntent.hasExtra(EXTRA_WIFI_SHOW_MENUS)) {
+            intent.putExtra(EXTRA_WIFI_SHOW_MENUS,
+                    orgIntent.getBooleanExtra(EXTRA_WIFI_SHOW_MENUS, true));
+        }
 
         if (resultTo == null) {
             startActivity(intent);
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 29c1229..de42f2a 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -20,23 +20,23 @@
 
 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.content.pm.PackageManager;
+import android.content.res.Resources;
 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.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.net.wifi.WpsResult;
+import android.net.wifi.WpsInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -45,22 +45,30 @@
 import android.preference.PreferenceScreen;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.ImageButton;
+import android.widget.PopupMenu;
+import android.widget.PopupMenu.OnMenuItemClickListener;
+import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.internal.util.AsyncChannel;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.wifi.p2p.WifiP2pSettings;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -70,27 +78,29 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * This currently provides three types of UI.
+ * Two types of UI are provided here.
  *
- * 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.
+ * The first is for "usual Settings", appearing as any other Setup 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.
+ * The second is for Setup Wizard, with a simplified interface that hides the action bar
+ * and menus.
  */
 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_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 MENU_ID_WPS_PBC = Menu.FIRST;
+    private static final int MENU_ID_WPS_PIN = Menu.FIRST + 1;
+    private static final int MENU_ID_P2P = Menu.FIRST + 2;
+    private static final int MENU_ID_ADD_NETWORK = Menu.FIRST + 3;
+    private static final int MENU_ID_ADVANCED = Menu.FIRST + 4;
+    private static final int MENU_ID_SCAN = Menu.FIRST + 5;
+    private static final int MENU_ID_CONNECT = Menu.FIRST + 6;
+    private static final int MENU_ID_FORGET = Menu.FIRST + 7;
+    private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
 
     private static final int WIFI_DIALOG_ID = 1;
+    private static final int WPS_PBC_DIALOG_ID = 2;
+    private static final int WPS_PIN_DIALOG_ID = 3;
 
     // Combo scans can take 5-6s to complete - set to 10s.
     private static final int WIFI_RESCAN_INTERVAL_MS = 10 * 1000;
@@ -104,6 +114,13 @@
     private final Scanner mScanner;
 
     private WifiManager mWifiManager;
+    private WifiManager.Channel mChannel;
+    private WifiManager.ActionListener mConnectListener;
+    private WifiManager.ActionListener mSaveListener;
+    private WifiManager.ActionListener mForgetListener;
+    private boolean mP2pSupported;
+
+
     private WifiEnabler mWifiEnabler;
     // An access point being editted is stored here.
     private AccessPoint mSelectedAccessPoint;
@@ -124,15 +141,26 @@
     // 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";
 
+    // this boolean extra specifies whether to auto finish when connection is established
+    private static final String EXTRA_AUTO_FINISH_ON_CONNECT = "wifi_auto_finish_on_connect";
+
+    // this boolean extra is set if we are being invoked by the Setup Wizard
+    private static final String EXTRA_IS_FIRST_RUN = "firstRun";
+
     // should Next button only be enabled when we have a connection?
     private boolean mEnableNextOnConnection;
-    private boolean mInXlSetupWizard;
+
+    // should activity finish once we have a connection?
+    private boolean mAutoFinishOnConnection;
 
     // Save the dialog details
     private boolean mDlgEdit;
     private AccessPoint mDlgAccessPoint;
     private Bundle mAccessPointSavedState;
 
+    // the action bar uses a different set of controls for Setup Wizard
+    private boolean mSetupWizardMode;
+
     /* End of "used in Wifi Setup context" */
 
     public WifiSettings() {
@@ -145,7 +173,6 @@
         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
@@ -158,10 +185,54 @@
     }
 
     @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
+    public void onCreate(Bundle icicle) {
+        // Set this flag early, as it's needed by getHelpResource(), which is called by super
+        mSetupWizardMode = getActivity().getIntent().getBooleanExtra(EXTRA_IS_FIRST_RUN, false);
 
-        mInXlSetupWizard = (activity instanceof WifiSettingsForSetupWizardXL);
+        super.onCreate(icicle);
+    }
+
+    @Override
+    public View onCreateView(final LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        if (mSetupWizardMode) {
+            View view = inflater.inflate(R.layout.setup_preference, container, false);
+            View other = view.findViewById(R.id.other_network);
+            other.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mWifiManager.isWifiEnabled()) {
+                        onAddNetworkPressed();
+                    }
+                }
+            });
+            final ImageButton b = (ImageButton) view.findViewById(R.id.more);
+            if (b != null) {
+                b.setOnClickListener(new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (mWifiManager.isWifiEnabled()) {
+                            PopupMenu pm = new PopupMenu(inflater.getContext(), b);
+                            pm.inflate(R.menu.wifi_setup);
+                            pm.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+                                @Override
+                                public boolean onMenuItemClick(MenuItem item) {
+                                    if (R.id.wifi_wps == item.getItemId()) {
+                                        showDialog(WPS_PBC_DIALOG_ID);
+                                        return true;
+                                    }
+                                    return false;
+                                }
+                            });
+                            pm.show();
+                        }
+                    }
+                });
+            }
+            return view;
+        } else {
+            return super.onCreateView(inflater, container, savedInstanceState);
+        }
     }
 
     @Override
@@ -170,8 +241,40 @@
         // Preference (probably in onCreate()), while WifiSettings exceptionally set it up in
         // this method.
 
+        mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-        mWifiManager.asyncConnect(getActivity(), new WifiServiceHandler());
+        mChannel = mWifiManager.initialize(getActivity(), getActivity().getMainLooper(), null);
+
+        mConnectListener = new WifiManager.ActionListener() {
+                                   public void onSuccess() {
+                                   }
+                                   public void onFailure(int reason) {
+                                        Toast.makeText(getActivity(),
+                                            R.string.wifi_failed_connect_message,
+                                            Toast.LENGTH_SHORT).show();
+                                   }
+                               };
+
+        mSaveListener = new WifiManager.ActionListener() {
+                                public void onSuccess() {
+                                }
+                                public void onFailure(int reason) {
+                                    Toast.makeText(getActivity(),
+                                        R.string.wifi_failed_save_message,
+                                        Toast.LENGTH_SHORT).show();
+                                }
+                            };
+
+        mForgetListener = new WifiManager.ActionListener() {
+                                   public void onSuccess() {
+                                   }
+                                   public void onFailure(int reason) {
+                                        Toast.makeText(getActivity(),
+                                            R.string.wifi_failed_forget_message,
+                                            Toast.LENGTH_SHORT).show();
+                                   }
+                               };
+
         if (savedInstanceState != null
                 && savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
             mDlgEdit = savedInstanceState.getBoolean(SAVE_DIALOG_EDIT_MODE);
@@ -181,6 +284,24 @@
         final Activity activity = getActivity();
         final Intent intent = activity.getIntent();
 
+        // first if we're supposed to finish once we have a connection
+        mAutoFinishOnConnection = intent.getBooleanExtra(EXTRA_AUTO_FINISH_ON_CONNECT, false);
+
+        if (mAutoFinishOnConnection) {
+            // Hide the next button
+            if (hasNextButton()) {
+                getNextButton().setVisibility(View.GONE);
+            }
+
+            final ConnectivityManager connectivity = (ConnectivityManager)
+                    getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (connectivity != null
+                    && connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
+                activity.finish();
+                return;
+            }
+        }
+
         // 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);
@@ -197,11 +318,19 @@
             }
         }
 
-        if (mInXlSetupWizard) {
-            addPreferencesFromResource(R.xml.wifi_access_points_for_wifi_setup_xl);
-        } else {
-            addPreferencesFromResource(R.xml.wifi_settings);
+        addPreferencesFromResource(R.xml.wifi_settings);
 
+        if (mSetupWizardMode) {
+            getView().setSystemUiVisibility(
+                    View.STATUS_BAR_DISABLE_BACK |
+                    View.STATUS_BAR_DISABLE_HOME |
+                    View.STATUS_BAR_DISABLE_RECENT |
+                    View.STATUS_BAR_DISABLE_NOTIFICATION_ALERTS |
+                    View.STATUS_BAR_DISABLE_CLOCK);
+        }
+
+        // On/off switch is hidden for Setup Wizard
+        if (!mSetupWizardMode) {
             Switch actionBarSwitch = new Switch(activity);
 
             if (activity instanceof PreferenceActivity) {
@@ -225,7 +354,9 @@
         mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
         getListView().setEmptyView(mEmptyView);
 
-        registerForContextMenu(getListView());
+        if (!mSetupWizardMode) {
+            registerForContextMenu(getListView());
+        }
         setHasOptionsMenu(true);
 
         // After confirming PreferenceScreen is available, we call super.
@@ -242,7 +373,7 @@
         getActivity().registerReceiver(mReceiver, mFilter);
         if (mKeyStoreNetworkId != INVALID_NETWORK_ID &&
                 KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) {
-            mWifiManager.connectNetwork(mKeyStoreNetworkId);
+            mWifiManager.connect(mChannel, mKeyStoreNetworkId, mConnectListener);
         }
         mKeyStoreNetworkId = INVALID_NETWORK_ID;
 
@@ -261,16 +392,37 @@
 
     @Override
     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)
+        final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
+        if (mSetupWizardMode) {
+            // FIXME: add setIcon() when graphics are available
+            menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
+                    .setIcon(R.drawable.ic_wps)
+                    .setEnabled(wifiIsEnabled)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+            menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
+                    .setEnabled(wifiIsEnabled)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+        } else {
+            menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
+                    .setIcon(R.drawable.ic_wps)
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
+                    .setIcon(R.drawable.ic_menu_add)
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            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_NEVER);
+            menu.add(Menu.NONE, MENU_ID_WPS_PIN, 0, R.string.wifi_menu_wps_pin)
+                    .setEnabled(wifiIsEnabled)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+            if (mP2pSupported) {
+                menu.add(Menu.NONE, MENU_ID_P2P, 0, R.string.wifi_menu_p2p)
+                        .setEnabled(wifiIsEnabled)
+                        .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+            }
             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);
@@ -296,6 +448,23 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case MENU_ID_WPS_PBC:
+                showDialog(WPS_PBC_DIALOG_ID);
+                return true;
+            case MENU_ID_P2P:
+                if (getActivity() instanceof PreferenceActivity) {
+                    ((PreferenceActivity) getActivity()).startPreferencePanel(
+                            WifiP2pSettings.class.getCanonicalName(),
+                            null,
+                            R.string.wifi_p2p_settings_title, null,
+                            this, 0);
+                } else {
+                    startFragment(this, WifiP2pSettings.class.getCanonicalName(), -1, null);
+                }
+                return true;
+            case MENU_ID_WPS_PIN:
+                showDialog(WPS_PIN_DIALOG_ID);
+                return true;
             case MENU_ID_SCAN:
                 if (mWifiManager.isWifiEnabled()) {
                     mScanner.forceScan();
@@ -323,9 +492,7 @@
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
-        if (mInXlSetupWizard) {
-            ((WifiSettingsForSetupWizardXL)getActivity()).onCreateContextMenu(menu, view, info);
-        } else if (info instanceof AdapterContextMenuInfo) {
+        if (info instanceof AdapterContextMenuInfo) {
             Preference preference = (Preference) getListView().getItemAtPosition(
                     ((AdapterContextMenuInfo) info).position);
 
@@ -353,23 +520,25 @@
             case MENU_ID_CONNECT: {
                 if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
                     if (!requireKeyStore(mSelectedAccessPoint.getConfig())) {
-                        mWifiManager.connectNetwork(mSelectedAccessPoint.networkId);
+                        mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId,
+                                mConnectListener);
                     }
                 } else if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
                     /** Bypass dialog for unsecured networks */
                     mSelectedAccessPoint.generateOpenNetworkConfig();
-                    mWifiManager.connectNetwork(mSelectedAccessPoint.getConfig());
+                    mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(),
+                            mConnectListener);
                 } else {
-                    showConfigUi(mSelectedAccessPoint, true);
+                    showDialog(mSelectedAccessPoint, true);
                 }
                 return true;
             }
             case MENU_ID_FORGET: {
-                mWifiManager.forgetNetwork(mSelectedAccessPoint.networkId);
+                mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
                 return true;
             }
             case MENU_ID_MODIFY: {
-                showConfigUi(mSelectedAccessPoint, true);
+                showDialog(mSelectedAccessPoint, true);
                 return true;
             }
         }
@@ -384,9 +553,9 @@
             if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
                     mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
                 mSelectedAccessPoint.generateOpenNetworkConfig();
-                mWifiManager.connectNetwork(mSelectedAccessPoint.getConfig());
+                mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(), mConnectListener);
             } else {
-                showConfigUi(mSelectedAccessPoint, false);
+                showDialog(mSelectedAccessPoint, false);
             }
         } else {
             return super.onPreferenceTreeClick(screen, preference);
@@ -394,18 +563,6 @@
         return true;
     }
 
-    /**
-     * Shows an appropriate Wifi configuration component.
-     * Called when a user clicks "Add network" preference or one of available networks is selected.
-     */
-    private void showConfigUi(AccessPoint accessPoint, boolean edit) {
-        if (mInXlSetupWizard) {
-            ((WifiSettingsForSetupWizardXL)getActivity()).showConfigUi(accessPoint, edit);
-        } else {
-            showDialog(accessPoint, edit);
-        }
-    }
-
     private void showDialog(AccessPoint accessPoint, boolean edit) {
         if (mDialog != null) {
             removeDialog(WIFI_DIALOG_ID);
@@ -421,18 +578,26 @@
 
     @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;
-            }
+        switch (dialogId) {
+            case WIFI_DIALOG_ID:
+                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;
+            case WPS_PBC_DIALOG_ID:
+                return new WpsDialog(getActivity(), WpsInfo.PBC);
+            case WPS_PIN_DIALOG_ID:
+                return new WpsDialog(getActivity(), WpsInfo.DISPLAY);
         }
-        // If it's still null, fine, it's for Add Network
-        mSelectedAccessPoint = ap;
-        mDialog = new WifiDialog(getActivity(), this, ap, mDlgEdit);
-        return mDialog;
+        return super.onCreateDialog(dialogId);
     }
 
     private boolean requireKeyStore(WifiConfiguration config) {
@@ -450,6 +615,9 @@
      * the strength of network and the security for it.
      */
     private void updateAccessPoints() {
+        // Safeguard from some delayed event handling
+        if (getActivity() == null) return;
+
         final int wifiState = mWifiManager.getWifiState();
 
         switch (wifiState) {
@@ -457,16 +625,11 @@
                 // AccessPoints are automatically sorted with TreeSet.
                 final Collection<AccessPoint> accessPoints = constructAccessPoints();
                 getPreferenceScreen().removeAll();
-                if (mInXlSetupWizard) {
-                    ((WifiSettingsForSetupWizardXL)getActivity()).onAccessPointsUpdated(
-                            getPreferenceScreen(), accessPoints);
-                } else {
-                    if(accessPoints.size() == 0) {
-                        addMessagePreference(R.string.wifi_empty_list_wifi_on);
-                    }
-                    for (AccessPoint accessPoint : accessPoints) {
-                        getPreferenceScreen().addPreference(accessPoint);
-                    }
+                if(accessPoints.size() == 0) {
+                    addMessagePreference(R.string.wifi_empty_list_wifi_on);
+                }
+                for (AccessPoint accessPoint : accessPoints) {
+                    getPreferenceScreen().addPreference(accessPoint);
                 }
                 break;
 
@@ -568,13 +731,10 @@
             //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);
+            SupplicantState state = (SupplicantState) intent.getParcelableExtra(
+                    WifiManager.EXTRA_NEW_STATE);
+            if (!mConnected.get() && SupplicantState.isHandshakeState(state)) {
+                updateConnectionState(WifiInfo.getDetailedStateOf(state));
             }
         } else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
             NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
@@ -583,16 +743,12 @@
             changeNextButtonState(info.isConnected());
             updateAccessPoints();
             updateConnectionState(info.getDetailedState());
+            if (mAutoFinishOnConnection && info.isConnected()) {
+                getActivity().finish();
+                return;
+            }
         } 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;
-            }
         }
     }
 
@@ -622,10 +778,6 @@
                 accessPoint.update(mLastInfo, mLastState);
             }
         }
-
-        if (mInXlSetupWizard) {
-            ((WifiSettingsForSetupWizardXL)getActivity()).updateConnectionState(mLastState);
-        }
     }
 
     private void updateWifiState(int state) {
@@ -683,51 +835,6 @@
         }
     }
 
-    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.
@@ -735,59 +842,40 @@
      * @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()) {
+        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());
-            }
+        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;
+        final WifiConfiguration config = configController.getConfig();
+
+        if (config == null) {
+            if (mSelectedAccessPoint != null
+                    && !requireKeyStore(mSelectedAccessPoint.getConfig())
+                    && mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
+                mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId,
+                        mConnectListener);
+            }
+        } else if (config.networkId != INVALID_NETWORK_ID) {
+            if (mSelectedAccessPoint != null) {
+                mWifiManager.save(mChannel, config, mSaveListener);
+            }
+        } else {
+            if (configController.isEdit() || requireKeyStore(config)) {
+                mWifiManager.save(mChannel, config, mSaveListener);
+            } else {
+                mWifiManager.connect(mChannel, config, mConnectListener);
+            }
         }
 
         if (mWifiManager.isWifiEnabled()) {
@@ -796,16 +884,14 @@
         updateAccessPoints();
     }
 
-    private void saveNetwork(WifiConfiguration config) {
-        if (mInXlSetupWizard) {
-            ((WifiSettingsForSetupWizardXL)getActivity()).onSaveNetwork(config);
-        } else {
-            mWifiManager.saveNetwork(config);
-        }
-    }
-
     /* package */ void forget() {
-        mWifiManager.forgetNetwork(mSelectedAccessPoint.networkId);
+        if (mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
+            // Should not happen, but a monkey seems to triger it
+            Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
+            return;
+        }
+
+        mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
 
         if (mWifiManager.isWifiEnabled()) {
             mScanner.resume();
@@ -833,7 +919,7 @@
     /* package */ void onAddNetworkPressed() {
         // No exact access point is selected.
         mSelectedAccessPoint = null;
-        showConfigUi(null, true);
+        showDialog(null, true);
     }
 
     /* package */ int getAccessPointsCount() {
@@ -862,4 +948,52 @@
             mScanner.resume();
         }
     }
+
+    @Override
+    protected int getHelpResource() {
+        if (mSetupWizardMode) {
+            return 0;
+        }
+        return R.string.help_url_wifi;
+    }
+
+    /**
+     * Used as the outer frame of all setup wizard pages that need to adjust their margins based
+     * on the total size of the available display. (e.g. side margins set to 10% of total width.)
+     */
+    public static class ProportionalOuterFrame extends RelativeLayout {
+        public ProportionalOuterFrame(Context context) {
+            super(context);
+        }
+        public ProportionalOuterFrame(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+        public ProportionalOuterFrame(Context context, AttributeSet attrs, int defStyle) {
+            super(context, attrs, defStyle);
+        }
+
+        /**
+         * Set our margins and title area height proportionally to the available display size
+         */
+        @Override
+        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
+            int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
+            final Resources resources = getContext().getResources();
+            float titleHeight = resources.getFraction(R.dimen.setup_title_height, 1, 1);
+            float sideMargin = resources.getFraction(R.dimen.setup_border_width, 1, 1);
+            int bottom = resources.getDimensionPixelSize(R.dimen.setup_margin_bottom);
+            setPadding(
+                    (int) (parentWidth * sideMargin),
+                    0,
+                    (int) (parentWidth * sideMargin),
+                    bottom);
+            View title = findViewById(R.id.title_area);
+            if (title != null) {
+                title.setMinimumHeight((int) (parentHeight * titleHeight));
+            }
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+    }
+
 }
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 4b6a081..8258b55 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -74,6 +74,7 @@
 
     private WifiSettings mWifiSettings;
     private WifiManager mWifiManager;
+    private WifiManager.Channel mChannel;
 
     /** Used for resizing a padding above title. Hiden when software keyboard is shown. */
     private View mTopPadding;
@@ -142,10 +143,10 @@
         setContentView(R.layout.wifi_settings_for_setup_wizard_xl);
 
         mWifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE);
+        mChannel = mWifiManager.initialize(this, getMainLooper(), null);
         // 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);
@@ -201,25 +202,6 @@
         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);
@@ -614,7 +596,13 @@
                     Log.d(TAG, String.format("forgeting Wi-Fi network \"%s\" (id: %d)",
                             config.SSID, config.networkId));
                 }
-                mWifiManager.forgetNetwork(config.networkId);
+                mWifiManager.forget(mChannel, config.networkId, new WifiManager.ActionListener() {
+                        public void onSuccess() {
+                        }
+                        public void onFailure(int reason) {
+                            //TODO: Add failure UI
+                        }
+                        });
             }
 
             mWifiSettingsFragmentLayout.setVisibility(View.GONE);
@@ -773,6 +761,12 @@
      */
     /* package */ void onSaveNetwork(WifiConfiguration config) {
         // We want to both save and connect a network. connectNetwork() does both.
-        mWifiManager.connectNetwork(config);
+        mWifiManager.connect(mChannel, config, new WifiManager.ActionListener() {
+                public void onSuccess() {
+                }
+                public void onFailure(int reason) {
+                //TODO: Add failure UI
+                }
+                });
     }
 }
diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
new file mode 100644
index 0000000..8415954
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+package com.android.settings.wifi;
+
+import com.android.settings.ButtonBarHandler;
+
+// dummy class for setup wizard theme
+public class WifiSetupActivity extends WifiPickerActivity implements ButtonBarHandler {
+
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WpsDialog.java b/src/com/android/settings/wifi/WpsDialog.java
new file mode 100644
index 0000000..40b2a35
--- /dev/null
+++ b/src/com/android/settings/wifi/WpsDialog.java
@@ -0,0 +1,250 @@
+/*
+ * 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.
+ */
+package com.android.settings.wifi;
+
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.NetworkInfo;
+import android.net.NetworkInfo.DetailedState;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WpsInfo;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import com.android.settings.R;
+
+
+/**
+ * Dialog to show WPS progress.
+ */
+public class WpsDialog extends AlertDialog {
+
+    private final static String TAG = "WpsDialog";
+
+    private View mView;
+    private TextView mTextView;
+    private ProgressBar mTimeoutBar;
+    private ProgressBar mProgressBar;
+    private Button mButton;
+    private Timer mTimer;
+
+    private static final int WPS_TIMEOUT_S = 120;
+
+    private WifiManager mWifiManager;
+    private WifiManager.Channel mChannel;
+    private WifiManager.WpsListener mWpsListener;
+    private int mWpsSetup;
+
+    private final IntentFilter mFilter;
+    private BroadcastReceiver mReceiver;
+
+    private Context mContext;
+    private Handler mHandler = new Handler();
+
+    private enum DialogState {
+        WPS_INIT,
+        WPS_START,
+        WPS_COMPLETE,
+        CONNECTED, //WPS + IP config is done
+        WPS_FAILED
+    }
+    DialogState mDialogState = DialogState.WPS_INIT;
+
+    public WpsDialog(Context context, int wpsSetup) {
+        super(context);
+        mContext = context;
+        mWpsSetup = wpsSetup;
+
+        class WpsListener implements WifiManager.WpsListener {
+            public void onStartSuccess(String pin) {
+                if (pin != null) {
+                    updateDialog(DialogState.WPS_START, String.format(
+                            mContext.getString(R.string.wifi_wps_onstart_pin), pin));
+                } else {
+                    updateDialog(DialogState.WPS_START, mContext.getString(
+                            R.string.wifi_wps_onstart_pbc));
+                }
+            }
+            public void onCompletion() {
+                updateDialog(DialogState.WPS_COMPLETE,
+                        mContext.getString(R.string.wifi_wps_complete));
+            }
+
+            public void onFailure(int reason) {
+                String msg;
+                switch (reason) {
+                    case WifiManager.WPS_OVERLAP_ERROR:
+                        msg = mContext.getString(R.string.wifi_wps_failed_overlap);
+                        break;
+                    case WifiManager.WPS_WEP_PROHIBITED:
+                        msg = mContext.getString(R.string.wifi_wps_failed_wep);
+                        break;
+                    case WifiManager.WPS_TKIP_ONLY_PROHIBITED:
+                        msg = mContext.getString(R.string.wifi_wps_failed_tkip);
+                        break;
+                    case WifiManager.IN_PROGRESS:
+                        msg = mContext.getString(R.string.wifi_wps_in_progress);
+                        break;
+                    default:
+                        msg = mContext.getString(R.string.wifi_wps_failed_generic);
+                        break;
+                }
+                updateDialog(DialogState.WPS_FAILED, msg);
+            }
+        }
+
+        mWpsListener = new WpsListener();
+
+
+        mFilter = new IntentFilter();
+        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        mReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                handleEvent(context, intent);
+            }
+        };
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        mView = getLayoutInflater().inflate(R.layout.wifi_wps_dialog, null);
+
+        mTextView = (TextView) mView.findViewById(R.id.wps_dialog_txt);
+        mTextView.setText(R.string.wifi_wps_setup_msg);
+
+        mTimeoutBar = ((ProgressBar) mView.findViewById(R.id.wps_timeout_bar));
+        mTimeoutBar.setMax(WPS_TIMEOUT_S);
+        mTimeoutBar.setProgress(0);
+
+        mProgressBar = ((ProgressBar) mView.findViewById(R.id.wps_progress_bar));
+        mProgressBar.setVisibility(View.GONE);
+
+        mButton = ((Button) mView.findViewById(R.id.wps_dialog_btn));
+        mButton.setText(R.string.wifi_cancel);
+        mButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismiss();
+            }
+        });
+
+        mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
+        mChannel = mWifiManager.initialize(mContext, mContext.getMainLooper(), null);
+
+        setView(mView);
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onStart() {
+        /*
+         * increment timeout bar per second.
+         */
+        mTimer = new Timer(false);
+        mTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                mHandler.post(new Runnable() {
+
+                    @Override
+                    public void run() {
+                        mTimeoutBar.incrementProgressBy(1);
+                    }
+                });
+            }
+        }, 1000, 1000);
+
+        mContext.registerReceiver(mReceiver, mFilter);
+
+        WpsInfo wpsConfig = new WpsInfo();
+        wpsConfig.setup = mWpsSetup;
+        mWifiManager.startWps(mChannel, wpsConfig, mWpsListener);
+    }
+
+    @Override
+    protected void onStop() {
+        if (mDialogState != DialogState.WPS_COMPLETE) {
+            mWifiManager.cancelWps(mChannel, null);
+        }
+
+        if (mReceiver != null) {
+            mContext.unregisterReceiver(mReceiver);
+            mReceiver = null;
+        }
+
+        if (mTimer != null) {
+            mTimer.cancel();
+        }
+    }
+
+    private void updateDialog(DialogState state, String msg) {
+        if (mDialogState.ordinal() >= state.ordinal()) {
+            //ignore.
+            return;
+        }
+        mDialogState = state;
+
+        switch(state) {
+            case WPS_COMPLETE:
+                mTimeoutBar.setVisibility(View.GONE);
+                mProgressBar.setVisibility(View.VISIBLE);
+                break;
+            case CONNECTED:
+            case WPS_FAILED:
+                mButton.setText(mContext.getString(R.string.dlg_ok));
+                mTimeoutBar.setVisibility(View.GONE);
+                mProgressBar.setVisibility(View.GONE);
+                if (mReceiver != null) {
+                    mContext.unregisterReceiver(mReceiver);
+                    mReceiver = null;
+                }
+                break;
+        }
+        mTextView.setText(msg);
+    }
+
+    private void handleEvent(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
+            NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
+                    WifiManager.EXTRA_NETWORK_INFO);
+            final NetworkInfo.DetailedState state = info.getDetailedState();
+            if (state == DetailedState.CONNECTED &&
+                    mDialogState == DialogState.WPS_COMPLETE) {
+                WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+                if (wifiInfo != null) {
+                    String msg = String.format(mContext.getString(
+                            R.string.wifi_wps_connected), wifiInfo.getSSID());
+                    updateDialog(DialogState.CONNECTED, msg);
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java b/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
deleted file mode 100644
index e688905..0000000
--- a/src/com/android/settings/wifi/p2p/WifiP2pDialog.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.WpsInfo;
-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 WpsInfo();
-        switch (mWpsSetupIndex) {
-            case WPS_PBC:
-                config.wps.setup = WpsInfo.PBC;
-                break;
-            case WPS_KEYPAD:
-                config.wps.setup = WpsInfo.KEYPAD;
-                config.wps.pin = ((TextView) mView.findViewById(R.id.wps_pin)).
-                        getText().toString();
-                break;
-            case WPS_DISPLAY:
-                config.wps.setup = WpsInfo.DISPLAY;
-                break;
-            default:
-                config.wps.setup = WpsInfo.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
deleted file mode 100644
index 0747d64..0000000
--- a/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.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 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, mContext.getMainLooper(), null);
-            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;
-        }
-    }
-
-}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index f6588b9..684ec30 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -32,8 +32,10 @@
 import android.net.wifi.p2p.WifiP2pDeviceList;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.net.wifi.p2p.WifiP2pManager.PeerListListener;
+import android.net.wifi.WpsInfo;
 import android.os.Bundle;
-import android.os.Message;
+import android.os.Handler;
+import android.os.SystemProperties;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
@@ -45,6 +47,9 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.widget.EditText;
+import android.widget.Switch;
+import android.widget.Toast;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -60,36 +65,47 @@
         implements PeerListListener {
 
     private static final String TAG = "WifiP2pSettings";
+    private static final boolean DBG = false;
     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_REMOVE_GROUP = Menu.FIRST + 2;
-    private static final int MENU_ID_ADVANCED = Menu.FIRST +3;
-
+    private static final int MENU_ID_RENAME = Menu.FIRST + 1;
 
     private final IntentFilter mIntentFilter = new IntentFilter();
     private WifiP2pManager mWifiP2pManager;
     private WifiP2pManager.Channel mChannel;
-    private WifiP2pDialog mConnectDialog;
-    private OnClickListener mConnectListener;
+    private OnClickListener mRenameListener;
     private OnClickListener mDisconnectListener;
+    private OnClickListener mCancelConnectListener;
     private WifiP2pPeer mSelectedWifiPeer;
+    private EditText mDeviceNameText;
+
+    private boolean mWifiP2pEnabled;
+    private boolean mWifiP2pSearching;
+    private int mConnectedDevices;
 
     private PreferenceGroup mPeersGroup;
     private Preference mThisDevicePref;
 
-    private static final int DIALOG_CONNECT     = 1;
-    private static final int DIALOG_DISCONNECT  = 2;
+    private static final int DIALOG_DISCONNECT  = 1;
+    private static final int DIALOG_CANCEL_CONNECT = 2;
+    private static final int DIALOG_RENAME = 3;
+
+    private static final String SAVE_DIALOG_PEER = "PEER_STATE";
+    private static final String SAVE_DEVICE_NAME = "DEV_NAME";
 
     private WifiP2pDevice mThisDevice;
     private WifiP2pDeviceList mPeers = new WifiP2pDeviceList();
 
+    private String mSavedDeviceName;
+
     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
+                mWifiP2pEnabled = intent.getIntExtra(WifiP2pManager.EXTRA_WIFI_STATE,
+                    WifiP2pManager.WIFI_P2P_STATE_DISABLED) == WifiP2pManager.WIFI_P2P_STATE_ENABLED;
+                handleP2pStateChanged();
             } else if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) {
                 if (mWifiP2pManager != null) {
                     mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
@@ -99,26 +115,38 @@
                 NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(
                         WifiP2pManager.EXTRA_NETWORK_INFO);
                 if (networkInfo.isConnected()) {
-                    Log.d(TAG, "Connected");
+                    if (DBG) Log.d(TAG, "Connected");
+                } else {
+                    //start a search when we are disconnected
+                    startSearch();
                 }
             } else if (WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION.equals(action)) {
                 mThisDevice = (WifiP2pDevice) intent.getParcelableExtra(
                         WifiP2pManager.EXTRA_WIFI_P2P_DEVICE);
-                Log.d(TAG, "Update device info: " + mThisDevice);
+                if (DBG) Log.d(TAG, "Update device info: " + mThisDevice);
                 updateDevicePref();
+            } else if (WifiP2pManager.WIFI_P2P_DISCOVERY_CHANGED_ACTION.equals(action)) {
+                int discoveryState = intent.getIntExtra(WifiP2pManager.EXTRA_DISCOVERY_STATE,
+                    WifiP2pManager.WIFI_P2P_DISCOVERY_STOPPED);
+                if (DBG) Log.d(TAG, "Discovery state changed: " + discoveryState);
+                if (discoveryState == WifiP2pManager.WIFI_P2P_DISCOVERY_STARTED) {
+                    updateSearchMenu(true);
+                } else {
+                    updateSearchMenu(false);
+                }
             }
         }
     };
 
     @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
+    public void onActivityCreated(Bundle savedInstanceState) {
         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);
         mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_DISCOVERY_CHANGED_ACTION);
 
         final Activity activity = getActivity();
         mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
@@ -133,20 +161,29 @@
             Log.e(TAG, "mWifiP2pManager is null !");
         }
 
-        //connect dialog listener
-        mConnectListener = new OnClickListener() {
+        if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DIALOG_PEER)) {
+            WifiP2pDevice device = savedInstanceState.getParcelable(SAVE_DIALOG_PEER);
+            mSelectedWifiPeer = new WifiP2pPeer(getActivity(), device);
+        }
+        if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DEVICE_NAME)) {
+            mSavedDeviceName = savedInstanceState.getString(SAVE_DEVICE_NAME);
+        }
+
+        mRenameListener = 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,
+                        mWifiP2pManager.setDeviceName(mChannel,
+                                mDeviceNameText.getText().toString(),
                                 new WifiP2pManager.ActionListener() {
                             public void onSuccess() {
-                                Log.d(TAG, " connect success");
+                                if (DBG) Log.d(TAG, " device rename success");
                             }
                             public void onFailure(int reason) {
-                                Log.d(TAG, " connect fail " + reason);
+                                Toast.makeText(getActivity(),
+                                        R.string.wifi_p2p_failed_rename_message,
+                                        Toast.LENGTH_LONG).show();
                             }
                         });
                     }
@@ -162,96 +199,105 @@
                     if (mWifiP2pManager != null) {
                         mWifiP2pManager.removeGroup(mChannel, new WifiP2pManager.ActionListener() {
                             public void onSuccess() {
-                                Log.d(TAG, " remove group success");
+                                if (DBG) Log.d(TAG, " remove group success");
                             }
                             public void onFailure(int reason) {
-                                Log.d(TAG, " remove group fail " + reason);
+                                if (DBG) Log.d(TAG, " remove group fail " + reason);
                             }
                         });
                     }
                 }
             }
         };
+
+        //cancel connect dialog listener
+        mCancelConnectListener = new OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    if (mWifiP2pManager != null) {
+                        mWifiP2pManager.cancelConnect(mChannel,
+                                new WifiP2pManager.ActionListener() {
+                            public void onSuccess() {
+                                if (DBG) Log.d(TAG, " cancel connect success");
+                            }
+                            public void onFailure(int reason) {
+                                if (DBG) Log.d(TAG, " cancel connect fail " + reason);
+                            }
+                        });
+                    }
+                }
+            }
+        };
+
         setHasOptionsMenu(true);
+
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        preferenceScreen.removeAll();
+
+        preferenceScreen.setOrderingAsAdded(true);
+        mThisDevicePref = new Preference(getActivity());
+        preferenceScreen.addPreference(mThisDevicePref);
+
+        mPeersGroup = new PreferenceCategory(getActivity());
+        mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
+
+        super.onActivityCreated(savedInstanceState);
     }
 
     @Override
     public void onResume() {
         super.onResume();
         getActivity().registerReceiver(mReceiver, mIntentFilter);
-
-        if (mWifiP2pManager != null) {
-            mWifiP2pManager.discoverPeers(mChannel, new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                Log.d(TAG, " discover success");
-                            }
-                            public void onFailure(int reason) {
-                                Log.d(TAG, " discover fail " + reason);
-                            }
-                        });
-        }
     }
 
     @Override
     public void onPause() {
         super.onPause();
+        mWifiP2pManager.stopPeerDiscovery(mChannel, null);
         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)
+        int textId = mWifiP2pSearching ? R.string.wifi_p2p_menu_searching :
+                R.string.wifi_p2p_menu_search;
+        menu.add(Menu.NONE, MENU_ID_SEARCH, 0, textId)
+            .setEnabled(mWifiP2pEnabled)
             .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_REMOVE_GROUP, 0, R.string.wifi_p2p_menu_remove_group)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_p2p_menu_advanced)
+        menu.add(Menu.NONE, MENU_ID_RENAME, 0, R.string.wifi_p2p_menu_rename)
+            .setEnabled(mWifiP2pEnabled)
             .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        MenuItem searchMenu = menu.findItem(MENU_ID_SEARCH);
+        MenuItem renameMenu = menu.findItem(MENU_ID_RENAME);
+        if (mWifiP2pEnabled) {
+            searchMenu.setEnabled(true);
+            renameMenu.setEnabled(true);
+        } else {
+            searchMenu.setEnabled(false);
+            renameMenu.setEnabled(false);
+        }
+
+        if (mWifiP2pSearching) {
+            searchMenu.setTitle(R.string.wifi_p2p_menu_searching);
+        } else {
+            searchMenu.setTitle(R.string.wifi_p2p_menu_search);
+        }
+    }
+
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case MENU_ID_SEARCH:
-                if (mWifiP2pManager != null) {
-                    mWifiP2pManager.discoverPeers(mChannel, new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                Log.d(TAG, " discover success");
-                            }
-                            public void onFailure(int reason) {
-                                Log.d(TAG, " discover fail " + reason);
-                            }
-                        });
-                }
+                startSearch();
                 return true;
-            case MENU_ID_CREATE_GROUP:
-                if (mWifiP2pManager != null) {
-                    mWifiP2pManager.createGroup(mChannel, new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                Log.d(TAG, " create group success");
-                            }
-                            public void onFailure(int reason) {
-                                Log.d(TAG, " create group fail " + reason);
-                            }
-                        });
-                }
-                return true;
-            case MENU_ID_REMOVE_GROUP:
-                if (mWifiP2pManager != null) {
-                    mWifiP2pManager.removeGroup(mChannel, new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                Log.d(TAG, " remove group success");
-                            }
-                            public void onFailure(int reason) {
-                                Log.d(TAG, " remove group fail " + reason);
-                            }
-                        });
-                }
-                return true;
-            case MENU_ID_ADVANCED:
-                //TODO: add advanced settings for p2p
+            case MENU_ID_RENAME:
+                showDialog(DIALOG_RENAME);
                 return true;
         }
         return super.onOptionsItemSelected(item);
@@ -263,8 +309,38 @@
             mSelectedWifiPeer = (WifiP2pPeer) preference;
             if (mSelectedWifiPeer.device.status == WifiP2pDevice.CONNECTED) {
                 showDialog(DIALOG_DISCONNECT);
+            } else if (mSelectedWifiPeer.device.status == WifiP2pDevice.INVITED) {
+                showDialog(DIALOG_CANCEL_CONNECT);
             } else {
-                showDialog(DIALOG_CONNECT);
+                WifiP2pConfig config = new WifiP2pConfig();
+                config.deviceAddress = mSelectedWifiPeer.device.deviceAddress;
+
+                int forceWps = SystemProperties.getInt("wifidirect.wps", -1);
+
+                if (forceWps != -1) {
+                    config.wps.setup = forceWps;
+                } else {
+                    if (mSelectedWifiPeer.device.wpsPbcSupported()) {
+                        config.wps.setup = WpsInfo.PBC;
+                    } else if (mSelectedWifiPeer.device.wpsKeypadSupported()) {
+                        config.wps.setup = WpsInfo.KEYPAD;
+                    } else {
+                        config.wps.setup = WpsInfo.DISPLAY;
+                    }
+                }
+
+                mWifiP2pManager.connect(mChannel, config,
+                        new WifiP2pManager.ActionListener() {
+                            public void onSuccess() {
+                                if (DBG) Log.d(TAG, " connect success");
+                            }
+                            public void onFailure(int reason) {
+                                Log.e(TAG, " connect fail " + reason);
+                                Toast.makeText(getActivity(),
+                                        R.string.wifi_p2p_failed_connect_message,
+                                        Toast.LENGTH_SHORT).show();
+                            }
+                    });
             }
         }
         return super.onPreferenceTreeClick(screen, preference);
@@ -272,50 +348,117 @@
 
     @Override
     public Dialog onCreateDialog(int id) {
-        if (id == DIALOG_CONNECT) {
-            mConnectDialog = new WifiP2pDialog(getActivity(), mConnectListener,
-                mSelectedWifiPeer.device);
-            return mConnectDialog;
-        } else if (id == DIALOG_DISCONNECT) {
+        if (id == DIALOG_DISCONNECT) {
+            String deviceName = TextUtils.isEmpty(mSelectedWifiPeer.device.deviceName) ?
+                    mSelectedWifiPeer.device.deviceAddress :
+                    mSelectedWifiPeer.device.deviceName;
+            String msg;
+            if (mConnectedDevices > 1) {
+                msg = getActivity().getString(R.string.wifi_p2p_disconnect_multiple_message,
+                        deviceName, mConnectedDevices - 1);
+            } else {
+                msg = getActivity().getString(R.string.wifi_p2p_disconnect_message, deviceName);
+            }
             AlertDialog dialog = new AlertDialog.Builder(getActivity())
-                .setTitle("Disconnect ?")
-                .setMessage("Do you want to disconnect ?")
+                .setTitle(R.string.wifi_p2p_disconnect_title)
+                .setMessage(msg)
                 .setPositiveButton(getActivity().getString(R.string.dlg_ok), mDisconnectListener)
                 .setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
                 .create();
             return dialog;
+        } else if (id == DIALOG_CANCEL_CONNECT) {
+            int stringId = R.string.wifi_p2p_cancel_connect_message;
+            String deviceName = TextUtils.isEmpty(mSelectedWifiPeer.device.deviceName) ?
+                    mSelectedWifiPeer.device.deviceAddress :
+                    mSelectedWifiPeer.device.deviceName;
+
+            AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.wifi_p2p_cancel_connect_title)
+                .setMessage(getActivity().getString(stringId, deviceName))
+                .setPositiveButton(getActivity().getString(R.string.dlg_ok), mCancelConnectListener)
+                .setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
+                .create();
+            return dialog;
+        } else if (id == DIALOG_RENAME) {
+            mDeviceNameText = new EditText(getActivity());
+            if (mSavedDeviceName != null) {
+                mDeviceNameText.setText(mSavedDeviceName);
+                mDeviceNameText.setSelection(mSavedDeviceName.length());
+            } else if (mThisDevice != null && !TextUtils.isEmpty(mThisDevice.deviceName)) {
+                mDeviceNameText.setText(mThisDevice.deviceName);
+                mDeviceNameText.setSelection(0, mThisDevice.deviceName.length());
+            }
+            mSavedDeviceName = null;
+            AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.wifi_p2p_menu_rename)
+                .setView(mDeviceNameText)
+                .setPositiveButton(getActivity().getString(R.string.dlg_ok), mRenameListener)
+                .setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
+                .create();
+            return dialog;
         }
         return null;
     }
 
-    public void onPeersAvailable(WifiP2pDeviceList peers) {
-
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        preferenceScreen.removeAll();
-
-        preferenceScreen.setOrderingAsAdded(true);
-
-        if (mPeersGroup == null) {
-            mPeersGroup = new PreferenceCategory(getActivity());
-        } else {
-            mPeersGroup.removeAll();
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        if (mSelectedWifiPeer != null) {
+            outState.putParcelable(SAVE_DIALOG_PEER, mSelectedWifiPeer.device);
         }
+        if (mDeviceNameText != null) {
+            outState.putString(SAVE_DEVICE_NAME, mDeviceNameText.getText().toString());
+        }
+    }
 
-        preferenceScreen.addPreference(mThisDevicePref);
-
-        mPeersGroup.setTitle(R.string.wifi_p2p_available_devices);
-        mPeersGroup.setEnabled(true);
-        preferenceScreen.addPreference(mPeersGroup);
+    public void onPeersAvailable(WifiP2pDeviceList peers) {
+        mPeersGroup.removeAll();
 
         mPeers = peers;
+        mConnectedDevices = 0;
         for (WifiP2pDevice peer: peers.getDeviceList()) {
+            if (DBG) Log.d(TAG, " peer " + peer);
             mPeersGroup.addPreference(new WifiP2pPeer(getActivity(), peer));
+            if (peer.status == WifiP2pDevice.CONNECTED) mConnectedDevices++;
+        }
+        if (DBG) Log.d(TAG, " mConnectedDevices " + mConnectedDevices);
+    }
+
+    private void handleP2pStateChanged() {
+        updateSearchMenu(false);
+        if (mWifiP2pEnabled) {
+            final PreferenceScreen preferenceScreen = getPreferenceScreen();
+            preferenceScreen.removeAll();
+
+            preferenceScreen.setOrderingAsAdded(true);
+            preferenceScreen.addPreference(mThisDevicePref);
+
+            mPeersGroup.setEnabled(true);
+            preferenceScreen.addPreference(mPeersGroup);
+
+            /* Request latest set of peers */
+            mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
+        }
+    }
+
+    private void updateSearchMenu(boolean searching) {
+       mWifiP2pSearching = searching;
+       Activity activity = getActivity();
+       if (activity != null) activity.invalidateOptionsMenu();
+    }
+
+    private void startSearch() {
+        if (mWifiP2pManager != null && !mWifiP2pSearching) {
+            mWifiP2pManager.discoverPeers(mChannel, new WifiP2pManager.ActionListener() {
+                public void onSuccess() {
+                }
+                public void onFailure(int reason) {
+                    if (DBG) Log.d(TAG, " discover fail " + reason);
+                }
+            });
         }
     }
 
     private void updateDevicePref() {
-        mThisDevicePref = new Preference(getActivity());
-
         if (mThisDevice != null) {
             if (TextUtils.isEmpty(mThisDevice.deviceName)) {
                 mThisDevicePref.setTitle(mThisDevice.deviceAddress);
@@ -323,15 +466,9 @@
                 mThisDevicePref.setTitle(mThisDevice.deviceName);
             }
 
-            if (mThisDevice.status == WifiP2pDevice.CONNECTED) {
-                String[] statusArray = getActivity().getResources().getStringArray(
-                        R.array.wifi_p2p_status);
-                mThisDevicePref.setSummary(statusArray[mThisDevice.status]);
-            }
             mThisDevicePref.setPersistent(false);
             mThisDevicePref.setEnabled(true);
             mThisDevicePref.setSelectable(false);
         }
-        onPeersAvailable(mPeers); //update UI
     }
 }
diff --git a/tests/res/drawable-xhdpi/ic_settings_applications.png b/tests/res/drawable-xhdpi/ic_settings_applications.png
new file mode 100644
index 0000000..8eda83f
--- /dev/null
+++ b/tests/res/drawable-xhdpi/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
deleted file mode 100755
index 5cea33f..0000000
--- a/tests/res/drawable/ic_settings_applications.png
+++ /dev/null
Binary files differ