diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf1f888..24fc8b0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <original-package android:name="com.android.settings" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.DEVICE_POWER" />
@@ -55,13 +56,17 @@
     <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" />
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
+    <uses-permission android:name="android.permission.COPY_PROTECTED_DATA" />
+    <uses-permission android:name="android.permission.MANAGE_USERS" />
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
             android:theme="@android:style/Theme.Holo"
             android:uiOptions="splitActionBarWhenNarrow"
-            android:hardwareAccelerated="true">
+            android:hardwareAccelerated="true"
+            android:supportsRtl="true">
 
         <!-- Settings -->
 
@@ -93,6 +98,7 @@
         <!-- Wireless Controls -->
 
         <activity android:name="Settings$WirelessSettingsActivity"
+                android:taskAffinity="com.android.settings"
                 android:label="@string/wireless_networks_settings_title"
                 android:parentActivityName="Settings">
             <intent-filter>
@@ -113,9 +119,9 @@
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
+                android:taskAffinity="com.android.settings"
                 android:label="@string/wifi_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -132,11 +138,11 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".wifi.WifiSettings"
+                android:taskAffinity="com.android.settings"
                 android:label="@string/wifi_settings"
                 android:targetActivity="Settings$WifiSettingsActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:exported="true"
-                android:clearTaskOnLaunch="true">
+                android:exported="true">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.WifiSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
@@ -144,8 +150,8 @@
         </activity-alias>
 
         <activity android:name=".wifi.WifiPickerActivity"
-                android:parentActivityName="Settings"
-                android:clearTaskOnLaunch="true">
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
@@ -173,9 +179,9 @@
                   android:exported="true" />
 
         <activity android:name="Settings$AdvancedWifiSettingsActivity"
+                android:taskAffinity="com.android.settings"
                 android:label="@string/wifi_advanced_settings_label"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -195,6 +201,7 @@
 
         <activity android:name=".wifi.WifiInfo"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -205,6 +212,7 @@
 
         <activity android:name=".wifi.WifiConfigInfo"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -243,8 +251,7 @@
 
         <activity android:name="ApnSettings" android:label="@string/apn_settings"
                   android:configChanges="orientation|keyboardHidden|screenSize"
-                  android:launchMode="singleTask"
-                  android:parentActivityName="Settings$WirelessSettingsActivity">
+                  android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -255,7 +262,7 @@
 
         <activity android:name="Settings$BluetoothSettingsActivity"
                 android:label="@string/bluetooth_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -285,8 +292,7 @@
         <activity android:name=".bluetooth.DevicePickerActivity"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                 android:label="@string/device_picker"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings">
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -295,7 +301,7 @@
 
         <activity android:name="Settings$TetherSettingsActivity"
                 android:label="@string/tether_settings_title_all"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -330,7 +336,7 @@
         </activity-alias>
 
         <activity android:name="Settings$WifiP2pSettingsActivity"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -350,7 +356,7 @@
 
         <activity android:name="Settings$VpnSettingsActivity"
                 android:label="@string/vpn_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -395,7 +401,7 @@
 
         <activity android:name="Settings$LocalePickerActivity"
                 android:label="@string/language_picker_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -411,7 +417,7 @@
 
         <activity android:name="Settings$InputMethodAndLanguageSettingsActivity"
                 android:label="@string/language_keyboard_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -452,7 +458,7 @@
 
         <activity android:name="Settings$SpellCheckersSettingsActivity"
                 android:label="@string/spellcheckers_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -489,7 +495,7 @@
 
         <activity android:name="Settings$UserDictionarySettingsActivity"
                 android:label="@string/user_dict_settings_titlebar"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:uiOptions="none"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
@@ -525,7 +531,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UserDictionarySettings"
                 android:label="@string/user_dict_settings_titlebar"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$UserDictionarySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -540,7 +545,7 @@
 
         <activity android:name="Settings$SoundSettingsActivity"
                 android:label="@string/sound_settings"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -559,7 +564,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="SoundSettings"
                 android:label="@string/sound_settings"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$SoundSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -570,7 +574,7 @@
 
         <activity android:name="Settings$DisplaySettingsActivity"
                 android:label="@string/display_settings"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -589,7 +593,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="DisplaySettings"
                 android:label="@string/display_settings"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$DisplaySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -601,7 +604,7 @@
         <activity android:name="Settings$DockSettingsActivity"
                 android:label="@string/dock_settings_title"
                 android:enabled="@bool/has_dock_settings"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -619,7 +622,6 @@
         <activity-alias android:name="DockSettings"
                 android:label="@string/dock_settings_title"
                 android:enabled="@bool/has_dock_settings"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$DockSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -631,6 +633,7 @@
         <activity android:name="Settings$DeviceInfoSettingsActivity"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                 android:label="@string/device_info_settings"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -665,7 +668,7 @@
 
         <activity android:name="Settings$ManageApplicationsActivity"
                 android:label="@string/applications_settings"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings"
                 android:uiOptions="none">
             <intent-filter>
@@ -686,7 +689,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".applications.ManageApplications"
                 android:label="@string/applications_settings"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -698,7 +700,6 @@
         <!-- Keep compatibility with old shortcuts. Pre-gingerbread. -->
         <activity-alias android:name=".ManageApplications"
                   android:label="@string/manageapplications_settings_title"
-                  android:clearTaskOnLaunch="true"
                   android:exported="true"
                   android:targetActivity="Settings$ManageApplicationsActivity">
         </activity-alias>
@@ -707,7 +708,6 @@
              This is for compatibility with old shortcuts. -->
         <activity-alias android:name=".RunningServices"
                 android:label="@string/runningservices_settings_title"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -720,7 +720,6 @@
              This is for compatibility with old shortcuts. -->
         <activity-alias android:name=".applications.StorageUse"
                 android:label="@string/storageuse_settings_title"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -735,6 +734,7 @@
         <activity android:name=".applications.InstalledAppDetailsTop"
                   android:label="@string/application_info_label"
                   android:exported="true"
+                  android:taskAffinity="com.android.settings"
                   android:parentActivityName="Settings$ManageApplicationsActivity">
         </activity>
 
@@ -753,6 +753,7 @@
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$RunningServicesActivity"
                 android:label="@string/runningservices_settings_title"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -769,6 +770,7 @@
         <!-- Provide direct entry into manage apps showing storage usage of apps. -->
         <activity android:name="Settings$StorageUseActivity"
                 android:label="@string/storageuse_settings_title"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -786,7 +788,7 @@
         <activity android:name="Settings$LocationSettingsActivity"
                 android:label="@string/location_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -805,7 +807,7 @@
         <activity android:name="Settings$SecuritySettingsActivity"
                 android:label="@string/security_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -824,7 +826,6 @@
         <activity-alias android:name="SecuritySettings"
                 android:label="@string/security_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$SecuritySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -836,7 +837,7 @@
         <activity android:name="Settings$PrivacySettingsActivity"
                 android:label="@string/privacy_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -870,7 +871,7 @@
 
         <activity android:name="Settings$DeviceAdminSettingsActivity"
                 android:label="@string/device_admin_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$SecuritySettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -890,7 +891,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="DeviceAdminSettings"
                 android:label="@string/device_admin_settings_title"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$DeviceAdminSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -916,8 +916,7 @@
         <activity android:name="IccLockSettings"
                 android:label="@string/sim_lock_settings"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
-                android:process="com.android.phone"
-                android:parentActivityName="Settings$SecuritySettingsActivity">
+                android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -928,7 +927,7 @@
         <activity android:name="Settings$AccessibilitySettingsActivity"
                 android:label="@string/accessibility_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -945,6 +944,7 @@
 
         <activity android:name="Settings$TextToSpeechSettingsActivity"
                 android:label="@string/tts_settings"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -986,8 +986,7 @@
         <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:parentActivityName="Settings$DeviceInfoSettingsActivity">
+                android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -998,6 +997,7 @@
         <activity android:name="Settings$StorageSettingsActivity"
                 android:label="@string/storage_settings_title"
                 android:uiOptions="none"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1058,7 +1058,7 @@
 
         <activity android:name="Settings$DevelopmentSettingsActivity"
                 android:label="@string/development_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1074,7 +1074,6 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="DevelopmentSettings"
-                  android:clearTaskOnLaunch="true"
                   android:exported="true"
                   android:label="@string/development_settings_title"
                   android:targetActivity="Settings$DevelopmentSettingsActivity">
@@ -1089,7 +1088,7 @@
 
         <activity android:name="Settings$UsbSettingsActivity"
                 android:label="@string/storage_title_usb"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$StorageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1109,7 +1108,6 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UsbSettings"
-                  android:clearTaskOnLaunch="true"
                   android:exported="true"
                   android:label="@string/storage_title_usb"
                   android:targetActivity="Settings$DevelopmentSettingsActivity">
@@ -1216,7 +1214,7 @@
         <!-- NFC settings -->
         <activity android:name="Settings$AndroidBeamSettingsActivity"
                 android:label="@string/android_beam_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1247,6 +1245,7 @@
         </receiver>
 
         <activity android:name="BatteryInfo" android:label="@string/battery_info_label"
+                  android:taskAffinity="com.android.settings"
                   android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1257,6 +1256,7 @@
 
         <activity android:name="Display" android:label="@string/display_label"
                 android:configChanges="fontScale"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1330,6 +1330,7 @@
         </activity>
 
         <activity android:name="UsageStats" android:label="@string/usage_stats_label"
+                  android:taskAffinity="com.android.settings"
                   android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1340,6 +1341,7 @@
         <activity android:name="Settings$PowerUsageSummaryActivity"
                 android:label="@string/power_usage_summary_title"
                 android:uiOptions="none"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1366,6 +1368,7 @@
 
         <activity android:name="Settings$AccountSyncSettingsActivity"
             android:label="@string/account_sync_settings_title"
+            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings"
             android:uiOptions="none">
             <intent-filter>
@@ -1393,6 +1396,7 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/header_add_an_account"
+            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings$ManageAccountsSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1449,6 +1453,7 @@
         <activity android:name="Settings$DataUsageSummaryActivity"
                 android:label="@string/data_usage_summary_title"
                 android:uiOptions="none"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1463,7 +1468,7 @@
 
         <receiver android:name=".widget.SettingsAppWidgetProvider"
                 android:label="@string/gadget_title"
-                android:exported="false"
+                android:exported="true"
                 android:enabled="@bool/has_powercontrol_widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -1478,5 +1483,11 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
         </receiver>
 
+        <receiver android:name=".bluetooth.BluetoothDiscoverableTimeoutReceiver">
+            <intent-filter>
+                <action android:name="android.bluetooth.intent.DISCOVERABLE_TIMEOUT" />
+            </intent-filter>
+        </receiver>
+
     </application>
 </manifest>
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index ade6f25..08dcf64 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -33,11 +33,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceMedium"
         />
@@ -79,7 +79,7 @@
         <LinearLayout
             style="@style/SecurityPreferenceButtonContainer"
             android:orientation="horizontal"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true">
 
             <!-- left : cancel -->
diff --git a/res/layout-land/choose_lock_pattern_tutorial.xml b/res/layout-land/choose_lock_pattern_tutorial.xml
index ac693cc..362853b 100644
--- a/res/layout-land/choose_lock_pattern_tutorial.xml
+++ b/res/layout-land/choose_lock_pattern_tutorial.xml
@@ -40,7 +40,7 @@
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_marginLeft="25dip">
+            android:layout_marginStart="25dip">
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index a9b5640..4130a48 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -34,11 +34,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceMedium"
         />
@@ -89,7 +89,7 @@
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:text="@string/lockpassword_cancel_label"
         />
 
@@ -97,8 +97,8 @@
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
+            android:layout_alignParentEnd="true"
+            android:drawableEnd="@drawable/ic_btn_next"
             android:drawablePadding="10dip"
             android:text="@string/lockpassword_continue_label"
         />
diff --git a/res/layout-land/crypt_keeper_password_entry.xml b/res/layout-land/crypt_keeper_password_entry.xml
index 094434e..57cfbed 100644
--- a/res/layout-land/crypt_keeper_password_entry.xml
+++ b/res/layout-land/crypt_keeper_password_entry.xml
@@ -50,8 +50,8 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:layout_marginLeft="8dip"
-            android:layout_marginRight="8dip"
+            android:layout_marginStart="8dip"
+            android:layout_marginEnd="8dip"
             android:orientation="horizontal"
         >
             <include layout="@layout/crypt_keeper_password_field" />
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
index f8a939f..c2fe2f7 100644
--- a/res/layout-land/crypt_keeper_progress.xml
+++ b/res/layout-land/crypt_keeper_progress.xml
@@ -27,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:textSize="30dip"
         android:textColor="@color/title_color"
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml
index 3895529..05d4a24 100644
--- a/res/layout-sw600dp-land/choose_lock_password.xml
+++ b/res/layout-sw600dp-land/choose_lock_password.xml
@@ -34,11 +34,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceLarge"
         />
@@ -66,7 +66,7 @@
     <!-- confirm / restart buttons -->
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
diff --git a/res/layout-sw600dp-land/choose_lock_pattern.xml b/res/layout-sw600dp-land/choose_lock_pattern.xml
index a32a5fb..506570d 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern.xml
@@ -49,15 +49,15 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/headerText"
             android:layout_marginTop="16dip"
-            android:layout_toRightOf="@id/lockPattern"
-            android:layout_marginLeft="100dip"
+            android:layout_toEndOf="@id/lockPattern"
+            android:layout_marginStart="100dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:visibility="gone"/>
 
         <!-- confirm / restart buttons -->
         <LinearLayout android:id="@+id/buttonContainer"
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:orientation="horizontal">
 
@@ -79,7 +79,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
+            android:layout_marginStart="20dip"
             android:layout_above="@id/buttonContainer"
             android:gravity="center_vertical|center_horizontal">
 
diff --git a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
index 1320ba0..00ef039 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
@@ -46,7 +46,7 @@
         <!-- navigation buttons -->
         <LinearLayout android:id="@+id/buttonContainer"
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:orientation="horizontal">
 
@@ -68,7 +68,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
+            android:layout_marginStart="20dip"
             android:gravity="center_vertical|center_horizontal"
             android:layout_above="@id/buttonContainer">
 
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml
index c4472db..5844a60 100644
--- a/res/layout-sw600dp-land/confirm_lock_password.xml
+++ b/res/layout-sw600dp-land/confirm_lock_password.xml
@@ -35,11 +35,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceLarge"
         />
@@ -67,7 +67,7 @@
     <!-- confirm / restart buttons -->
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
index 3e642d5..627ff02 100644
--- a/res/layout-sw600dp-land/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp-land/confirm_lock_pattern.xml
@@ -45,7 +45,7 @@
         <!-- confirm / restart buttons -->
         <LinearLayout android:id="@+id/buttonContainer"
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:orientation="horizontal"
             android:visibility="invisible">
@@ -76,7 +76,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
+            android:layout_marginStart="20dip"
             android:layout_above="@id/footerText"
             android:gravity="center_vertical|center_horizontal">
 
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
index a8f5651..81222cc 100644
--- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
@@ -43,9 +43,9 @@
         <TextView android:id="@+id/passwordLabel"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:layout_toRightOf="@+id/encroid"
+            android:layout_toEndOf="@+id/encroid"
             android:layout_centerVertical="true"
-            android:paddingRight="17dip"
+            android:paddingEnd="17dip"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/crypt_keeper_enter_password"
@@ -55,7 +55,7 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="320dip"
-            android:layout_toRightOf="@+id/passwordLabel"
+            android:layout_toEndOf="@+id/passwordLabel"
             android:layout_centerVertical="true"
             android:orientation="horizontal"
         >
diff --git a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
index 8094b74..70d868a 100644
--- a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
@@ -21,8 +21,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:paddingTop="60dip"
-    android:paddingLeft="@dimen/screen_margin_sides"
-    android:paddingRight="@dimen/screen_margin_sides"
+    android:paddingStart="@dimen/screen_margin_sides"
+    android:paddingEnd="@dimen/screen_margin_sides"
     android:paddingBottom="0dip" >
 
     <FrameLayout
@@ -42,9 +42,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="16dip"
+        android:layout_marginStart="16dip"
         android:layout_below="@id/top_padding_layout"
         android:textSize="32dip"
         android:textColor="@color/title_color"
@@ -88,7 +88,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/top_divider"
-        android:layout_alignLeft="@id/dummy_for_left_edge"
+        android:layout_alignStart="@id/dummy_for_left_edge"
         android:layout_centerHorizontal="true">
 
         <!-- Padding for @id/content shown when keyboard isn't available -->
@@ -115,7 +115,7 @@
             android:layout_height="wrap_content"
             android:minHeight="160dip"
             android:layout_marginTop="10dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:visibility="gone" />
         <LinearLayout
             android:id="@+id/connecting_status_layout"
@@ -174,7 +174,7 @@
         android:layout_height="3dip"
         android:layout_marginBottom="16dip"
         android:layout_below="@id/bottom_padding_layout"
-        android:layout_alignLeft="@id/content"
+        android:layout_alignStart="@id/content"
         android:background="@color/divider_color" />  <!-- TODO: fix this -->
 
     <RelativeLayout
@@ -182,21 +182,21 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/bottom_divider"
-        android:layout_alignLeft="@id/bottom_divider"
-        android:layout_alignParentRight="true"
+        android:layout_alignStart="@id/bottom_divider"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true">
 
         <Button
             android:id="@+id/wifi_setup_add_network"
             style="@style/setup_wizard_button"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:text="@string/wifi_setup_add_network"
             android:enabled="false" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:orientation="horizontal">
 
             <!-- This misleading name is for keeping consistency between non-XL
@@ -208,20 +208,20 @@
 
             <Button android:id="@+id/wifi_setup_connect"
                     style="@style/setup_wizard_button"
-                    android:layout_marginLeft="16dip"
+                    android:layout_marginStart="16dip"
                     android:text="@string/wifi_setup_connect"
                     android:enabled="false"
                     android:visibility="gone" />
 
             <Button android:id="@+id/wifi_setup_refresh_list"
                     style="@style/setup_wizard_button"
-                    android:layout_marginLeft="16dip"
+                    android:layout_marginStart="16dip"
                     android:text="@string/wifi_setup_refresh_list"
                     android:enabled="false" />
 
             <Button android:id="@+id/wifi_setup_skip_or_next"
                     style="@style/setup_wizard_button"
-                    android:layout_marginLeft="16dip"
+                    android:layout_marginStart="16dip"
                     android:text="@string/wifi_setup_skip" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
index 4d52deb..1777eda 100644
--- a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <LinearLayout android:id="@+android:id/widget_frame"
         android:layout_width="wrap_content"
diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml
index df53f68..43be032 100644
--- a/res/layout-sw600dp/choose_lock_password.xml
+++ b/res/layout-sw600dp/choose_lock_password.xml
@@ -51,8 +51,8 @@
         android:layout_gravity="center"
         android:textSize="32sp"
         android:layout_marginTop="15dip"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
@@ -86,7 +86,7 @@
 
         <LinearLayout
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:orientation="horizontal">
 
             <Button android:id="@+id/cancel_button"
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml
index d8f85cc..b0efa8c 100644
--- a/res/layout-sw600dp/choose_lock_pattern.xml
+++ b/res/layout-sw600dp/choose_lock_pattern.xml
@@ -62,7 +62,7 @@
 
         <LinearLayout
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:orientation="horizontal">
 
             <!-- left / top button: skip, or re-try -->
diff --git a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
index 2a61666..e0221bf 100644
--- a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
+++ b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
@@ -54,7 +54,7 @@
 
         <LinearLayout
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:orientation="horizontal">
 
             <!-- left / top button: skip, or re-try -->
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index 722153d..cb6fafd 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -54,8 +54,8 @@
         android:layout_gravity="center"
         android:textSize="32sp"
         android:layout_marginTop="15dip"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
@@ -89,7 +89,7 @@
 
         <LinearLayout
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:orientation="horizontal">
 
             <Button android:id="@+id/cancel_button"
diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index 1e33230c..731fb22 100644
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -40,10 +40,10 @@
         <TextView android:id="@+id/passwordLabel"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:layout_toRightOf="@+id/encroid"
+            android:layout_toEndOf="@+id/encroid"
             android:layout_marginTop="37dip"
-            android:paddingLeft="17dip"
-            android:paddingRight="17dip"
+            android:paddingStart="17dip"
+            android:paddingEnd="17dip"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/crypt_keeper_enter_password"
@@ -53,7 +53,7 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="320dip"
-            android:layout_toRightOf="@+id/passwordLabel"
+            android:layout_toEndOf="@+id/passwordLabel"
             android:layout_marginTop="26dip"
             android:layout_centerVertical="true"
             android:orientation="horizontal"
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
index 176c9fb..a2e32d7 100644
--- a/res/layout-sw600dp/crypt_keeper_progress.xml
+++ b/res/layout-sw600dp/crypt_keeper_progress.xml
@@ -29,9 +29,9 @@
             android:id="@+id/encroid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
-            android:paddingRight="65dip"
+            android:paddingEnd="65dip"
             android:src="@drawable/encroid_waiting"
             android:contentDescription="@null"
         />
@@ -42,9 +42,9 @@
             android:layout_height="wrap_content"
             android:minHeight="48dip"
             android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="16dip"
-            android:layout_marginRight="16dip"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="16dip"
+            android:layout_marginEnd="16dip"
             android:textSize="30dip"
             android:textColor="@color/title_color"
             android:text="@string/crypt_keeper_setup_title"
@@ -72,8 +72,8 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/top_divider"
             android:paddingTop="21dip"
-            android:layout_marginLeft="16dip"
-            android:layout_marginRight="16dip"
+            android:layout_marginStart="16dip"
+            android:layout_marginEnd="16dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
         />
 
@@ -96,10 +96,10 @@
             android:id="@+id/factory_reset"
             android:layout_width="208dip"
             android:layout_height="48dip"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="80dip"
-            android:layout_marginRight="16dip"
+            android:layout_marginEnd="16dip"
             android:text="@string/master_clear_button_text"
             android:visibility="gone"
         />
diff --git a/res/layout-sw600dp/date_time_settings_setupwizard.xml b/res/layout-sw600dp/date_time_settings_setupwizard.xml
index e37a4a6..41e3021 100644
--- a/res/layout-sw600dp/date_time_settings_setupwizard.xml
+++ b/res/layout-sw600dp/date_time_settings_setupwizard.xml
@@ -19,16 +19,16 @@
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:paddingTop="96dip"
-        android:paddingLeft="40dip"
-        android:paddingRight="40dip"
+        android:paddingStart="40dip"
+        android:paddingEnd="40dip"
         android:paddingBottom="96dip"
         android:orientation="vertical">
 
     <FrameLayout android:id="@+id/timezone_dropdown_anchor"
             android:layout_height="0px"
             android:layout_width="match_parent"
-            android:layout_marginLeft="40dip"
-            android:layout_marginRight="40dip"/>
+            android:layout_marginStart="40dip"
+            android:layout_marginEnd="40dip"/>
 
     <LinearLayout android:layout_height="0px"
                   android:layout_weight="1"
@@ -60,7 +60,7 @@
             android:minWidth="208dip"
             android:layout_height="48dip"
             android:layout_marginTop="10dip"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:text="@string/next_label"/>
 
     </RelativeLayout>
diff --git a/res/layout-sw600dp/preference_inputmethod.xml b/res/layout-sw600dp/preference_inputmethod.xml
index 326e2af..c10d718 100644
--- a/res/layout-sw600dp/preference_inputmethod.xml
+++ b/res/layout-sw600dp/preference_inputmethod.xml
@@ -33,14 +33,14 @@
             android:id="@android:id/widget_frame"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dip"
+            android:layout_marginStart="10dip"
             android:gravity="center_vertical"
             android:orientation="vertical" />
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="15dip"
-            android:layout_marginRight="6dip"
+            android:layout_marginStart="15dip"
+            android:layout_marginEnd="6dip"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@android:id/title"
-                android:layout_alignLeft="@android:id/title"
+                android:layout_alignStart="@android:id/title"
                 android:paddingBottom="3dip"
                 android:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
@@ -77,8 +77,8 @@
         android:id="@+id/inputmethod_settings"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:paddingLeft="15dip"
-        android:paddingRight="?android:attr/scrollbarSize"
+        android:paddingStart="15dip"
+        android:paddingEnd="?android:attr/scrollbarSize"
         android:src="@drawable/ic_sysbar_quicksettings"
         android:contentDescription="@string/input_method_settings_button"
         android:layout_gravity="center"
diff --git a/res/layout-sw600dp/settings_top_level.xml b/res/layout-sw600dp/settings_top_level.xml
index 09590b1..ff53c1b 100644
--- a/res/layout-sw600dp/settings_top_level.xml
+++ b/res/layout-sw600dp/settings_top_level.xml
@@ -25,7 +25,7 @@
             android:layout_width="0px"
             android:layout_height="match_parent"
             android:layout_weight=".4" 
-            android:layout_marginRight="10dp"/>
+            android:layout_marginEnd="10dp"/>
     <FrameLayout android:id="@+id/prefs"
             android:layout_width="0px"
             android:layout_height="match_parent"
diff --git a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
index 20f5784..94833e8 100644
--- a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
@@ -21,8 +21,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:paddingTop="60dip"
-    android:paddingLeft="@dimen/screen_margin_sides"
-    android:paddingRight="@dimen/screen_margin_sides"
+    android:paddingStart="@dimen/screen_margin_sides"
+    android:paddingEnd="@dimen/screen_margin_sides"
     android:paddingBottom="0dip" >
 
     <FrameLayout
@@ -42,9 +42,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="16dip"
+        android:layout_marginStart="16dip"
         android:layout_below="@id/top_padding_layout"
         android:textSize="32dip"
         android:textColor="@color/title_color"
@@ -88,7 +88,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/top_divider"
-        android:layout_alignLeft="@id/dummy_for_left_edge"
+        android:layout_alignStart="@id/dummy_for_left_edge"
         android:layout_centerHorizontal="true">
 
         <!-- Padding for @id/content shown when keyboard isn't available -->
@@ -115,7 +115,7 @@
             android:layout_height="wrap_content"
             android:minHeight="160dip"
             android:layout_marginTop="10dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:visibility="gone" />
         <LinearLayout
             android:id="@+id/connecting_status_layout"
@@ -174,7 +174,7 @@
         android:layout_height="3dip"
         android:layout_marginBottom="16dip"
         android:layout_below="@id/bottom_padding_layout"
-        android:layout_alignLeft="@id/content"
+        android:layout_alignStart="@id/content"
         android:background="@color/divider_color" />  <!-- TODO: fix this -->
 
     <LinearLayout
@@ -183,27 +183,27 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/bottom_divider"
-        android:layout_alignLeft="@id/bottom_divider">
+        android:layout_alignStart="@id/bottom_divider">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/bottom_divider"
-            android:layout_alignLeft="@id/bottom_divider"
-            android:layout_alignParentRight="true"
+            android:layout_alignStart="@id/bottom_divider"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true">
 
             <Button
                 android:id="@+id/wifi_setup_add_network"
                 style="@style/setup_wizard_button"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:text="@string/wifi_setup_add_network"
                 android:enabled="false" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:orientation="horizontal">
 
                 <!-- This misleading name is for keeping consistency between non-XL
@@ -215,14 +215,14 @@
 
                 <Button android:id="@+id/wifi_setup_connect"
                         style="@style/setup_wizard_button"
-                        android:layout_marginLeft="16dip"
+                        android:layout_marginStart="16dip"
                         android:text="@string/wifi_setup_connect"
                         android:enabled="false"
                         android:visibility="gone" />
 
                 <Button android:id="@+id/wifi_setup_skip_or_next"
                         style="@style/setup_wizard_button"
-                        android:layout_marginLeft="16dip"
+                        android:layout_marginStart="16dip"
                         android:text="@string/wifi_setup_skip" />
             </LinearLayout>
 
@@ -230,7 +230,7 @@
 
         <Button android:id="@+id/wifi_setup_refresh_list"
                 style="@style/setup_wizard_button"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:text="@string/wifi_setup_refresh_list"
                 android:enabled="false" />
 
diff --git a/res/layout-sw720dp/date_time_settings_setupwizard.xml b/res/layout-sw720dp/date_time_settings_setupwizard.xml
index b484472..32c4d93 100644
--- a/res/layout-sw720dp/date_time_settings_setupwizard.xml
+++ b/res/layout-sw720dp/date_time_settings_setupwizard.xml
@@ -20,8 +20,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="@dimen/datetime_margin_top"
-    android:paddingLeft="@dimen/screen_margin_sides"
-    android:paddingRight="@dimen/screen_margin_sides"
+    android:paddingStart="@dimen/screen_margin_sides"
+    android:paddingEnd="@dimen/screen_margin_sides"
     android:paddingBottom="@dimen/datetime_margin_bottom">
 
     <!-- Title: Set date & time-->
@@ -30,8 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="16dip"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="16dip"
         android:layout_alignParentTop="true"
         android:textSize="32dip"
         android:textColor="@color/title_color"
@@ -60,9 +60,9 @@
             style="?android:attr/dropDownSpinnerStyle"
             android:layout_width="304dip"
             android:layout_height="48dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignBottom="@+id/date_time_auto"
-            android:gravity="left|center_vertical"
+            android:gravity="start|center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textSize="20dip" />
 
@@ -71,16 +71,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_toRightOf="@id/time_zone_button"
-            android:layout_marginLeft="32dip"
-            android:layout_alignParentRight="true">
+            android:layout_toEndOf="@id/time_zone_button"
+            android:layout_marginStart="32dip"
+            android:layout_alignParentEnd="true">
 
             <Switch
                 android:id="@+id/date_time_auto_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:layout_marginLeft="16dip"
+                android:layout_marginStart="16dip"
                 android:text="@string/date_time_auto"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textSize="20dip" />
@@ -154,7 +154,7 @@
         android:id="@+id/bottom_divider"
         android:layout_width="match_parent"
         android:layout_height="3dip"
-        android:layout_alignLeft="@id/timezone_auto_time"
+        android:layout_alignStart="@id/timezone_auto_time"
         android:layout_above="@+id/next_button"
         android:layout_marginBottom="16dip"
         android:background="@color/divider_color" />
@@ -163,6 +163,6 @@
         android:id="@+id/next_button"
         style="@style/setup_wizard_button"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:text="@string/next_label" />
 </RelativeLayout>
diff --git a/res/layout-sw720dp/tab_widget.xml b/res/layout-sw720dp/tab_widget.xml
index 4cd4547..f591f38 100644
--- a/res/layout-sw720dp/tab_widget.xml
+++ b/res/layout-sw720dp/tab_widget.xml
@@ -25,8 +25,8 @@
         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"
+        android:paddingStart="@*android:dimen/preference_fragment_padding_side"
+        android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
         style="?android:attr/tabWidgetStyle" />
 
 </HorizontalScrollView>
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 117b58a..aa080cf 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -84,8 +84,8 @@
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
+            android:layout_alignParentEnd="true"
+            android:drawableEnd="@drawable/ic_btn_next"
             android:drawablePadding="3dip"
             android:text="@string/finish_button_label"
         />
diff --git a/res/layout/add_account_screen.xml b/res/layout/add_account_screen.xml
index b6305a0..7e1564c 100644
--- a/res/layout/add_account_screen.xml
+++ b/res/layout/add_account_screen.xml
@@ -21,8 +21,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="16dip">
+    android:paddingStart="16dip"
+    android:paddingEnd="16dip">
 
     <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"
         android:layout_width="match_parent"
diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml
index 8ce90d7..4c9acc2 100644
--- a/res/layout/android_beam.xml
+++ b/res/layout/android_beam.xml
@@ -15,8 +15,8 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
+    android:paddingStart="6dip"
+    android:paddingEnd="6dip"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:scrollbars="vertical" >
 
diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml
index 1694a93..76c9c3d 100644
--- a/res/layout/apn_preference_layout.xml
+++ b/res/layout/apn_preference_layout.xml
@@ -25,8 +25,8 @@
         android:id="@+android:id/text_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16sp"
-        android:layout_marginRight="6sp"
+        android:layout_marginStart="16sp"
+        android:layout_marginEnd="6sp"
         android:layout_marginTop="6sp"
         android:layout_marginBottom="6sp"
         android:layout_weight="1"
@@ -46,7 +46,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:maxLines="2" />
 
@@ -57,8 +57,8 @@
         android:id="@+android:id/apn_radiobutton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="4dip"
-        android:layout_marginRight="4dip"
+        android:layout_marginStart="4dip"
+        android:layout_marginEnd="4dip"
         android:layout_gravity="center_vertical"
         android:clickable="true" />
 
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index eee6165..41c4060 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:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="8dip"
     android:paddingBottom="8dip"
     android:columnCount="3">
@@ -29,7 +29,7 @@
         android:layout_width="48dip"
         android:layout_height="48dip"
         android:layout_rowSpan="3"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:scaleType="centerInside"
         android:contentDescription="@null" />
 
@@ -43,7 +43,7 @@
 
     <TextView
         android:id="@android:id/text1"
-        android:layout_marginLeft="8dip"
+        android:layout_marginStart="8dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <ProgressBar
diff --git a/res/layout/bluetooth_connection_access.xml b/res/layout/bluetooth_connection_access.xml
index 1e74162..7f42177 100644
--- a/res/layout/bluetooth_connection_access.xml
+++ b/res/layout/bluetooth_connection_access.xml
@@ -31,8 +31,8 @@
             android:id="@+id/message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_horizontal"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
diff --git a/res/layout/bluetooth_discoverable.xml b/res/layout/bluetooth_discoverable.xml
index fb65453..b3ddbb9 100644
--- a/res/layout/bluetooth_discoverable.xml
+++ b/res/layout/bluetooth_discoverable.xml
@@ -26,8 +26,8 @@
         android:id="@+id/message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="20dip"
-        android:paddingRight="20dip"
+        android:paddingStart="20dip"
+        android:paddingEnd="20dip"
         android:gravity="center_horizontal"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 </ScrollView>
diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_pb_access.xml
index 24f0df2..01218d6 100644
--- a/res/layout/bluetooth_pb_access.xml
+++ b/res/layout/bluetooth_pb_access.xml
@@ -31,8 +31,8 @@
             android:id="@+id/message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_horizontal"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index 5a1b41b..a768908 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -32,8 +32,8 @@
             android:id="@+id/message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:layout_marginTop="20dip"
             android:layout_marginBottom="20dip"
             android:gravity="center_vertical"
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index ef73a79..44d9dde 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -32,8 +32,8 @@
             android:id="@+id/message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:layout_marginTop="20dip"
             android:layout_marginBottom="20dip"
             android:gravity="center_vertical"
@@ -43,8 +43,8 @@
             android:id="@+id/text"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:inputType="textPassword"
             android:singleLine="true" />
 
@@ -53,8 +53,8 @@
             android:text="@string/bluetooth_pin_values_hint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -63,8 +63,8 @@
             android:text="@string/bluetooth_enable_alphanumeric_pin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -72,8 +72,8 @@
             android:id="@+id/message_below_pin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/res/layout/bookmark_picker_item.xml b/res/layout/bookmark_picker_item.xml
index b4ffe73..113e83a 100644
--- a/res/layout/bookmark_picker_item.xml
+++ b/res/layout/bookmark_picker_item.xml
@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="2dip"
+    android:paddingStart="2dip"
     android:gravity="center_vertical">
 
     <ImageView android:id="@+id/icon"
@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:paddingLeft="6dip" />
+        android:paddingStart="6dip" />
         
 </LinearLayout>
 
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index e979413..0c7c11b 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -49,8 +49,8 @@
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="24sp"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml
index 742cef8..8514550 100644
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ b/res/layout/choose_lock_pattern_tutorial.xml
@@ -56,7 +56,7 @@
                  android:layout_width="200dip"
                  android:layout_height="200dip"
                  android:layout_marginTop="10dip"
-                 android:layout_gravity="left"/>
+                 android:layout_gravity="start"/>
 
         </LinearLayout>
 
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
index c952139..b6c60c3 100644
--- a/res/layout/confirm_lock_password.xml
+++ b/res/layout/confirm_lock_password.xml
@@ -53,8 +53,8 @@
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="24sp"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
@@ -83,7 +83,7 @@
 
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
diff --git a/res/layout/crypt_keeper_confirm.xml b/res/layout/crypt_keeper_confirm.xml
index b197aa6..1b64909 100644
--- a/res/layout/crypt_keeper_confirm.xml
+++ b/res/layout/crypt_keeper_confirm.xml
@@ -22,8 +22,8 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginTop="16dp"
         android:layout_weight="1"
     >
diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml
index 1278327..b26f542 100644
--- a/res/layout/crypt_keeper_password_entry.xml
+++ b/res/layout/crypt_keeper_password_entry.xml
@@ -27,8 +27,8 @@
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_marginLeft="8dip"
-        android:layout_marginRight="8dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginEnd="8dip"
         android:orientation="horizontal"
     >
         <include layout="@layout/crypt_keeper_password_field" />
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
index 0d408c2..6b8e65f 100644
--- a/res/layout/crypt_keeper_progress.xml
+++ b/res/layout/crypt_keeper_progress.xml
@@ -27,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:textSize="30dip"
         android:textColor="@color/title_color"
@@ -62,7 +62,7 @@
         android:layout_width="wrap_content"
         android:layout_height="0dip"
         android:layout_weight="1"
-        android:layout_gravity="bottom|right"
+        android:layout_gravity="bottom|end"
         android:src="@drawable/encroid_waiting"
         android:contentDescription="@null"
     />
diff --git a/res/layout/crypt_keeper_settings.xml b/res/layout/crypt_keeper_settings.xml
index 3239aa9..b54e0a5 100644
--- a/res/layout/crypt_keeper_settings.xml
+++ b/res/layout/crypt_keeper_settings.xml
@@ -23,8 +23,8 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginTop="16dp"
         android:layout_weight="1"
     >
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index 80da437..df80fe3 100644
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -56,7 +56,7 @@
             android:textSize="@dimen/crypt_clock_size"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/crypt_keeper_clock_foreground"
-            android:layout_alignLeft="@*android:id/timeDisplayBackground"
+            android:layout_alignStart="@*android:id/timeDisplayBackground"
             android:layout_alignTop="@*android:id/timeDisplayBackground"
             android:layout_marginBottom="6dip"
             />
@@ -68,8 +68,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
-        android:layout_marginLeft="8dip"
-        android:layout_marginRight="8dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginEnd="8dip"
         android:textSize="18sp"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/enter_password"
diff --git a/res/layout/custom_preference.xml b/res/layout/custom_preference.xml
index fcdc9f5..087a37c 100644
--- a/res/layout/custom_preference.xml
+++ b/res/layout/custom_preference.xml
@@ -22,7 +22,7 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <!-- <View
         android:layout_width="@dimen/preference_widget_width"
@@ -31,8 +31,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -49,7 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
             android:maxLines="4" />
diff --git a/res/layout/data_usage_bytes_editor.xml b/res/layout/data_usage_bytes_editor.xml
index ec6e64f..8de7450 100644
--- a/res/layout/data_usage_bytes_editor.xml
+++ b/res/layout/data_usage_bytes_editor.xml
@@ -26,8 +26,8 @@
         android:minWidth="48dip"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="16dip"
         android:focusable="true"
         android:focusableInTouchMode="true" />
 
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index 2501e9d..cec2af2 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -20,11 +20,11 @@
     android:id="@+id/chart"
     android:layout_width="match_parent"
     android:layout_height="@dimen/data_usage_chart_height"
-    android:layout_marginLeft="-16dip"
-    android:layout_marginRight="-16dip"
+    android:layout_marginStart="-16dip"
+    android:layout_marginEnd="-16dip"
     android:layout_marginBottom="-32dip"
-    android:paddingLeft="24dip"
-    android:paddingRight="24dip"
+    android:paddingStart="24dip"
+    android:paddingEnd="24dip"
     android:paddingTop="16dip"
     android:paddingBottom="48dip"
     settings:optimalWidth="@dimen/data_usage_chart_optimalWidth"
@@ -34,7 +34,7 @@
         android:id="@+id/grid"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
         settings:primaryDrawable="@drawable/data_grid_primary"
         settings:secondaryDrawable="@drawable/data_grid_secondary"
         settings:borderDrawable="@drawable/data_grid_border"
@@ -44,7 +44,7 @@
         android:id="@+id/series"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
         settings:strokeColor="@android:color/holo_blue_light"
         settings:fillColor="#c033b5e5"
         settings:fillColorSecondary="#6633b5e5" />
@@ -53,7 +53,7 @@
         android:id="@+id/detail_series"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
         settings:strokeColor="#d88d3a"
         settings:fillColor="#c0ba7f3e"
         settings:fillColorSecondary="#60ba7f3e" />
diff --git a/res/layout/data_usage_cycle_editor.xml b/res/layout/data_usage_cycle_editor.xml
index dffbe18..ff5fceb 100644
--- a/res/layout/data_usage_cycle_editor.xml
+++ b/res/layout/data_usage_cycle_editor.xml
@@ -32,8 +32,8 @@
         android:layout_width="48dip"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="16dip"
         android:focusable="true"
         android:focusableInTouchMode="true" />
 
diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml
index c9647c8..2a67d6b 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:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight">
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
index 6c09d09..eaac49c 100644
--- a/res/layout/data_usage_detail.xml
+++ b/res/layout/data_usage_detail.xml
@@ -24,8 +24,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_marginTop="8dip"
-            android:layout_marginRight="8dip"
+            android:layout_marginEnd="8dip"
             android:orientation="vertical">
 
             <ImageView
@@ -85,8 +85,8 @@
         android:id="@+id/app_settings"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
         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 619956d..0a8006b 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -41,8 +41,8 @@
         android:id="@+id/usage_summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:paddingTop="8dip"
         android:paddingBottom="8dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -52,8 +52,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:paddingBottom="8dip"
         android:text="@string/data_usage_empty"
         android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/date_time_settings_setupwizard.xml b/res/layout/date_time_settings_setupwizard.xml
index d05098a..7227f2b 100644
--- a/res/layout/date_time_settings_setupwizard.xml
+++ b/res/layout/date_time_settings_setupwizard.xml
@@ -23,8 +23,8 @@
     <View
         android:id="@+id/timezone_dropdown_anchor"
         android:layout_width="match_parent"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
+        android:layout_marginStart="20dip"
+        android:layout_marginEnd="20dip"
         android:layout_height="0px" />
 
     <LinearLayout android:layout_height="0px"
@@ -45,7 +45,7 @@
         <Button android:id="@+id/next_button"
             android:layout_width="150dip"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:text="@string/next_label"
         />
 
diff --git a/res/layout/date_time_setup_custom_list_item_2.xml b/res/layout/date_time_setup_custom_list_item_2.xml
index 623ac32..ed32fb7 100644
--- a/res/layout/date_time_setup_custom_list_item_2.xml
+++ b/res/layout/date_time_setup_custom_list_item_2.xml
@@ -27,7 +27,7 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:minHeight="16dip"
-              android:layout_marginLeft="10dip"
+              android:layout_marginStart="10dip"
               android:textAppearance="?android:attr/textAppearanceMedium"
               />
 
@@ -36,7 +36,7 @@
               android:layout_height="wrap_content"
               android:minHeight="10dip"
               android:layout_below="@android:id/text1"
-              android:layout_alignLeft="@android:id/text1"
+              android:layout_alignStart="@android:id/text1"
               android:textAppearance="?android:attr/textAppearanceSmall"
               />
 
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index 3b4824f..c54ecce 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -25,8 +25,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
         android:scrollbarStyle="outsideOverlay"
         android:gravity="top">
         <LinearLayout
@@ -42,7 +42,7 @@
                 <ImageView android:id="@+id/admin_icon"
                     android:layout_width="@android:dimen/app_icon_size"
                     android:layout_height="@android:dimen/app_icon_size"
-                    android:layout_marginRight="16dip"
+                    android:layout_marginEnd="16dip"
                     android:layout_gravity="center_vertical"
                     android:scaleType="fitCenter"
                     android:contentDescription="@null" />
@@ -94,8 +94,8 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:paddingLeft="16dip"
-                    android:paddingRight="12dip" />
+                    android:paddingStart="16dip"
+                    android:paddingEnd="12dip" />
             </LinearLayout>
 
         </LinearLayout>
@@ -121,7 +121,7 @@
                 android:visibility="gone" />
             <Button android:id="@+id/cancel_button"
                 android:layout_width="0dip"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:layout_weight="1"
                 android:maxLines="2"
                 android:text="@string/cancel"
@@ -129,7 +129,7 @@
                 android:layout_height="wrap_content" />
             <Button android:id="@+id/action_button"
                 android:layout_width="0dip"
-                android:layout_gravity="left"
+                android:layout_gravity="start"
                 android:layout_weight="1"
                 android:maxLines="2"
                 style="?android:attr/buttonBarButtonStyle"
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index 24dab5e..56be346 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -22,8 +22,8 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
-    android:paddingRight="6dip"
-    android:paddingLeft="6dip"
+    android:paddingEnd="6dip"
+    android:paddingStart="6dip"
     android:gravity="center_vertical" >
 
     <LinearLayout
@@ -63,7 +63,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dip"
             android:layout_below="@id/name"
-            android:layout_alignLeft="@id/name"
+            android:layout_alignStart="@id/name"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
             android:maxLines="4" />
@@ -75,8 +75,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginRight="16dip"
-        android:layout_marginLeft="16dip"
+        android:layout_marginEnd="16dip"
+        android:layout_marginStart="16dip"
         android:focusable="false"
         android:clickable="false" />
 
diff --git a/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index 80911da..0da47a9 100644
--- a/res/layout/dialog_edittext.xml
+++ b/res/layout/dialog_edittext.xml
@@ -17,8 +17,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingLeft="8dip"
-    android:paddingRight="8dip">
+    android:paddingStart="8dip"
+    android:paddingEnd="8dip">
     
     <EditText 
         android:id="@+id/edittext"
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml
new file mode 100644
index 0000000..356a82a
--- /dev/null
+++ b/res/layout/dream_info_row.xml
@@ -0,0 +1,96 @@
+<!--
+     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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" >
+
+    <!-- Dream selectable row (icon, caption, radio button) -->
+
+    <RelativeLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toLeftOf="@+id/divider"
+        android:background="?android:attr/selectableItemBackground" >
+
+        <!-- Dream icon -->
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@android:dimen/app_icon_size"
+            android:layout_height="@android:dimen/app_icon_size"
+            android:layout_centerVertical="true"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="0dp"
+            android:layout_marginRight="6dp"
+            android:layout_marginTop="10dp"
+            android:contentDescription="@null"
+            android:maxHeight="@android:dimen/app_icon_size"
+            android:maxWidth="@android:dimen/app_icon_size"
+            android:scaleType="fitCenter" />
+
+        <!-- Dream caption -->
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@android:id/button1"
+            android:layout_toRightOf="@android:id/icon"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <!-- Dream radio button -->
+
+        <RadioButton
+            android:id="@android:id/button1"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:duplicateParentState="true" />
+    </RelativeLayout>
+
+    <!-- Divider -->
+
+    <ImageView
+        android:id="@id/divider"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
+        android:layout_toLeftOf="@android:id/button2"
+        android:contentDescription="@null"
+        android:src="@drawable/nav_divider" />
+
+    <!-- Settings icon -->
+
+    <ImageView
+        android:id="@android:id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignBottom="@android:id/widget_frame"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@android:id/widget_frame"
+        android:layout_centerVertical="true"
+        android:layout_margin="0dip"
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@null"
+        android:padding="8dip"
+        android:src="@drawable/ic_bt_config" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml
deleted file mode 100644
index 18fe4f0..0000000
--- a/res/layout/dream_picker_row.xml
+++ /dev/null
@@ -1,39 +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.
-*/
--->
-<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 d69f98a..9e1eeb5 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -24,7 +24,7 @@
         android:id="@+id/all_details"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingRight="6dip"
+        android:paddingEnd="6dip"
         android:paddingBottom="5dip"
         android:orientation="vertical">
 
@@ -34,8 +34,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:orientation="vertical"
-            android:paddingRight="6dip"
-            android:paddingLeft="6dip"
+            android:paddingEnd="6dip"
+            android:paddingStart="6dip"
             android:paddingTop="5dip"
             android:paddingBottom="5dip" >
 
@@ -53,8 +53,8 @@
             <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:layout_marginStart="12dip"
+                android:layout_gravity="start"
                 android:text="@string/app_notifications_switch_label" />
 
         </LinearLayout>
@@ -67,7 +67,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dip"
+            android:paddingStart="6dip"
             android:orientation="vertical">
             <LinearLayout
                 android:layout_width="match_parent"
@@ -83,7 +83,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
 
                 <ImageView
                     android:id="@+id/info_size_dots"
@@ -92,15 +92,15 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/total_size_text"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
@@ -121,7 +121,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -129,8 +129,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -138,7 +138,7 @@
                     android:id="@+id/application_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -159,7 +159,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -167,8 +167,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -176,7 +176,7 @@
                     android:id="@+id/external_code_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -198,7 +198,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -206,8 +206,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -215,7 +215,7 @@
                     android:id="@+id/data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -236,7 +236,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -244,8 +244,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -253,7 +253,7 @@
                     android:id="@+id/external_data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -293,15 +293,15 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
                     android:gravity="center_vertical"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:src="@drawable/dotted_line_480px"
                     android:layout_width="0dip"
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -309,14 +309,14 @@
                     android:id="@+id/cache_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
             </LinearLayout>
 
             <Button android:id="@+id/clear_cache_button"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:layout_below="@id/cache_size"
                 android:layout_centerHorizontal="true"
                 android:layout_width="200dip"
@@ -336,14 +336,14 @@
             android:layout_gravity="center_vertical">
             <TextView android:id="@+id/auto_launch"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="6dip"
-                android:paddingRight="6dip"
-                android:paddingLeft="6dip" />
+                android:paddingEnd="6dip"
+                android:paddingStart="6dip" />
             <Button android:id="@+id/clear_activities_button"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:layout_below="@id/auto_launch"
                 android:layout_centerHorizontal="true"
                 android:layout_width="200dip"
@@ -362,24 +362,24 @@
                 android:text="@string/screen_compatibility_label" />
 
             <TextView android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="6dip"
-                android:paddingRight="6dip"
-                android:paddingLeft="6dip"
+                android:paddingEnd="6dip"
+                android:paddingStart="6dip"
                 android:text="@string/screen_compatibility_text"/>
             <CheckBox android:id="@+id/ask_compatibility_cb"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_gravity="left"
+                android:layout_marginStart="12dip"
+                android:layout_gravity="start"
                 android:text="@string/ask_compatibility" />
             <CheckBox android:id="@+id/enable_compatibility_cb"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_gravity="left"
+                android:layout_marginStart="12dip"
+                android:layout_gravity="start"
                 android:text="@string/enable_compatibility" />
         </LinearLayout>
 
@@ -397,7 +397,7 @@
                 android:text="@string/security_settings_desc"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:paddingTop="6dip"
-                android:paddingLeft="6dip"
+                android:paddingStart="6dip"
                 android:paddingBottom="6dip"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
diff --git a/res/layout/intent_sender.xml b/res/layout/intent_sender.xml
index 8a85bf8..bf8fd64 100644
--- a/res/layout/intent_sender.xml
+++ b/res/layout/intent_sender.xml
@@ -18,8 +18,8 @@
 */
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
+    android:paddingStart="6dip"
+    android:paddingEnd="6dip"
     android:paddingBottom="3dip"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 51ab412..394382e 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -47,11 +47,11 @@
                 android:clipChildren="false"
                 android:clipToPadding="false"
                 android:paddingTop="30dp"
-                android:paddingLeft="4dp"
-                android:paddingRight="4dp"
+                android:paddingStart="4dp"
+                android:paddingEnd="4dp"
                 android:paddingBottom="1dp"
-                android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
-                android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
+                android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+                android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
             <TextView android:id="@+id/usedStorageText"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
@@ -72,11 +72,11 @@
                 android:singleLine="true"
                 android:text="@string/internal_storage" />
             <TextView android:id="@+id/freeStorageText"
-                android:layout_gravity="center_vertical|right"
+                android:layout_gravity="center_vertical|end"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="right"
+                android:gravity="end"
                 android:textAppearance="?android:attr/textAppearanceSmallInverse"
                 android:textColor="#000"
                 android:singleLine="true" />
@@ -87,8 +87,8 @@
             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:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
             android:visibility="gone"
             android:gravity="center">
 
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index 6708647..3c7944e 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -22,8 +22,8 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
-    android:paddingRight="6dip"
-    android:paddingLeft="6dip"
+    android:paddingEnd="6dip"
+    android:paddingStart="6dip"
     android:paddingTop="5dip"
     android:paddingBottom="5dip"
     android:gravity="center_vertical" >
@@ -31,7 +31,7 @@
     <ImageView android:id="@+id/app_icon"
         android:layout_width="@android:dimen/app_icon_size"
         android:layout_height="@android:dimen/app_icon_size"
-        android:layout_marginRight="11dip"
+        android:layout_marginEnd="11dip"
         android:layout_gravity="center_vertical"
         android:scaleType="fitCenter"
         android:contentDescription="@null"/>
@@ -56,14 +56,14 @@
             android:baselineAlignedChildIndex="0" >
             <TextView android:id="@+id/app_size"
                 android:layout_marginTop="-4dip"
-                android:layout_gravity="center_vertical|left"
+                android:layout_gravity="center_vertical|start"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
             <TextView android:id="@+id/app_disabled"
                 android:layout_marginTop="-4dip"
-                android:layout_gravity="center_vertical|right"
+                android:layout_gravity="center_vertical|end"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
@@ -76,7 +76,7 @@
     <CheckBox android:id="@+id/app_on_sdcard"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
+        android:layout_marginStart="5dip"
         android:layout_gravity="center_vertical"
         android:visibility="gone"
         android:clickable="false"
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 634de1c..0bc69fb 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -27,8 +27,8 @@
             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:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
             android:visibility="gone"
             android:gravity="center">
 
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index 268daa0..db62936 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -23,8 +23,8 @@
     <ScrollView
             android:layout_width="match_parent"
             android:layout_height="0dip"
-            android:layout_marginLeft="12dp"
-            android:layout_marginRight="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
             android:layout_marginTop="12dp"
             android:layout_weight="1">
         <LinearLayout android:layout_width="match_parent"
@@ -70,7 +70,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:paddingRight="8dp"
+                        android:paddingEnd="8dp"
                         android:focusable="false"
                         android:clickable="false"
                         android:duplicateParentState="true" />
diff --git a/res/layout/master_clear_confirm.xml b/res/layout/master_clear_confirm.xml
index 0599b10..6e50278 100644
--- a/res/layout/master_clear_confirm.xml
+++ b/res/layout/master_clear_confirm.xml
@@ -22,8 +22,8 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         android:layout_marginTop="12dp"
         android:textSize="20sp"
         android:text="@string/master_clear_final_desc" />
diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
index 1001a21..d33f156 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -15,8 +15,8 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
+    android:paddingStart="6dip"
+    android:paddingEnd="6dip"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:scrollbars="vertical" >
 
@@ -55,7 +55,7 @@
             <EditText android:id="@+id/owner_info_edit_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="62dip"
+                android:layout_marginStart="62dip"
                 android:layout_marginTop="40dip"
                 android:gravity="top"
                 android:hint="@string/owner_info_settings_edit_text_hint"
diff --git a/res/layout/pick_item.xml b/res/layout/pick_item.xml
index 62fc4f4..5c58a79 100755
--- a/res/layout/pick_item.xml
+++ b/res/layout/pick_item.xml
@@ -21,5 +21,5 @@
     android:textAppearance="?android:attr/textAppearanceLargeInverse"
     android:gravity="center_vertical"
     android:drawablePadding="14dip"
-    android:paddingLeft="15dip"
-    android:paddingRight="15dip" />
+    android:paddingStart="15dip"
+    android:paddingEnd="15dip" />
diff --git a/res/layout/power_usage_action_item.xml b/res/layout/power_usage_action_item.xml
index e4d8b5a..9e8551e 100644
--- a/res/layout/power_usage_action_item.xml
+++ b/res/layout/power_usage_action_item.xml
@@ -19,10 +19,10 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingLeft="4dip"
+    android:paddingStart="4dip"
     android:focusable="true"
     android:orientation="vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <TextView android:id="@+id/summary"
             android:layout_width="match_parent"
@@ -47,7 +47,7 @@
         <Button
                 android:id="@+id/action_button"
                 android:layout_width="150dip"
-                android:paddingRight="6dip"
+                android:paddingEnd="6dip"
                 android:layout_weight="0.3"
                 android:layout_height="wrap_content"/>
     </LinearLayout>
diff --git a/res/layout/power_usage_detail_item_text.xml b/res/layout/power_usage_detail_item_text.xml
index 6c21274..fb8c705 100644
--- a/res/layout/power_usage_detail_item_text.xml
+++ b/res/layout/power_usage_detail_item_text.xml
@@ -26,19 +26,19 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="bold"
         android:singleLine="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"
-        android:layout_marginLeft="4dip" />
+        android:layout_marginStart="4dip" />
     <TextView
         android:id="@+id/value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="normal"
         android:singleLine="true"
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"
-        android:layout_marginRight="10dip"/>
+        android:layout_marginEnd="10dip"/>
 </RelativeLayout>
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index 99567a1..001ffec 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -47,7 +47,7 @@
             android:id="@+id/details"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dip"
+            android:paddingStart="6dip"
             android:orientation="vertical">
 
             <!-- Insert detail items here -->
@@ -80,7 +80,7 @@
             android:id="@+id/packages_section"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dip"
+            android:paddingStart="6dip"
             android:orientation="vertical">
 
             <!-- Insert detail items here -->
diff --git a/res/layout/power_usage_package_item.xml b/res/layout/power_usage_package_item.xml
index 750e062..d939229 100644
--- a/res/layout/power_usage_package_item.xml
+++ b/res/layout/power_usage_package_item.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:singleLine="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_marginBottom="2dip"
         android:layout_marginTop="2dip" />
 </RelativeLayout>
diff --git a/res/layout/preference.xml b/res/layout/preference.xml
index aef21a1..ef4444a 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference.xml
@@ -19,8 +19,8 @@
     android:layout_height="wrap_content"
     android:minHeight="48dip"
     android:gravity="center_vertical"
-    android:paddingLeft="@*android:dimen/preference_item_padding_side"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="@*android:dimen/preference_item_padding_side"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground">
 
     <RelativeLayout
@@ -44,7 +44,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
diff --git a/res/layout/preference_batteryhistory.xml b/res/layout/preference_batteryhistory.xml
index 53dce74..2655615 100644
--- a/res/layout/preference_batteryhistory.xml
+++ b/res/layout/preference_batteryhistory.xml
@@ -21,7 +21,7 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:id="@+android:id/battery_history_chart"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:shadowRadius="4"
     android:shadowColor="?android:attr/colorBackground"
diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
index 82c6f28..b3d62cb 100644
--- a/res/layout/preference_dialog_brightness.xml
+++ b/res/layout/preference_dialog_brightness.xml
@@ -40,8 +40,8 @@
                 android:text="@string/automatic_brightness"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:layout_marginTop="6dip"
-                android:layout_marginLeft="20dip"
-                android:layout_marginRight="20dip" />
+                android:layout_marginStart="20dip"
+                android:layout_marginEnd="20dip" />
 
         <SeekBar android:id="@*android:id/seekbar"
                 android:layout_width="match_parent"
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index a92f0ef..1643cab 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -44,8 +44,8 @@
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="16dip"
-                android:layout_gravity="left"
+                android:paddingStart="16dip"
+                android:layout_gravity="start"
                 android:text="@string/volume_media_description"
             />
 
@@ -53,7 +53,7 @@
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8dip"
+                android:paddingStart="8dip"
                 android:orientation="horizontal"
                 android:gravity="center_vertical">
 
@@ -70,7 +70,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:paddingTop="2dip"
-                        android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                        android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
         </LinearLayout>
 
         <!-- Used for the ringer/notification volume -->
@@ -86,15 +86,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dip"
-                    android:paddingLeft="16dip"
-                    android:layout_gravity="left"
+                    android:paddingStart="16dip"
+                    android:layout_gravity="start"
                     android:text="@string/volume_ring_description"
                 />
 
             <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="8dip"
+                    android:paddingStart="8dip"
                     android:orientation="horizontal"
                     android:gravity="center_vertical">
 
@@ -111,7 +111,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:paddingTop="2dip"
-                            android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                            android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
             </LinearLayout>
 
         </LinearLayout>
@@ -129,15 +129,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dip"
-                    android:paddingLeft="16dip"
-                    android:layout_gravity="left"
+                    android:paddingStart="16dip"
+                    android:layout_gravity="start"
                     android:text="@string/volume_notification_description"
                 />
 
             <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="8dip"
+                    android:paddingStart="8dip"
                     android:orientation="horizontal"
                     android:gravity="center_vertical">
 
@@ -154,7 +154,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:paddingTop="2dip"
-                            android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                            android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
             </LinearLayout>
 
         </LinearLayout>
@@ -164,8 +164,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dip"
-                android:paddingLeft="16dip"
-                android:layout_gravity="left"
+                android:paddingStart="16dip"
+                android:layout_gravity="start"
                 android:text="@string/volume_alarm_description"
             />
 
@@ -173,7 +173,7 @@
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8dip"
+                android:paddingStart="8dip"
                 android:orientation="horizontal"
                 android:gravity="center_vertical">
 
@@ -188,7 +188,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:paddingTop="2dip"
-                        android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                        android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/res/layout/preference_header_item.xml b/res/layout/preference_header_item.xml
index 28da8a1..36ed8e4 100644
--- a/res/layout/preference_header_item.xml
+++ b/res/layout/preference_header_item.xml
@@ -21,12 +21,12 @@
     android:minHeight="48dp"
     android:background="?android:attr/activatedBackgroundIndicator"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <LinearLayout
         android:layout_width="@dimen/header_icon_width"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_height="wrap_content">
         <ImageView
             android:id="@+id/icon"
@@ -38,8 +38,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -56,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:ellipsize="end"
             android:maxLines="2" />
diff --git a/res/layout/preference_header_switch_item.xml b/res/layout/preference_header_switch_item.xml
index 9d89c25..4ab09d6 100644
--- a/res/layout/preference_header_switch_item.xml
+++ b/res/layout/preference_header_switch_item.xml
@@ -21,12 +21,12 @@
     android:minHeight="48dp"
     android:background="?android:attr/activatedBackgroundIndicator"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <LinearLayout
         android:layout_width="@dimen/header_icon_width"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_height="wrap_content">
         <ImageView
             android:id="@+id/icon"
@@ -38,8 +38,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -56,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:ellipsize="end"
             android:maxLines="2" />
diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml
index 7660646..8e62508 100644
--- a/res/layout/preference_icon.xml
+++ b/res/layout/preference_icon.xml
@@ -23,22 +23,22 @@
     android:layout_height="wrap_content"
     android:minHeight="56dp"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
     
     <ImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_gravity="center"
         android:contentDescription="@null" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -55,7 +55,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:maxLines="2" />
 
diff --git a/res/layout/preference_inputmethod.xml b/res/layout/preference_inputmethod.xml
index f477a6e..589ddc9 100644
--- a/res/layout/preference_inputmethod.xml
+++ b/res/layout/preference_inputmethod.xml
@@ -38,7 +38,7 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="6dip"
+            android:layout_marginEnd="6dip"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
@@ -55,7 +55,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@android:id/title"
-                android:layout_alignLeft="@android:id/title"
+                android:layout_alignStart="@android:id/title"
                 android:paddingBottom="3dip"
                 android:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
@@ -75,8 +75,8 @@
         android:id="@+id/inputmethod_settings"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:paddingLeft="15dip"
-        android:paddingRight="?android:attr/scrollbarSize"
+        android:paddingStart="15dip"
+        android:paddingEnd="?android:attr/scrollbarSize"
         android:src="@drawable/ic_sysbar_quicksettings"
         android:contentDescription="@string/input_method_settings_button"
         android:layout_gravity="center"
diff --git a/res/layout/preference_memoryusage.xml b/res/layout/preference_memoryusage.xml
index 2882535..ddc619d 100644
--- a/res/layout/preference_memoryusage.xml
+++ b/res/layout/preference_memoryusage.xml
@@ -20,8 +20,8 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingLeft="@*android:dimen/preference_widget_width">
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingStart="@*android:dimen/preference_widget_width">
 
     <com.android.settings.deviceinfo.PercentageBarChart
         android:id="@+id/percentage_bar_chart"
diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
index e6188dc..5efc028 100644
--- a/res/layout/preference_powergauge.xml
+++ b/res/layout/preference_powergauge.xml
@@ -19,21 +19,21 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingStart="16dip"
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <ImageView
         android:id="@+id/appIcon"
         android:layout_width="48dip"
         android:layout_height="wrap_content"
-        android:layout_marginRight="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_gravity="center"
         android:contentDescription="@null" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:layout_marginTop="2dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -43,9 +43,9 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:layout_marginTop="2dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@+id/percent"
+            android:layout_toStartOf="@+id/percent"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceMedium"/>
 
@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignBottom="@android:id/title"
             android:layout_gravity="bottom"
             android:textAppearance="?android:attr/textAppearanceSmall"
@@ -72,7 +72,7 @@
         <TextView android:id="@+android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/appGauge"
+            android:layout_alignStart="@id/appGauge"
             android:layout_below="@id/appGauge"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:maxLines="2" />
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index ad782f2..6e8188c 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -25,12 +25,12 @@
     <TextView
         style="?android:attr/listSeparatorTextViewStyle"
         android:background="@null"
-        android:paddingLeft="16dip"
+        android:paddingStart="16dip"
         android:id="@+android:id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
     />
 
     <ProgressBar
@@ -39,8 +39,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="16dip"
         style="?android:attr/progressBarStyleSmallTitle"
         />
 
diff --git a/res/layout/preference_settings_checkbox_widget.xml b/res/layout/preference_settings_checkbox_widget.xml
index 960661f..41cfaa5 100644
--- a/res/layout/preference_settings_checkbox_widget.xml
+++ b/res/layout/preference_settings_checkbox_widget.xml
@@ -17,7 +17,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <!-- Settings button -->
     <ImageView
diff --git a/res/layout/preference_spellchecker.xml b/res/layout/preference_spellchecker.xml
index f64c26c..3e73fa1 100644
--- a/res/layout/preference_spellchecker.xml
+++ b/res/layout/preference_spellchecker.xml
@@ -38,7 +38,7 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="6dip"
+            android:layout_marginEnd="6dip"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
@@ -55,7 +55,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@android:id/title"
-                android:layout_alignLeft="@android:id/title"
+                android:layout_alignStart="@android:id/title"
                 android:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textSize="13sp"
@@ -81,8 +81,8 @@
         <ImageView
             android:layout_width="40dip"
             android:layout_height="fill_parent"
-            android:paddingLeft="5dip"
-            android:paddingRight="5dip"
+            android:paddingStart="5dip"
+            android:paddingEnd="5dip"
             android:src="@drawable/ic_sysbar_quicksettings"
             android:layout_gravity="center"
             android:contentDescription="@string/spellchecker_quick_settings" />
@@ -98,10 +98,10 @@
         android:id="@+id/pref_right_button2"
         android:layout_width="40dip"
         android:layout_height="fill_parent"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip"
+        android:paddingStart="5dip"
+        android:paddingEnd="5dip"
         android:src="@drawable/ic_menu_3d_globe"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         android:clickable="true"
         android:focusable="true"
         android:background="?android:attr/selectableItemBackground"
diff --git a/res/layout/preference_tts_engine.xml b/res/layout/preference_tts_engine.xml
index 3cbdff4..a9d0043 100644
--- a/res/layout/preference_tts_engine.xml
+++ b/res/layout/preference_tts_engine.xml
@@ -33,8 +33,8 @@
             android:id="@+id/tts_engine_radiobutton"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="4dip"
+            android:layout_marginStart="10dip"
+            android:layout_marginEnd="4dip"
             android:layout_gravity="center_vertical"
             android:orientation="vertical"
             android:clickable="true" />
@@ -42,8 +42,8 @@
             android:id="@+id/tts_engine_pref_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="15dip"
-            android:layout_marginRight="6dip"
+            android:layout_marginStart="15dip"
+            android:layout_marginEnd="6dip"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@android:id/title"
-                android:layout_alignLeft="@android:id/title"
+                android:layout_alignStart="@android:id/title"
                 android:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textSize="13sp"
@@ -78,8 +78,8 @@
         android:id="@+id/tts_engine_settings"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:paddingLeft="15dip"
-        android:paddingRight="?android:attr/scrollbarSize"
+        android:paddingStart="15dip"
+        android:paddingEnd="?android:attr/scrollbarSize"
         android:src="@drawable/ic_sysbar_quicksettings"
         android:contentDescription="@string/tts_engine_settings_button"
         android:layout_gravity="center"
diff --git a/res/layout/preference_widget_shortcut.xml b/res/layout/preference_widget_shortcut.xml
index 4f14667..1a885a2 100644
--- a/res/layout/preference_widget_shortcut.xml
+++ b/res/layout/preference_widget_shortcut.xml
@@ -18,7 +18,7 @@
     android:id="@+id/shortcut" 
     android:layout_width="40dip"
     android:layout_height="40dip"
-    android:layout_marginRight="4sp"
+    android:layout_marginEnd="4sp"
     android:layout_gravity="center_vertical"
     android:background="#555555"
     android:gravity="center"
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 7cb2997..115098b 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -19,14 +19,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical|right"
-    android:gravity="center_vertical|right">
+    android:layout_gravity="center_vertical|end"
+    android:gravity="center_vertical|end">
 
     <ImageView
         android:id="@+id/sync_failed"
         android:src="@drawable/ic_sync_error_holo"
         android:layout_width="wrap_content"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:layout_height="wrap_content"
         android:contentDescription="@string/sync_failed" />
 
@@ -35,7 +35,7 @@
         android:src="@drawable/ic_list_sync_anim"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:contentDescription="@string/sync_active" />
 
     <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout/profile_icon_small.xml b/res/layout/profile_icon_small.xml
index 9967f77..3fd4bfc 100644
--- a/res/layout/profile_icon_small.xml
+++ b/res/layout/profile_icon_small.xml
@@ -18,7 +18,7 @@
         android:id="@+id/icon"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        android:layout_marginRight="4dip"
+        android:layout_marginEnd="4dip"
         android:gravity="center"
         android:layout_gravity="center_vertical"
         android:contentDescription="@null" />
diff --git a/res/layout/proxy.xml b/res/layout/proxy.xml
index 5fc42e7..6409822 100644
--- a/res/layout/proxy.xml
+++ b/res/layout/proxy.xml
@@ -23,8 +23,8 @@
 
     <LinearLayout
         android:orientation="vertical"
-        android:paddingLeft="6dip"
-        android:paddingRight="6dip"
+        android:paddingStart="6dip"
+        android:paddingEnd="6dip"
         android:paddingBottom="3dip"
         android:layout_width="match_parent" android:layout_height="wrap_content"
         android:scrollbars="vertical" >
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index d9e5f4d..8888a98 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -84,6 +84,13 @@
             <TextView android:id="@+id/neighboring" style="@style/info_value" />
         </LinearLayout>
 
+        <!-- CellInfo -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_cellinfo_label"
+                      style="@style/info_label" />
+            <TextView android:id="@+id/cellinfo" style="@style/info_value" />
+        </LinearLayout>
+
         <!-- Roaming -->
         <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_roaming_label" style="@style/info_label" />
@@ -233,7 +240,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/radio_info_smsc_refresh_label"
-                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
                     />
             <Button android:id="@+id/update_smsc"
                     android:textSize="14sp"
@@ -241,14 +248,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/radio_info_smsc_update_label"
-                    android:layout_toLeftOf="@+id/refresh_smsc"
+                    android:layout_toStartOf="@+id/refresh_smsc"
                     android:layout_alignBaseline="@+id/refresh_smsc"
                     />
             <EditText android:id="@+id/smsc"
                       style="@style/form_value"
                       android:layout_alignBaseline="@+id/refresh_smsc"
-                      android:layout_toLeftOf="@id/update_smsc"
-                      android:layout_toRightOf="@id/smsc_label" />
+                      android:layout_toStartOf="@id/update_smsc"
+                      android:layout_toEndOf="@id/smsc_label" />
         </RelativeLayout>
 
         <!-- Test setting to ignore bad DNS, useful in lab environments -->
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index f46527a..7cc2d8d 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -29,14 +29,14 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:orientation="horizontal"
-        android:paddingRight="6dip"
-        android:paddingLeft="6dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="6dip"
         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:layout_marginRight="11dip"
+            android:layout_marginEnd="11dip"
             android:layout_gravity="center_vertical"
             android:scaleType="fitCenter"
             android:contentDescription="@null" />
@@ -54,14 +54,14 @@
                     android:layout_width="0px"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingRight="4dip"
+                    android:paddingEnd="4dip"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textStyle="bold"
                     android:singleLine="true"
                     android:ellipsize="marquee"
                     android:layout_marginBottom="2dip" />
                 <TextView android:id="@+id/size"
-                    android:layout_gravity="center_vertical|right"
+                    android:layout_gravity="center_vertical|end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
@@ -74,16 +74,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView android:id="@+id/description"
-                    android:layout_gravity="center_vertical|left"
+                    android:layout_gravity="center_vertical|start"
                     android:layout_width="0px"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingRight="4dip"
+                    android:paddingEnd="4dip"
                     android:singleLine="true"
                     android:ellipsize="marquee"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
                 <TextView android:id="@+id/uptime"
-                    android:layout_gravity="center_vertical|right"
+                    android:layout_gravity="center_vertical|end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index e23de16..b5fb810 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -26,8 +26,8 @@
         <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:paddingStart="@*android:dimen/preference_fragment_padding_side"
+                android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
                 android:drawSelectorOnTop="false"
                 android:scrollbarStyle="outsideOverlay"
                 android:fastScrollEnabled="true" />
@@ -47,17 +47,17 @@
             android:clipChildren="false"
             android:clipToPadding="false"
             android:paddingTop="30dp"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
+            android:paddingStart="4dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="1dp"
-            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
-            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
+            android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
         <TextView android:id="@+id/foregroundText"
             android:layout_width="0px"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:focusable="true"
-            android:gravity="left|bottom"
+            android:gravity="start|bottom"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#000"
             android:singleLine="true" />
@@ -74,12 +74,12 @@
             android:singleLine="true"
             android:text="@string/memory" />
         <TextView android:id="@+id/backgroundText"
-            android:layout_gravity="center_vertical|right"
+            android:layout_gravity="center_vertical|end"
             android:layout_width="0px"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:focusable="true"
-            android:gravity="right|bottom"
+            android:gravity="end|bottom"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#000"
             android:singleLine="true" />
diff --git a/res/layout/running_service_details_process.xml b/res/layout/running_service_details_process.xml
index d12b486..caf5664 100644
--- a/res/layout/running_service_details_process.xml
+++ b/res/layout/running_service_details_process.xml
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingLeft="14dip"
+        android:paddingStart="14dip"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
 </LinearLayout>
diff --git a/res/layout/running_service_details_service.xml b/res/layout/running_service_details_service.xml
index b9f9bbe..56cd971 100644
--- a/res/layout/running_service_details_service.xml
+++ b/res/layout/running_service_details_service.xml
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingLeft="14dip"
+        android:paddingStart="14dip"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <include
diff --git a/res/layout/set_backup_pw.xml b/res/layout/set_backup_pw.xml
index 3743c81..ce9a398 100644
--- a/res/layout/set_backup_pw.xml
+++ b/res/layout/set_backup_pw.xml
@@ -75,7 +75,7 @@
     <Button
             android:id="@+id/backup_pw_set_button"
             android:layout_below="@id/confirm_new_backup_pw"
-            android:layout_toRightOf="@id/backup_pw_cancel_button"
+            android:layout_toEndOf="@id/backup_pw_cancel_button"
             android:text="@string/backup_pw_set_button_text"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content" />
diff --git a/res/layout/settings_storage_miscfiles.xml b/res/layout/settings_storage_miscfiles.xml
index 7c52efa..0360cde 100644
--- a/res/layout/settings_storage_miscfiles.xml
+++ b/res/layout/settings_storage_miscfiles.xml
@@ -21,7 +21,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:focusable="true">
@@ -29,26 +29,26 @@
     <CheckBox android:id="@+id/misc_checkbox"
               android:layout_width="wrap_content"
               android:layout_height="match_parent"
-              android:layout_alignParentLeft="true"
-              android:paddingLeft="16dip"
+              android:layout_alignParentStart="true"
+              android:paddingStart="16dip"
               android:scaleType="fitCenter"
               android:layout_centerVertical="true"/>
 
     <TextView android:id="@+id/misc_filename"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_toRightOf="@id/misc_checkbox"
+              android:layout_toEndOf="@id/misc_checkbox"
               android:maxLines="1"
-              android:paddingLeft="16dip"
+              android:paddingStart="16dip"
               android:textAppearance="?android:attr/textAppearanceSmall"/>
 
     <TextView android:id="@+id/misc_filesize"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_toRightOf="@id/misc_checkbox"
+              android:layout_toEndOf="@id/misc_checkbox"
               android:layout_below="@id/misc_filename"
               android:maxLines="1"
-              android:paddingLeft="16dip"
+              android:paddingStart="16dip"
               android:textStyle="bold"
               android:textAppearance="?android:attr/textAppearanceSmall" />
 </com.android.settings.deviceinfo.FileItemInfoLayout>
diff --git a/res/layout/settings_storage_miscfiles_list.xml b/res/layout/settings_storage_miscfiles_list.xml
index 5f8c5ed..b712073 100644
--- a/res/layout/settings_storage_miscfiles_list.xml
+++ b/res/layout/settings_storage_miscfiles_list.xml
@@ -21,8 +21,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingRight="16dip"
-    android:paddingLeft="16dip">
+    android:paddingEnd="16dip"
+    android:paddingStart="16dip">
 
     <ListView android:id="@android:id/list"
               android:layout_width="match_parent"
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 79d59b3..30b3373 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -49,8 +49,8 @@
                 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_marginStart="8dip"
+                android:layout_marginEnd="8dip"
                 android:layout_marginBottom="8dip"
                 android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
                 android:background="?android:attr/actionBarItemBackground"
@@ -107,7 +107,7 @@
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:paddingRight="?android:attr/scrollbarSize" >
+            android:paddingEnd="?android:attr/scrollbarSize" >
 
             <ImageView
                 android:id="@+id/add_icon"
@@ -121,8 +121,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="6dip"
-                android:layout_marginLeft="15dip"
-                android:layout_marginRight="6dip"
+                android:layout_marginStart="15dip"
+                android:layout_marginEnd="6dip"
                 android:layout_marginTop="6dip"
                 android:layout_weight="1"
                 android:ellipsize="marquee"
@@ -144,14 +144,14 @@
                 android:id="@+id/back_button"
                 android:layout_width="150dip"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="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:layout_alignParentEnd="true"
                 android:orientation="horizontal" >
 
                 <Button
diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml
index a2b84e2..e559a6e 100644
--- a/res/layout/trusted_credential.xml
+++ b/res/layout/trusted_credential.xml
@@ -18,7 +18,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground"
     android:padding="15dip"
     >
@@ -39,7 +39,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/trusted_credential_subject_primary"
-            android:layout_alignLeft="@id/trusted_credential_subject_primary"
+            android:layout_alignStart="@id/trusted_credential_subject_primary"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
         />
diff --git a/res/layout/trusted_credential_details.xml b/res/layout/trusted_credential_details.xml
index e220e1c..c8c16f7 100644
--- a/res/layout/trusted_credential_details.xml
+++ b/res/layout/trusted_credential_details.xml
@@ -18,6 +18,6 @@
     android:id="@+id/cert_remove_button"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
-    android:layout_gravity="right"
+    android:layout_gravity="end"
     android:layout_margin="6dip"
     />
diff --git a/res/layout/twelve_key_entry.xml b/res/layout/twelve_key_entry.xml
index 81ead98..e1d3172 100644
--- a/res/layout/twelve_key_entry.xml
+++ b/res/layout/twelve_key_entry.xml
@@ -24,16 +24,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/one"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -42,8 +42,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -52,8 +52,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -63,16 +63,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/four"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -81,8 +81,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -91,8 +91,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -101,16 +101,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/seven"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -119,8 +119,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -129,8 +129,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -140,16 +140,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/ok"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold"
             android:text="@android:string/ok"
@@ -159,8 +159,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -169,8 +169,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold"
             android:text="@android:string/cancel"
diff --git a/res/layout/two_buttons_panel.xml b/res/layout/two_buttons_panel.xml
index 5d76312..1a5975a 100755
--- a/res/layout/two_buttons_panel.xml
+++ b/res/layout/two_buttons_panel.xml
@@ -24,8 +24,8 @@
         android:layout_height="wrap_content"
         android:gravity="bottom"
         android:paddingTop="4dip"
-        android:paddingLeft="2dip"
-        android:paddingRight="2dip"
+        android:paddingStart="2dip"
+        android:paddingEnd="2dip"
         android:orientation="horizontal">
         <Button
             android:id="@+id/left_button"
diff --git a/res/layout/usage_stats.xml b/res/layout/usage_stats.xml
index 9ce338c..96e1bd1 100755
--- a/res/layout/usage_stats.xml
+++ b/res/layout/usage_stats.xml
@@ -24,11 +24,11 @@
             android:text="@string/app_name_label"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
-            android:paddingRight="6dip"
+            android:paddingEnd="6dip"
             android:layout_height="wrap_content" />
         <TextView
             android:text="@string/launch_count_label"
-            android:paddingRight="6dip"
+            android:paddingEnd="6dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/res/layout/usage_stats_item.xml b/res/layout/usage_stats_item.xml
index bdadf85..c231b58 100755
--- a/res/layout/usage_stats_item.xml
+++ b/res/layout/usage_stats_item.xml
@@ -27,24 +27,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingRight="6dip"
-        android:paddingLeft="12dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="12dip"
         android:maxLines="1" />
 
     <TextView android:id="@+id/launch_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingRight="6dip"
-        android:paddingLeft="12dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="12dip"
         android:maxLines="1" />
 
     <TextView android:id="@+id/usage_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingRight="6dip"
-        android:paddingLeft="12dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="12dip"
         android:maxLines="1" />
 </LinearLayout>
 
diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
index 4089299..d8b8694 100644
--- a/res/layout/user_dictionary_add_word.xml
+++ b/res/layout/user_dictionary_add_word.xml
@@ -28,9 +28,9 @@
           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:layout_marginStart="16dip"
+          android:layout_marginEnd="16dip"
+          android:gravity="center_vertical|start"
           android:text="@string/user_dict_settings_add_dialog_title" />
     <View android:layout_width="match_parent"
           android:layout_height="2dip"
@@ -42,7 +42,7 @@
             android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:layout_gravity="fill_horizontal|center_vertical"
-            android:layout_marginLeft="8dip"
+            android:layout_marginStart="8dip"
             android:layout_marginBottom="8dip"
             android:layout_marginTop="8dip"
             android:inputType="textNoSuggestions"
@@ -62,7 +62,7 @@
                   android:orientation="horizontal"
                   android:measureWithLargestChild="true">
       <Button android:layout_width="0dip"
-              android:layout_gravity="left"
+              android:layout_gravity="start"
               android:layout_weight="1"
               android:maxLines="2"
               style="?android:attr/buttonBarButtonStyle"
@@ -71,7 +71,7 @@
               android:layout_height="wrap_content"
               android:onClick="onClickCancel" />
       <Button android:layout_width="0dip"
-              android:layout_gravity="right"
+              android:layout_gravity="end"
               android:layout_weight="1"
               android:maxLines="2"
               style="?android:attr/buttonBarButtonStyle"
diff --git a/res/layout/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml
index c0f3f53..f29c669 100644
--- a/res/layout/user_dictionary_add_word_fullscreen.xml
+++ b/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_gravity="fill_horizontal|center_vertical"
-            android:layout_marginLeft="8dip"
+            android:layout_marginStart="8dip"
             android:layout_marginBottom="8dip"
             android:layout_marginTop="8dip"
             android:inputType="textNoSuggestions"
@@ -40,20 +40,20 @@
   <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:layout_marginStart="8dip"
+              android:layout_marginEnd="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:layout_gravity="start|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_marginStart="8dip"
               android:layout_marginBottom="8dip"
               android:layout_marginTop="8dip"
               android:inputType="textNoSuggestions"
@@ -62,10 +62,10 @@
               style="?android:attr/textAppearanceSmall"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_gravity="left|center_vertical"
+              android:layout_gravity="start|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_marginStart="8dip"
               android:layout_marginBottom="8dip"
               android:layout_marginTop="8dip"
               android:layout_width="wrap_content"
diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml
index 749986e..82d8629 100644
--- a/res/layout/user_dictionary_item.xml
+++ b/res/layout/user_dictionary_item.xml
@@ -19,13 +19,13 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground" >
 
   <RelativeLayout android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:layout_marginLeft="15dip"
-                  android:layout_marginRight="6dip"
+                  android:layout_marginStart="15dip"
+                  android:layout_marginEnd="6dip"
                   android:layout_marginTop="6dip"
                   android:layout_marginBottom="6dip"
                   android:layout_weight="1">
@@ -42,7 +42,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_below="@android:id/text1"
-              android:layout_alignLeft="@android:id/text1"
+              android:layout_alignStart="@android:id/text1"
               android:textAppearance="?android:attr/textAppearanceSmall"
               android:textColor="?android:attr/textColorSecondary"
               android:maxLines="1" />
diff --git a/res/layout/vpn_lockdown_editor.xml b/res/layout/vpn_lockdown_editor.xml
new file mode 100644
index 0000000..933c5ec
--- /dev/null
+++ b/res/layout/vpn_lockdown_editor.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:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dip"
+        android:paddingRight="16dip"
+        android:paddingTop="8dip"
+        android:paddingBottom="8dip"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/vpn_lockdown_summary" />
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+</LinearLayout>
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index 1b10f90..fef10b3 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -68,19 +68,19 @@
                 android:minWidth="128dip"
                 android:layout_height="wrap_content"
                 android:minHeight="56dip"
-                android:paddingRight="16dip"
-                android:layout_alignParentLeft="true"
+                android:paddingEnd="16dip"
+                android:layout_alignParentStart="true"
                 android:text="@string/wifi_ssid"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textSize="20sp"
-                android:gravity="left|center_vertical" />
+                android:gravity="start|center_vertical" />
 
             <FrameLayout
                 android:id="@+id/ssid_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignBottom="@id/ssid_text"
-                android:layout_toRightOf="@id/ssid_text">
+                android:layout_toEndOf="@id/ssid_text">
                 <EditText
                     android:id="@+id/ssid"
                     android:layout_width="368dip"
@@ -105,7 +105,7 @@
                 android:text="@string/wifi_password"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textSize="20sp"
-                android:gravity="left|center_vertical" />
+                android:gravity="start|center_vertical" />
 
             <LinearLayout
                 android:id="@+id/password_layout"
@@ -162,7 +162,7 @@
                     android:layout_width="368dip"
                     android:layout_height="wrap_content"
                     android:minHeight="56dip"
-                    android:paddingLeft="4dip"/>
+                    android:paddingStart="4dip"/>
             </FrameLayout>
         </TableRow>
     </TableLayout>
diff --git a/res/layout/wifi_setup_custom_list_item_1.xml b/res/layout/wifi_setup_custom_list_item_1.xml
index 9d329ea..3ef7e25 100644
--- a/res/layout/wifi_setup_custom_list_item_1.xml
+++ b/res/layout/wifi_setup_custom_list_item_1.xml
@@ -22,6 +22,6 @@
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:textSize="20sp"
     android:gravity="center_vertical"
-    android:paddingLeft="16dip"
+    android:paddingStart="16dip"
     android:minHeight="48dip"
 />
diff --git a/res/menu/vpn.xml b/res/menu/vpn.xml
new file mode 100644
index 0000000..dd8f64c
--- /dev/null
+++ b/res/menu/vpn.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/vpn_create"
+        android:title="@string/vpn_create"
+        android:icon="@drawable/ic_menu_add"
+        android:showAsAction="always" />
+    <item
+        android:id="@+id/vpn_lockdown"
+        android:title="@string/vpn_menu_lockdown"
+        android:showAsAction="never" />
+</menu>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6075a8d..aabe835 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Laai"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Ontlaai"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(draadloos)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Laai nie"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Laai nie"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Vol"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Uitgeprop"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"draadloos"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Onbekend"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Onbekend"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ligging:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Selinligting:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datapogings:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-dienste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Swerwing:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Verander ontsluit-PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Wagwoord moet minstens %d karakters hê"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN moet minstens %d karakters bevat"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN moet minstens %d syfers wees"</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="7016906583950201704">"Wagwoord moet korter as <xliff:g id="NUMBER">%d</xliff:g> karakters wees."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Kragspaar"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Bespaar krag wanneer skerm afgeskakel is"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi-warmkol"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Skakel tans Wi-Fi-warmkol aan..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Skakel tans Wi-Fi-warmkol af..."</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="61237027772641155">"Stel Wi-Fi-warmkol op"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Muurpapier"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Kies muurpapier uit"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Skermversiering"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Sal begin sodra slaap, mits gekoppel aan krag"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Droom"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Wanneer gedok of sluimer en besig om te laai"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Wanneer sluimer en besig om te laai"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Wanneer gedok"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Gedeaktiveer"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Gekose versiering"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Het droom gekies"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Wanneer om te aktiveer"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> van niksdoen"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nooit"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Probeer dit!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Begin ook wanneer gedok"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Begin wanneer sluimer"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Begin wanneer gedok"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fontgrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Basisbandweergawe"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernweergawe"</string>
     <string name="build_number" msgid="3075795840572241758">"Bou-nommer"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nie beskikbaar nie"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Vee SD-kaart uit"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Vee alle data op die interne USB-berging uit, soos musiek en foto\'s"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Vee alle data op die SD-kaart uit, soos musiek en foto\'s"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- of PTP-funksie is aktief"</string>
     <string name="read_only" msgid="6702420168629076340">" (Leesalleen)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Ontheg USB-berging?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Demonteer SD-kaart?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-berging-data"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kaart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Verwyder"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Deaktiveer"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktiveer"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Vee data uit"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Gebruiker: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses en <xliff:g id="NUMSERVICES">%2$d</xliff:g> diens"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses en <xliff:g id="NUMSERVICES">%2$d</xliff:g> dienste"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosesse en <xliff:g id="NUMSERVICES">%2$d</xliff:g> diens"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Kragkieslys se foutverslae"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Sluit opsie in die kragkieslys in vir die neem van \'n foutverslag"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Geen rekening stoor tans gerugsteunde data nie"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Outomatiese teruglaai"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wanneer \'n program weer geïnstalleer word, herstel gerugsteunde instellings en data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Neem foutverslag"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Dit sal inligting oor die huidige toestand van jou toestel insamel, om as \'n e-posboodskap te stuur. Dit sal \'n tydjie neem vandat die foutverslag begin is totdat dit reg is om gestuur te word; wees asseblief geduldig."</string>
-    <string name="report" msgid="302437572240018342">"Rapporteer"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Werkskerm-rugsteunwagwoord"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Wys hardewarelae se opdaterings"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Laat hardewarelae groen flits wanneer hulle opgedateer word"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Gedeaktiveer"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Toestemmend"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Pas toe"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Rekening vir die inhoud"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Seluitsendings"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Kies die tipe noodwaarskuwings wat vertoon moet word."</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 09a6de4..02145fa 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"ኃይል በመሙላት ላይ"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"በመልቀቅ ላይ"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ገመድ አልባ)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"ባትሪ እየሞላ አይደለም"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ኃይል  እየሞላ አይደለም"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"ሙሉነው"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"ሶኬቱ አልተሰካም"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"ገመድ አልባ"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"ያልታወቀ"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"ያልታወቀ"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"CellInfo፦"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"የውሂብ ሙከራዎች፡"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"የGPRS አገልግሎት፡"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"በመንቀሳቀስ ላይ:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ PIN ለውጥ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"መክፈቻ ይለፍ ቃል ለውጥ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"የይለፍ ቃል ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"የይለፍ ቃል ከ<xliff:g id="NUMBER">%d</xliff:g> ቁምፊዎች ያነሰ መሆን አለበት።"</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"የኃይል ቁጠባ"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"ማያ ገጽ ሲጠፋ ኃይል ቆጥብ"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"በገመድ አልባ ማዞሪያህ ላይ ፒን <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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">" ተጓጓዥ Wi-Fi ድረስ ነጥብ"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"የመገናኛ ነጥብን በማብራት ላይ…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"የመገናኛ ነጥብን በማጥፋት ላይ…"</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="61237027772641155">"Wi-fi መገናኛ ነጥብ አቀናብር"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"ወደ ሀይል ከተገናኘ በእንቅልፍ ላይ ይጀምራል"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"ህልም"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"ሲተከል ወይም ሲተኛ እና ባትሪ እየሞላ ሳለ"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"ሲተኛ እና ባትሪ እየሞላ ሳለ"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"ሲተከል"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"ቦዝኗል"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"የተመረጠ ካንዲ"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"የተመረጠ ህልም"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"መቼ ይገብር"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"ከ<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ስራ ከፈታ በኋላ"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"በፍፁም"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"ሞክረው!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"በሚተከልበት ጊዜም ጀምር"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"ሲተኛ ጀምር"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"ሲተከል ጀምር"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ራስ ሰርብሩህነት"</string>
     <string name="title_font_size" msgid="4405544325522105222">"የቁምፊ መጠን"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"የቅርጸ ቁምፊ መጠን"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"የቤዝባንድ ሥሪት"</string>
     <string name="kernel_version" msgid="9192574954196167602">"የከርነል ሥሪት"</string>
     <string name="build_number" msgid="3075795840572241758">"የግንባታ ቁጥር"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"የSELinux ሁኔታ"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"አይገኝም"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"ኹናቴ"</string>
     <string name="device_status" msgid="607405385799807324">"ሁኔታ"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"የSD ካርድ አጥፋ"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"እንደ ሙዚቃ እና ፎቶዎች፣ በውስጥ USB ማከማቻ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"እንደ ሙዚቃ እና ፎቶዎች፣ በ SD ካርድ ላይ ያለን ውሂብ ሁሉ ያጠፋል"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"የMTP ወይም PTP ተግባር ገባሪ ሆኗል"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"የUSB ማከማቻ ውሂብ"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD ካርድ"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"አራግፍ"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"አታቦዝን"</string>
     <string name="enable_text" msgid="9217362512327828987">"አንቃ"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"ውሂብ አጥራ"</string>
@@ -1078,7 +1098,7 @@
     <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="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>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"ተጠቃሚ፦ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>ሂደት እና <xliff:g id="NUMSERVICES">%2$d</xliff:g>አገልግሎት"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>ሂደት እና <xliff:g id="NUMSERVICES">%2$d</xliff:g>አገልግሎቶች"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>ሂደት እና  <xliff:g id="NUMSERVICES">%2$d</xliff:g> አገልግሎት"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"የኃይል ምናሌ ሳንካ ሪፖርቶች"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"የሳንካ ሪፖርት ለመውሰድ የኃይል ምናሌ ውስጥ አማራጩን ያካትቱ"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"የሳንካ ሪፖርት ውሰድ"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"ይሄ እንደ የኢሜይል መልዕክት አድርጎ የሚልከውን ስለመሣሪያዎ የአሁኑ ሁኔታ መረጃ ይሰበስባል። የሳንካ ሪፖርቱን ከመጀመር ጀምሮ እስኪላክ ድረስ ትንሽ ጊዜ ይወስዳል፤ እባክዎ ይታገሱ።"</string>
-    <string name="report" msgid="302437572240018342">"ሪፖርት አድርግ"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"የዴስክቶፕ መጠባበቂያ ይለፍ ቃል"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ዴስክቶፕ ሙሉ ምትኬዎች በአሁኑ ሰዓት አልተጠበቁም"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ለዴስክቶፕ ሙሉ ምትኬዎች የይለፍ ቃል ለመለወጥ ወይም ለማስወገድ ንካ"</string>
@@ -1514,7 +1534,7 @@
     <!-- 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="cant_sync_dialog_message" msgid="1938380442159016449">"አመሳስል ለእዚህ ንጥል በአሁን ጊዜ ቦዝኗል።ምርጫህን ለመለወጥ፣ ለጊዜው የዳራ ውሂብ እና ራስ ሰር ማመሳሰያ አብራ።"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"የ4G ቅንብሮች"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"አዋቅር &amp;  የ4G አውታረመረብ እና ሞደም አደራጅ"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"የ4G MAC አድራሻ"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"የሃርድዌር ንብርብሮች ዝማኔዎችን አሳይ"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"የሃርድዌር ንብርብሮች ሲዘምኑ አረንጓዴ አብራ"</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>
@@ -1605,7 +1627,7 @@
     <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="518658001418490405">"የጀርባ ውሂብ በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ አሰናክል። ከተገኙ የተንቀሳቃሽ ስልክ ያልሆኑ አውታረ መረቦች ስራ ላይ ይውላሉ።"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ለዚህ ትግበራ የዳራ ውሂብ ለመገደብ፣ መጀመሪያ የተንቀሳቃሽ ውሂብ ወሰን አዘጋጅ።"</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="1466689968707308512">"ይሄ ባህሪ የተንቀሳቃሽ ስልክ አውታረ መረቦች ብቻ የሚገኙ ከሆኑ በጀርባ ውሂብ ላይ የሚወሰኑ መተግበሪያዎች ስራቸውን እንዲያቆሙ ሊያደርግ ይችላል።"\n\n"በመተግበሪያው ቅንብሮች ውስጥ ተገቢ የሆኑ ተጨማሪ የአጠቃቀም መቆጣጠሪያዎችን ልታገኝ ትችላለህ።"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"የተንቀሳቃሽ ስልክ ውሂብ ወሰን ሲያዘጋጁ ብቻ ነው የዳራ ውሂብ መገደብ የሚቻለው።"</string>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"የVPN መገለጫ አክል"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"መገለጫ አርትዕ"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"መገለጫ ሰርዝ"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"ተሰናክሏል"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"ፈቃጅ"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"በማስፈጸም ላይ"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"መለያ ለይዘት"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"የፎቶ መታወቂያ"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"የስልክ ስርጭቶች"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"የሚታዩ የአስቸኳይ አደጋ ማንቂያዎች አይነቶች ምረጥ።"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b0c4acb..d297678 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"شحن"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"تفريغ الشحن"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(الشبكات اللاسلكية)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"لا يتم الشحن"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"لا يتم الشحن"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"ممتلئة"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"غير متصل"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"الشبكات اللاسلكية"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"غير معروف"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"غير معروف"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"معلومات الخلية:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"محاولات البيانات:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"خدمة GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"تجوال:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغيير رقم التعريف الشخصي لإلغاء التأمين"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغيير كلمة مرور إلغاء التأمين"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"يجب أن تكون كلمة المرور %d من الأحرف على الأقل"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"يجب أن يكون رقم التعريف الشخصي %d من الأحرف على الأقل"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"يجب أن يكون رقم التعريف الشخصي %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="7016906583950201704">"يجب أن تكون كلمة المرور أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأحرف."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"توفير الطاقة"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"توفير الطاقة عندما يتم إيقاف تشغيل الشاشة"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"أدخل رقم التعريف الشخصي <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_in_progress" msgid="3372311348221357944">"إعداد 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطة اتصال Wi-Fi المحمولة"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"جارٍ تشغيل نقطة الاتصال…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"جارٍ إيقاف نقطة الاتصال…"</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="61237027772641155">"إعداد نقطة اتصال Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"يتم البدء عند الدخول في وضع السكون في حالة الاتصال بمصدر الطاقة"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"حلم"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"عند الإرسال أو السكون والشحن"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"عند السكون والشحن"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"عند الإرساء"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"معطلة"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"شاشة التوقف المحددة"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"الحلم المحدد"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"وقت التنشيط"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"بعد انقضاء مدة <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من الخمول"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"أبدًا"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"لم لا تجرِّب!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"البدء أيضًا عند الإرساء"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"البدء عند السكون"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"البدء عند الإرساء"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
     <string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"حجم الخط"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"إصدار النطاق الأساسي"</string>
     <string name="kernel_version" msgid="9192574954196167602">"إصدار النواة"</string>
     <string name="build_number" msgid="3075795840572241758">"رقم الإصدار"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"حالة SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"غير متاح"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"الحالة"</string>
     <string name="device_status" msgid="607405385799807324">"الحالة"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"محو بطاقة SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"محو كل البيانات على بطاقة SD، مثل الموسيقى والصور"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"وظيفة MTP أو PTP نشطة"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"بيانات وحدة تخزين USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"بطاقة SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"إزالة"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"تعطيل"</string>
     <string name="enable_text" msgid="9217362512327828987">"تمكين"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"محو البيانات"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"ذاكرة الوصول العشوائي"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"المستخدم: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"عملية <xliff:g id="NUMPROCESS">%1$d</xliff:g> وخدمة <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"عملية <xliff:g id="NUMPROCESS">%1$d</xliff:g> و<xliff:g id="NUMSERVICES">%2$d</xliff:g> من الخدمات"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> من العمليات وخدمة <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"تقارير الخطأ في قائمة الطاقة"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"تضمين خيار في قائمة الطاقة لإنشاء تقرير الأخطاء"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"إعداد تقرير بالأخطاء"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"سيجمع هذا معلومات حول حالة جهازك الحالي لإرسالها كرسالة إلكترونية. سيستغرق وقتًا قليلاً من بدء عرض تقرير بالأخطاء وحتى يكون جاهزًا للإرسال، الرجاء الانتظار."</string>
-    <string name="report" msgid="302437572240018342">"تقرير"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"كلمة مرور احتياطية للكمبيوتر"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"النسخ الاحتياطية الكاملة لسطح المكتب غير محمية في الوقت الحالي"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"المس لتغيير كلمة مرور النسخ الاحتياطية الكاملة لسطح المكتب أو إزالتها"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"عرض تحديثات طبقات الأجهزة"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"تشغيل وميض بالأخضر لطبقات الأجهزة عند تحديثها"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"تعطيل تراكبات الأجهزة"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"استخدام وحدة معالجة الرسومات دائمًا لتركيب الشاشة"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"تمكين الآثار"</string>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"إضافة ملف شخصي لشبكة ظاهرية خاصة (VPN)"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"تعديل الملف الشخصي"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"حذف الملف الشخصي"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"معطّل"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"متساهل"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"فرض"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"حساب المحتوى"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"معرف الصورة"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"عمليات البث الخلوي"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"حدد أنواع تنبيهات الطوارئ لعرضها."</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 3ecc39c..ed27ea8 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарадка"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Разрадка"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(бесправадныя сеткi)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Не зараджаецца"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не зараджаецца"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Поўная"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Адключана"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Перам. ток"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"бесправадныя сеткi"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Перам. ток+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Невядома"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Невядомы"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі HTTP выкарыстоўваецца браўзэрам, але ён не можа выкарыстоўвацца іншымі прыкладаннямi"</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_cellinfo_label" msgid="1300937728020622362">"Звесткi ячэйкi:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Спробы перадачы дадзеных:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Служба GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роўмінг:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змяніць PIN-код разблакавання"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змяніць пароль разблакоўкі"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль павінен быць не менш за пэўную колькасць знакаў: %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Мiнiмальная колькасць знакаў PIN-коду: %d"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-код павінен утрымлiваць не менш за пэўную колькасць лічбаў: %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="7016906583950201704">"Максiмальная колькасць знакаў, якую можа змяшчаць пароль: <xliff:g id="NUMBER">%d</xliff:g>"</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Энергазберажэнне"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Захоўваць энергiю, калі выключаны экран"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Увядзіце 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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Партатыўная кропка доступу Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Уключэнне кропкi доступу..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключэнне кропкi доступу..."</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="61237027772641155">"Налада кропкi доступу Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Запусціцца у спячым рэжыме, калі будзе падлучаны да электрасілкавання"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Захавальнiк"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Калі падключана або ў рэжыме сну цi зараджаецца"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"У рэжыме сну i падчас зарадкi"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Калі падключана"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Адключана"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Абраны модуль"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Выбраны модуль"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Хуткасць актывацыі"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Час прастою: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ніколі"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Паспрабуйце!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Таксама запускаць ў прыстыкаваным стане"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Пачаць у рэжыме сну"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Пачаць пры падключэннi"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Памер шрыфта"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Памер шрыфту"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Версія baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Вэрсія ядра"</string>
     <string name="build_number" msgid="3075795840572241758">"Нумар зборкі"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Стан SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Недаступны"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Стан"</string>
     <string name="device_status" msgid="607405385799807324">"Стан"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Сцерці SD-карту"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Сцірае ўсе дадзеныя на ўнутраным USB-назапашвальнiку (напрыклад, музыку і фатаграфіі)"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Сцірае ўсе дадзеныя на SD-карце (напрыклад, музыку і фатаграфіі)"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Функцыя MTP або PTP актыўная"</string>
     <string name="read_only" msgid="6702420168629076340">" (Толькі чытанне)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Адключыць USB-назапашвальнiк"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Адключыць SD-карту"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Дадзеныя USB-сховішча"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Выдаліць"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Адключыць"</string>
     <string name="enable_text" msgid="9217362512327828987">"Уключанае"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ачысціць дадзеныя"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM (АЗП)"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Карыстальнiк: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Працэсаў: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; службаў: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Працэсаў: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; службаў: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Працэсаў: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; службаў: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Справаздачы пра меню сiлкавання"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Уключыце параметр у меню сiлкавання, каб прыняць справаздачу пра памылку"</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>
@@ -1416,9 +1439,6 @@
     <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">"Пры пераўсталяваннi прыкладання аднавіць рэзервовую копію налад і дадзеных"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Справаздача пра памылку"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Будзе збiрацца iнфармацыя пра бягучы стан прылады, якая будзе адпраўляцца на электронную пошту. Стварэнне справаздачы пра памылкi зойме некаторы час."</string>
-    <string name="report" msgid="302437572240018342">"Справаздача"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для рэзервовага капіявання працоўнага стала"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Поўнае рэзервовае капіраванне рабочага стала зараз не абаронена"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Выберыце, каб змяніць або выдаліць пароль для поўнага рэзервовага капіравання рабочага стала"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Паказаць абнаўленнi апаратнага пласта"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Апаратныя пласты набываюць зялёны колер, калi абнаўляюцца"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Выключана"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Дазвол"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Забеспячэнне"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Уліковы запіс для змесціва"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Iдэнтыфiкатар фота"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Мабільнае вяшчанне"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Выберыце тыпы надзвычайных папярэджанняў для адлюстравання."</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index bd36fcf..4d8bde5 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарежда се"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Изпразване"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(безжично)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Не се зарежда"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не се зарежда"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Пълна"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Изкл."</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"безжично"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Неизвестни"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Неизвестен"</string>
@@ -190,6 +192,7 @@
     <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">"Идентификация на съседно обаждане:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Клетъчна информация:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Опити за данни:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS услуга:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промяна на PIN кода за отключване"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промяна на паролата за отключване"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Паролата трябва да е поне %d знака"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN кодът трябва да е поне %d знака"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ПИН кодът трябва да е поне %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="7016906583950201704">"Паролата трябва да е по-малко от <xliff:g id="NUMBER">%d</xliff:g> знака."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Енергоспестяване"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Енергоспестяване при изключен екран"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Въведете ПИН кода <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_in_progress" msgid="3372311348221357944">"Настройката на 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносима точка за достъп през Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Точката за достъп се включва…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Точката за достъп се изключва…"</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="61237027772641155">"Настройка на точката за достъп до Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Ще стартира от спящ режим при включено захранване"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Сън"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"При свързване с докинг станция или при спящ режим и зареждане"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"При спящ режим и зареждане"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"При свързване с докинг станция"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Деактивирано"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Отбрана наслада"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Избран сън"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Кога да се активира"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Никога"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Изпробвайте!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Да се стартира и при свързване с докинг станция"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Да се стартира при спящ режим"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Да се стартира при свързване с докинг станция"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Размер на шрифта"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Версия на радиомодула"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Версия на ядрото"</string>
     <string name="build_number" msgid="3075795840572241758">"Номер на версията"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Състояние на SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Не е налично"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Състояние"</string>
     <string name="device_status" msgid="607405385799807324">"Състояние"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Изтриване на SD картата"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Изтрива всички данни във вътрешното USB хранилище, като музика и снимки"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Изтрива всички данни в SD картата, като музика и снимки"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Активна е функция за MTP или PTP"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Данни за USB хранилището"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Деинсталиране"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Деактивиране"</string>
     <string name="enable_text" msgid="9217362512327828987">"Активиране"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Изчистване на данни"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Потребител: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуги"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процеса и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Сигнали за програмни грешки в менюто за захранване"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Включване на опцията за получаване на сигнал за програмна грешка в менюто за захранване"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"Получаване на сигнал за програмна грешка"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"По този начин ще се събере информация за текущото състояние на устройството ви, която да се изпрати като имейл съобщение. След стартирането на процеса ще мине известно време, докато сигналът за програмна грешка бъде готов за подаване. Моля, имайте търпение."</string>
-    <string name="report" msgid="302437572240018342">"Подаване на сигнал"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Наст. комп.: Парола"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Понастоящем пълните резервни копия за настолен компютър не са защитени"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Докоснете, за да промените или премахнете паролата за пълни резервни копия на настолния компютър"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Актуализации на слоевете на хардуера"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Примигв. на слоевете на хардуера в зелено при актуал."</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>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Потребителски профил за VPN: Добавяне"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Редактиране на потребителския профил"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Изтриване на потребителския профил"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Деактивирано"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Разрешаващо"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Налагане"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Профил за съдържание"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Идент. № на снимката"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Клетъчни излъчвания"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изберете типовете спешни сигнали, които да се показват."</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4e87ab2..342f3c1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"S\'està carregant"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"S\'està descarregant"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sense fil)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"No s\'està carregant"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No s\'està carregant"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plena"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desconnectada"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"sense fil"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconegut"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconegut"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicació:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID veí:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informació mòbil:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intents de dades:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servei GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerància:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Canvia el PIN de desbloqueig"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Canvia la contrasenya de desbloqueig"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contrasenya ha de tenir almenys %d caràcters"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN ha de tenir almenys %d caràcters"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN ha de tenir almenys %d dígits"</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="7016906583950201704">"La contrasenya ha de tenir menys de <xliff:g id="NUMBER">%d</xliff:g> caràcters."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Estalvi de bateria"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Estalvia bateria quan la pantalla estigui apagada"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punt de connexió Wi-fi portàtil"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"S\'està activant la zona Wi-Fi…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"S\'està desactivant la zona Wi-Fi…"</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="61237027772641155">"Configura la zona Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona fons de pantalla de"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Pantalla de caramel"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Es posarà en repòs quan estigui connectat a l\'alimentació elèctrica"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Somni"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quan estigui connectat o inactiu i carregant-se"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quan estigui inactiu i carregant-se"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quan estigui connectat"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desactivat"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Caramels seleccionats"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Somni seleccionat"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Moment de l\'activació"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'estat inactiu"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mai"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Prova-ho!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Inicia\'l també quan estigui connectat"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Inicia quan estigui inactiu"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Inicia quan estigui connectat"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Mida de la lletra"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versió de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versió de nucli"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilació"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Estat de SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estat"</string>
     <string name="device_status" msgid="607405385799807324">"Estat"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Esborra la targeta SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Esborra totes les dades de l\'emmagatzematge USB intern, com música i fotos."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Esborra totes les dades de la targeta SD, com ara la música i les fotos"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La funció MTP o PTP està activa"</string>
     <string name="read_only" msgid="6702420168629076340">" (Només de lectura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Vols desactivar l\'emmagatzematge USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Vols desactivar la targeta SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dades de l\'emmagatzematge USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Targeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstal·la"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Desactiva"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activa"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Esborra les dades"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Usuari: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procés i <xliff:g id="NUMSERVICES">%2$d</xliff:g> servei"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procés i <xliff:g id="NUMSERVICES">%2$d</xliff:g> serveis"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processos i <xliff:g id="NUMSERVICES">%2$d</xliff:g> servei"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Informes d\'error del menú d\'encesa"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclou l\'opció de fer un informe d\'error al menú d\'encesa"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"En aquests moments no hi ha cap compte que emmagatzemi una còpia de seguretat de les dades"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauració automàtica"</string>
     <string name="auto_restore_summary" msgid="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="bugreport_title" msgid="1009498799922543551">"Agafa l\'informe d\'errors"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Recopilarà informació sobre l\'estat actual del dispositiu per enviar-la com a missatge de correu electrònic. Passarà un cert temps a partir del moment en què comenci a elaborar-se l\'informe d\'errors fins que no estigui llest per enviar; tingues paciència."</string>
-    <string name="report" msgid="302437572240018342">"Crea l\'informe"</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="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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Mostra actual. capes maq."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Les capes de maquin. parpellegen verd en actual."</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Desactivat"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissiu"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"En aplicació"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Compte per al contingut"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Identificador de la foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Emissions mòbils"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona els tipus d\'alertes d\'emergència que es mostraran."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b60af8a..d10e387 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Nabíjí se"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Vybíjí se"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezdrátové připojení)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nenabíjí se"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenabíjí se"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plná"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Odpojeno"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"bezdrátové připojení"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Neznámé"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Neznámé"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Místo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sousední identifikátor CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy dat:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Služba GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <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 znaky"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovat nejméně %d znaky"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Počet číslic v kódu PIN musí být nejméně %d."</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="7016906583950201704">"Heslo musí mít méně než <xliff:g id="NUMBER">%d</xliff:g> znaků."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Úsporný režim"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Při vypnutém displeji šetřit baterii"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"Nastavování 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Přenosný hotspot Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Zapínání hotspotu…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Vypínání hotspotu…"</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="61237027772641155">"Nastavit hotspot sítě Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <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:"</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_title" msgid="4458091032540874366">"Sen"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Při vložení do doku nebo při nabíjení v režimu spánku"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Při nabíjení v režimu spánku"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Při vložení do doku"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Vypnuto"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Vybraná dekorace"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Vybraný sen"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Čas aktivace"</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="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Spustit při přechodu do režimu spánku"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Spustit při 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>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Verze základního pásma"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verze jádra"</string>
     <string name="build_number" msgid="3075795840572241758">"Číslo sestavení"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stav zabezpečení SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nedostupný"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stav"</string>
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Smazat kartu SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Smaže všechna data v interním úložišti USB, například hudbu a fotografie"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Smaže všechna data na kartě SD, například hudbu nebo fotografie"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funkce MTP nebo PTP je aktivní"</string>
     <string name="read_only" msgid="6702420168629076340">" (Pouze pro čtení)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Odpojit úložiště USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Odpojit kartu SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data úložiště USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinstalovat"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Vypnout"</string>
     <string name="enable_text" msgid="9217362512327828987">"Povolit"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Mazání dat"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Uživatel: <xliff:g id="USER_NAME">%1$s</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>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Hlášení chyb z hlavní nabídky"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Zahrnout v hlavní nabídce možnost k vytvoření zprávy o chybách"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"Zaznamenat zprávu o chybě"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Shromažďuje informace o aktuálním stavu zařízení. Tyto informace je následně možné poslat v e-mailové zprávě, chvíli však potrvá, než bude hlášení o chybě připraveno k odeslání. Buďte prosím trpěliví."</string>
-    <string name="report" msgid="302437572240018342">"Vytvořit zprávu"</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="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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Zobr. aktual. HW vrstev"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Aktualizované HW vrstvy nechat zeleně blikat"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Zakázáno"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Mírné"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Přísné"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Účet pro obsah"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hromadné zasílání zpráv v rámci buňky"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vyberte typy mimořádných upozornění, která chcete zobrazovat."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index cb070bf..bbe3f59 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Oplader"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Aflader"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(trådløs)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Oplader ikke"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Oplader ikke"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Fuld"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Ikke sluttet til"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"trådløs"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Ukendt"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Ukendt"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyen anvendes af browseren, men må ikke bruges af andre apps."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Placering:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mobiloplysninger:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøg:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjeneste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Skift pinkode til at låse op"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Skift adgangskode til at låse op"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Adgangskoden skal være på mindst %d tegn"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Pinkoden skal være på mindst %d tegn"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"Adgangskoden skal være kortere end <xliff:g id="NUMBER">%d</xliff:g> tegn."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Strømbesparelse"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Spar strøm, når skærmen er slukket"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Bærbart Wi-Fi-hotspot"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverer hotspot..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Deaktiverer 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="61237027772641155">"Konfiguration af Wi-Fi-hotspot"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Baggrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vælg baggrund fra"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Skærmdekoration"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Går i dvale, når tilsluttet strøm"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Drøm"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Når enheden er tilsluttet dockingstationen eller i dvale og oplader"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Når enheden er i dvale og oplader"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Når enheden er tilsluttet dockingstationen"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktiveret"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Valgte dekoration"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Valgt drøm"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Hvornår der skal aktiveres"</string>
     <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">"Aktivér også, når tilsluttet dockingstationen"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Aktivér i dvale"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Aktivér, når enheden er 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>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Basebandversion"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernesystem"</string>
     <string name="build_number" msgid="3075795840572241758">"Versionnummer"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgængelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Slet SD-kort"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sletter alle data på det interne USB-lager, f.eks. musik og billeder"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Sletter alle data på telefonens SD-kort, f.eks. musik og billeder"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- eller PTP-funktionen er aktiv"</string>
     <string name="read_only" msgid="6702420168629076340">" (Skrivebeskyttet)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Demonter USB-lager?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Vil du demontere SD-kortet?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-lagringsdata"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Afinstaller"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Deaktiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivér"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ryd data"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Bruger: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjeneste"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjenester"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processer og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjeneste"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Rapporter om fejl i menu til startknap"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Gør det muligt at rapportere fejl i menuen til startknappen"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Der er ingen konto, der i øjeblikket lagrer sikkerhedskopierede data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk gendannelse"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Når du geninstallerer en app, skal du gendanne sikkerhedskopierede indstillinger og data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Lav fejlrapport"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Der indsamles oplysninger om din enheds aktuelle status, der efterfølgende sendes i en e-mail. Der går lidt tid, fra fejlrapporten påbegyndes, til den er klar til at blive sendt. Tak for tålmodigheden."</string>
-    <string name="report" msgid="302437572240018342">"Rapportér"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kode til lokal sikkerhedskopi"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Se opdat. af hardwarelag"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hardwarelag blinker grønt, når de opdateres"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Deaktiveret"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Eftergivende"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Håndhæver"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Konto til indhold"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Foto-id"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobilmeddelelser"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vælg de typer af nødalarmer, der skal vises."</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9e46a36..583898b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Wird geladen"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Akkubetrieb"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(drahtlos)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Wird nicht geladen"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Wird nicht geladen"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Voll"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Nicht angeschlossen"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"drahtlos"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Unbekannt"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Unbekannt"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, darf aber nicht von anderen Apps verwendet werden."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Standort:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Benachbarte CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Netz-Info:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datenversuche:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-Service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Entsperrungs-PIN ändern"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Entsperrungspasswort ändern"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Das Passwort muss mindestens %d Zeichen enthalten."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Die PIN muss mindestens %d Zeichen enthalten."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Die PIN muss mindestens %d Ziffern 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="7016906583950201704">"Das Passwort muss weniger als <xliff:g id="NUMBER">%d</xliff:g> Zeichen haben."</string>
@@ -510,6 +513,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Energie sparen"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Bei ausgeschaltetem Bildschirm Energie sparen"</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>
@@ -529,10 +534,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"WPS wird bereits durchgeführt. Dieser Vorgang 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>
@@ -596,6 +601,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -603,7 +610,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobiler WLAN-Hotspot"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot wird aktiviert…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot wird deaktiviert…"</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="61237027772641155">"WLAN-Hotspot einrichten"</string>
@@ -672,15 +685,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hintergrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Hintergrund auswählen"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Bildschirm-Dekor"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Wird bei Netzanschluss bei Aktivierung des Standby-Modus gestartet"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Traum"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Bei angedocktem Gerät oder im Standby-Modus beim Aufladen"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Im Standby-Modus beim Aufladen"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Bei angedocktem Gerät"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktiviert"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Ausgewähltes Dekor"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Ausgewählter Traum"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Zeitpunkt der Aktivierung"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nie"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Testen"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Auch bei angedocktem Gerät starten"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Bei Aktivierung des Standby-Modus starten"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Bei angedocktem Gerät starten"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Schriftgröße"</string>
@@ -717,6 +733,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-Version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-Version"</string>
     <string name="build_number" msgid="3075795840572241758">"Build-Nummer"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-Status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nicht verfügbar"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -771,6 +788,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD-Karte löschen"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Löscht alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Löscht sämtliche Daten wie Musik und Fotos von der SD-Karte"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- oder PTP-Funktion ist aktiv."</string>
     <string name="read_only" msgid="6702420168629076340">" (schreibgeschützt)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB-Speicher trennen?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD-Karte entnehmen?"</string>
@@ -1002,6 +1020,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-Speicherdaten"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-Karte"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstallieren"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Deaktivieren"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivieren"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Daten löschen"</string>
@@ -1095,6 +1115,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Nutzer: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> Prozess und <xliff:g id="NUMSERVICES">%2$d</xliff:g> Dienst"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> Prozess und <xliff:g id="NUMSERVICES">%2$d</xliff:g> Dienste"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> Prozesse und <xliff:g id="NUMSERVICES">%2$d</xliff:g> Dienst"</string>
@@ -1200,6 +1221,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Fehlerberichte im Menü \"Akku\""</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Fügt die Option für den Fehlerbericht im Menü \"Akku\" hinzu"</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>
@@ -1417,9 +1440,6 @@
     <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">"Nach der Neuinstallation einer App gesicherte Einstellungen und Daten wiederherstellen"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Fehlerbericht abrufen"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Bei diesem Fehlerbericht werden Daten zum aktuellen Status Ihres Geräts gesammelt und als E-Mail versandt. Vom Start des Berichts bis zu seinem Versand kann es eine Weile dauern. Bitte haben Sie Geduld."</string>
-    <string name="report" msgid="302437572240018342">"Starten"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop-Sicherungspasswort"</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>
@@ -1549,6 +1569,8 @@
     <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">"Updates m. GPU-Ansicht"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash-Ansicht im Fenster, wenn mit GPU dargestellt"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Hardwareebenen-Updates abrufen"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hardwareebenen blinken beim Aktualisieren grün."</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>
@@ -1668,6 +1690,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1686,6 +1716,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Deaktiviert"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Moderat"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Strikt"</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>
@@ -1704,6 +1737,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Konto für Inhalte"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wählen Sie aus, welche Notfallbenachrichtigungen angezeigt werden sollen."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3c78b92..802350e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Φόρτιση"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Αποφόρτιση"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ασύρματο)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Δεν φορτίζει"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Δεν φορτίζει"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Πλήρης"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Αποσυνδέθηκε"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"ασύρματο"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Άγνωστος"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Άγνωστο"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"Πληροφορίες κελιού:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Προσπάθειες δεδομένων:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Υπηρεσία GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Περιαγωγή:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Αλλαγή αριθμού PIN ξεκλειδώματος"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Αλλαγή κωδικού πρόσβασης ξεκλειδώματος"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d χαρακτήρες"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Ο αριθμός PIN πρέπει να έχει τουλάχιστον %d χαρακτήρες"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Ο κωδικός 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="7016906583950201704">"Ο κωδικός πρόσβασης πρέπει να περιέχει λιγότερους από <xliff:g id="NUMBER">%d</xliff:g> χαρακτήρες."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Εξοικονόμηση ενέργειας"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Εξοικονόμηση ενέργειας όταν η οθόνη είναι απενεργοποιημένη"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Εισαγάγετε το 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_in_progress" msgid="3372311348221357944">"Η ρύθμιση 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Ενεργοποίηση σημείου πρόσβασης…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Απενεργοποίηση σημείου πρόσβασης…"</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="61237027772641155">"Ρύθμιση φορητού σημείου πρόσβασης Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Θα ξεκινήσει όταν εισέλθει σε αδράνεια, εφόσον είναι συνδεδεμένο στο ρεύμα"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Όνειρο"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Κατά τη σύνδεση ή κατά την αναστολή λειτουργίας και τη φόρτιση"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Κατά την αναστολή λειτουργίας και τη φόρτιση"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Κατά τη σύνδεση"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Απενεργοποιημένη"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Επιλεγμένη διακόσμηση"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Έχει επιλεγεί όνειρο"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Χρόνος ενεργοποίησης"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> σε αδράνεια"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ποτέ"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Δοκιμάστε το!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Επίσης να εκκινείται όταν είναι στη βάση σύνδεσης"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Έναρξη κατά την αναστολή λειτουργίας"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Έναρξη κατά τη σύνδεση"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Μέγεθος γραμματοσειρ."</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Έκδοση βασικού φάσματος"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Έκδοση Kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Αριθμός έκδοσης"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Κατάσταση SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Δεν είναι διαθέσιμο"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Κατάσταση"</string>
     <string name="device_status" msgid="607405385799807324">"Κατάσταση"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Διαγραφή κάρτας SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Διαγραφή των δεδομένων στον εσωτερικό χώρο USB όπως μουσική και φωτογραφίες"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Διαγράφει όλα τα δεδ. που υπάρχουν στην κάρτα SD, όπως αρχ. μουσ. και φωτογ."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Η λειτουργία MTP ή PTP είναι ενεργή"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Εφαρμογή χώρου αποθήκευσης USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Κάρτα SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Κατάργηση εγκατάστασης"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Απενεργοποίηση"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ενεργοποίηση"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Εκκαθάριση δεδομένων"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Χρήστης: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> διεργασία και <xliff:g id="NUMSERVICES">%2$d</xliff:g> υπηρεσία"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> διεργασία και <xliff:g id="NUMSERVICES">%2$d</xliff:g> υπηρεσίες"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> διεργασίες και <xliff:g id="NUMSERVICES">%2$d</xliff:g> υπηρεσία"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Αναφορές σφαλμάτων μενού λειτουργίας"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Συμπερίληψη επιλογής στο μενού λειτουργίας για λήψη αναφοράς σφαλμάτων"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"Λήψη αναφοράς σφάλματος"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Θα συλλέξει πληροφορίες σχετικά με την τρέχουσα κατάσταση της συσκευής σας και θα τις στείλει μέσω μηνύματος ηλεκτρονικού ταχυδρομείου. Απαιτείται λίγος χρόνος για τη σύνταξη της αναφοράς σφάλματος και την αποστολή της. Κάντε λίγη υπομονή."</string>
-    <string name="report" msgid="302437572240018342">"Αναφορά"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Κωδ.πρόσβ.αντ.ασφ.επιφ.εργ."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας δεν προστατεύονται αυτήν τη στιγμή"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Αγγίξτε για αλλαγή ή κατάργηση του κωδικού πρόσβασης για τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Εμφ. ενημ. επιπ. υλικού"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Επισήμ. επιπέδων υλικού με πράσινο κατά την ενημ."</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>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Προσθήκη προφίλ VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Επεξεργασία προφίλ"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Διαγραφή προφίλ"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Απενεργοποιημένο"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Ανεκτικό"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Επιβολή"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Λογαριασμός για περιεχόμενο"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Αναγνωριστικό φωτογραφίας"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Εκπομπές κινητής τηλεφωνίας"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Επιλέξτε τους τύπους ειδοποιήσεων έκτακτης ανάγκης που θα εμφανίζονται."</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 86ae423..93e46ac 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Discharging"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Not charging"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Unplugged"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wireless"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Unknown"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Unknown"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Data attempts:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Password must be at least %d characters"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN must be at least %d characters"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"Password must be fewer than <xliff:g id="NUMBER">%d</xliff:g> characters."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Power save"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Save power when screen is turned off"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable Wi-Fi hotspot"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Turning hotspot on…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Turning off 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="61237027772641155">"Set up Wi-Fi hotspot"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Choose wallpaper from"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Will start upon sleep if connected to power"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"When docked or asleep and charging"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"When asleep and charging"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"When docked"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Disabled"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Selected candy"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Selected dream"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"When to activate"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> spent idle"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Never"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Try it!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Also start when docked"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Start on sleep"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Start when docked"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Font size"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel version"</string>
     <string name="build_number" msgid="3075795840572241758">"Build number"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Not available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Erase SD card"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Erases all data on the internal USB storage, such as music and photos"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Erases all data on the SD card, such as music and photos"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP or PTP function is active"</string>
     <string name="read_only" msgid="6702420168629076340">" (Read-only)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Unmount USB storage"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Unmount SD card?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB storage data"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD card"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Uninstall"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Disable"</string>
     <string name="enable_text" msgid="9217362512327828987">"Enable"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Clear data"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"User: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process and <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process and <xliff:g id="NUMSERVICES">%2$d</xliff:g> services"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processes and <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Power menu bug reports"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Include option in power menu for taking a bug report"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"No account is currently storing backed up data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed up settings and data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Take bug report"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"This will collect information about your current device state, to send as an e-mail message. It will take a little time from starting the bug report until it is ready to be sent; please be patient."</string>
-    <string name="report" msgid="302437572240018342">"Report"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop backup password"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Show hardware layers updates"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Flash hardware layers green when they update"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Account for content"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobile broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Select the types of emergency alerts to display."</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ac7cfde..e7bb64e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Batería en uso"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(conexiones inalámbricas)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"No se está cargando."</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se realiza la carga"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Cargada"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desconectado"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"conexiones inalámbricas"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconocido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconocido"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID cercano:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servicio GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar la contraseña de desbloqueo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contraseña debe tener al menos %d caracteres."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe tener al menos %d caracteres."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN debe tener al menos %d dígitos."</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="7016906583950201704">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -509,6 +512,8 @@
     <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">"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_suspend_optimizations" msgid="7104856682836591734">"Ahorro de energía"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Ahorrar energía cuando la pantalla esté apagada"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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 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_in_progress" msgid="3372311348221357944">"El proceso de configuración de WPS está en curso y puede tardar hasta dos minutos."</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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona…"</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="61237027772641155">"Configurar la zona Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <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">"Elegir fondo de pantalla de"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Pantalla de caramelo"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Se iniciará luego de que la pantalla se desactive, siempre que exista una conexión eléctrica."</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Sueño"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Cuando se conecte el dispositivo, o cuando se encuentre en suspensión y cargándose"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Cuando el dispositivo se encuentre en suspensión y cargándose"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Cuando se conecte el dispositivo"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inhabilitado"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Caramelo seleccionado"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Sueño seleccionado"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Tiempo de espera para la activación"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Luego de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Pruébalo."</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Activar también cuando el dispositivo esté conectado"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar cuando el dispositivo esté en suspensión"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar cuando se conecte el dispositivo"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versión de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versión de núcleo"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilación"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Estado de SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Eliminar la tarjeta SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Borra todos los datos del almacenamiento USB interno, como la música y las fotos"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Borra todos los datos de la tarjeta SD, como la música y las fotos"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La función MTP o PTP está activa."</string>
     <string name="read_only" msgid="6702420168629076340">" (Sólo lectura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"¿Desactivar almac. USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"¿Desactivar tarjeta SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Datos en el almacenamiento USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Tarjeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar..."</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Inhabilitar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Eliminar datos"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Usuario: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Informes de errores en el menú de encendido"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opción de realizar un informe de errores en el menú de encendido"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ninguna cuenta está almacenando datos con copia de seguridad."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurar automáticamente"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Al reinstalar se restablece la configuración con copia de seguridad."</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Iniciar informe de errores"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Se recopilarán diferentes datos acerca del estado actual de tu dispositivo y se enviarán como un mensaje de correo. Ten paciencia, el informe de errores demorará un tiempo en enviarse luego de ser iniciado."</string>
-    <string name="report" msgid="302437572240018342">"Informe"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contr. copia segur. escr."</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Actualiz. capas hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Luz verde en capas de hardware al actualizarse"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Desactivado"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisivo"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatorio"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Emisiones móviles"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia para mostrar."</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1371907..cc76e3b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando..."</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"No se está cargando"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(conexiones inalámbricas)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"No se está cargando."</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se está cargando."</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Completa"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"No se está cargando"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"conexiones inalámbricas"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconocido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconocido"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utiliza el proxy HTTP, pero no puede utilizarlo otras aplicaciones."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID anexo"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servicio GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerancia:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar contraseña de desbloqueo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contraseña debe contener al menos %d caracteres."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe contener al menos %d caracteres."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN debe contener como mínimo %d dígitos."</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="7016906583950201704">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Ahorro de energía"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Ahorrar energía cuando la pantalla esté apagada"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"El proceso de configuración de WPS está en curso y puede tardar hasta 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona Wi-Fi en…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona Wi-Fi…"</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="61237027772641155">"Configurar zona Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<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>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Salvapantallas"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Se iniciará cuando el dispositivo entre en suspensión si está conectado a la corriente"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Cuando el dispositivo esté conectado o inactivo y cargando"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Cuando el dispositivo esté inactivo y cargando"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Cuando el dispositivo esté conectado"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inhabilitado"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Caramelo seleccionado"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Módulo dream seleccionado"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Cuándo activar"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Probar"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Iniciar también cuando el dispositivo esté conectado"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar cuando se suspenda el dispositivo"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar cuando el dispositivo esté conectado"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versión de banda base"</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="selinux_status" msgid="6212165375172061672">"Estado de SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
@@ -770,6 +787,7 @@
     <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 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="mtp_ptp_mode_summary" msgid="3710436114807789270">"La función MTP o PTP está activa."</string>
     <string name="read_only" msgid="6702420168629076340">" (Solo lectura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"¿Desactivar almacenamiento USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"¿Desactivar tarjeta SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Datos en almacen. USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Tarjeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Inhabilitar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Habilitar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Borrar datos"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Usuario: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
@@ -1199,6 +1220,8 @@
     <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">"Activar el modo de depuración cuando el dispositivo está conectado por USB"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Informes de error en el menú de encendido"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opción en el menú de encendido para recopilar un informe de error"</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 si el dispositivo se está cargando"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ninguna cuenta está almacenando datos con copia de seguridad en estos momentos."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cuando vuelvas a instalar una aplicación, restaurar la configuración y los datos incluidos en la copia"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Hacer informe de errores"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Se recopilará información sobre el estado actual de tu dispositivo, que se enviará por correo electrónico. Pasarán unos minutos desde que se inicie el informe de errores hasta que se envíe, por lo que te recomendamos que tengas paciencia."</string>
-    <string name="report" msgid="302437572240018342">"Informe"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contraseña copias 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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Mostrar actualizaciones de capas de hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Iluminar capas de hardware en verde al actualizarse"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Inhabilitado"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisivo"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatorio"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Difusiones móviles"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia que quieres ver."</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 5d3253c..aa40f78 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Laadimine"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(VV)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Tühjakslaadimine"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(traadita võrk)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Ei lae"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ei lae"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Täis"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Ühenduseta"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"traadita võrk"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC + USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Tundmatu"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Tundmatu"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Asukoht:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Külgnev CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Kärjeinfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Andmete katsed:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-teenus:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Rändlus:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuda avamise PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Avamisparooli muutmine"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parool peab olema vähemalt %d tähemärgi pikkune"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koodis peab olema vähemalt %d tähemärki"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koodi pikkus peab olema vähemalt %d numbrit"</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="7016906583950201704">"Parool peab olema lühem kui <xliff:g id="NUMBER">%d</xliff:g> märki."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Energia säästmine"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Säästab energiat, kui ekraan on välja lülitatud"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Sisestage WiFi-ruuteril PIN-kood <xliff:g id="NUMBER">%1$s</xliff:g>. Seadistuse lõpuleviimiseks 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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kantav WiFi-tööpunkt"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Leviala sisselülitamine ..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Leviala väljalülitamine ..."</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="61237027772641155">"WiFi leviala seadistamine"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustapilt"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Taustapildi valimine:"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekraanikaunistus"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Kui seade on vooluvõrgus, rakendub ekraanisäästja pärast unerežiimi lülitumist"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Uni"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kui on dokitud või puhkerežiimis ja laeb"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kui on puhkerežiimis ja laeb"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kui on dokitud"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Keelatud"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Valitud kaunistus"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Valitud uni"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktiveerimisaeg"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pärast seda, kui seade on olnud tegevusetu <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mitte kunagi"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Proovige"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Rakendub ka siis, kui seade on dokitud"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Käivitu puhkerežiimis"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Käivitu siis, kui seade on dokitud"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fondi suurus"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Põhiribaversioon"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Tuuma versioon"</string>
     <string name="build_number" msgid="3075795840572241758">"Järgunumber"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinuxi olek"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Pole saadaval"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Olek"</string>
     <string name="device_status" msgid="607405385799807324">"Olek"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Kustuta SD-kaart"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sisemisest USB-mäluseadmest kõikide andmete, nagu muusika ja fotode, kustutamine"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Kustutab SD-kaardilt kõik andmed, nagu muusika ja fotod"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP või PTP funktsioon on aktiivne"</string>
     <string name="read_only" msgid="6702420168629076340">" (Kirjutuskaitstud)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Kas lahutada USB-seade?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Kas lahutada SD-kaart?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-mäluseadme andmed"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kaart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalli"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Keela"</string>
     <string name="enable_text" msgid="9217362512327828987">"Luba"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Kustuta andmed"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Kasutaja: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> protsess ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> teenus"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> protsess ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> teenust"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> protsessi ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> teenus"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Toitemenüü veaaruanded"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Kaasa toitemenüüs veaaruande tegemise valik"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ühelegi kontole ei ole praegu salvestatud varundatud andmeid"</string>
     <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="bugreport_title" msgid="1009498799922543551">"Veaaruande võtmine"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Nii kogutakse teavet teie praeguse seadme oleku kohta, et meilisõnum saata. Enne kui saate veaaruande ära saata, võtab selle loomine natuke aega; varuge kannatust."</string>
-    <string name="report" msgid="302437572240018342">"Aruanne"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Arvutivarunduse parool"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Kuva riistv. kiht. värsk."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Riistvara kihid vilguvad värskendamisel roheliselt"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Keelatud"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Lubav"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Jõustumisel"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Sisu konto"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Foto ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Kärjeteated"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valige kuvamiseks hädaolukorra märguannete tüübid."</string>
 </resources>
diff --git a/res/values-fa-nokeys/strings.xml b/res/values-fa-nokeys/strings.xml
index 282556f..2542210 100644
--- a/res/values-fa-nokeys/strings.xml
+++ b/res/values-fa-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-fa/arrays.xml b/res/values-fa/arrays.xml
index 4c6b973..e1b40cb 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -30,34 +30,34 @@
     <item msgid="8392017019801393511">"همه"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 ثانیه"</item>
-    <item msgid="8881760709354815449">"30 ثانیه"</item>
-    <item msgid="7589406073232279088">"1 دقیقه قبل"</item>
-    <item msgid="7001195990902244174">"2 دقیقه"</item>
-    <item msgid="7489864775127957179">"5 دقیقه"</item>
-    <item msgid="2314124409517439288">"10 دقیقه"</item>
-    <item msgid="6864027152847611413">"30 دقیقه"</item>
+    <item msgid="3342301044271143016">"۱۵ ثانیه"</item>
+    <item msgid="8881760709354815449">"۳۰ ثانیه"</item>
+    <item msgid="7589406073232279088">"۱ دقیقه قبل"</item>
+    <item msgid="7001195990902244174">"۲ دقیقه"</item>
+    <item msgid="7489864775127957179">"۵ دقیقه"</item>
+    <item msgid="2314124409517439288">"۱۰ دقیقه"</item>
+    <item msgid="6864027152847611413">"۳۰ دقیقه"</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"هیچوقت"</item>
-    <item msgid="2194151041885903260">"15 ثانیه"</item>
-    <item msgid="5892295237131074341">"30 ثانیه"</item>
-    <item msgid="3538441365970038213">"1 دقیقه"</item>
-    <item msgid="412343871668955639">"2 دقیقه"</item>
-    <item msgid="5076853889688991690">"5 دقیقه"</item>
-    <item msgid="1903860996174927898">"10 دقیقه"</item>
-    <item msgid="6415509612413178727">"30 دقیقه"</item>
+    <item msgid="2194151041885903260">"۱۵ ثانیه"</item>
+    <item msgid="5892295237131074341">"۳۰ ثانیه"</item>
+    <item msgid="3538441365970038213">"۱ دقیقه"</item>
+    <item msgid="412343871668955639">"۲ دقیقه"</item>
+    <item msgid="5076853889688991690">"۵ دقیقه"</item>
+    <item msgid="1903860996174927898">"۱۰ دقیقه"</item>
+    <item msgid="6415509612413178727">"۳۰ دقیقه"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"فوری"</item>
-    <item msgid="6736512735606834431">"5 ثانیه"</item>
-    <item msgid="8044619388267891375">"15 ثانیه"</item>
-    <item msgid="1822002388249545488">"30 ثانیه"</item>
-    <item msgid="8538071621211916519">"1 دقیقه"</item>
-    <item msgid="5663439580228932882">"2 دقیقه"</item>
-    <item msgid="49888496216106852">"5 دقیقه"</item>
-    <item msgid="9002737361305019353">"10 دقیقه"</item>
-    <item msgid="4322676235684793329">"30 دقیقه"</item>
+    <item msgid="6736512735606834431">"۵ ثانیه"</item>
+    <item msgid="8044619388267891375">"۱۵ ثانیه"</item>
+    <item msgid="1822002388249545488">"۳۰ ثانیه"</item>
+    <item msgid="8538071621211916519">"۱ دقیقه"</item>
+    <item msgid="5663439580228932882">"۲ دقیقه"</item>
+    <item msgid="49888496216106852">"۵ دقیقه"</item>
+    <item msgid="9002737361305019353">"۱۰ دقیقه"</item>
+    <item msgid="4322676235684793329">"۳۰ دقیقه"</item>
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"کوچک"</item>
@@ -85,7 +85,7 @@
     <item msgid="8513729475867537913">"در حال اتصال…"</item>
     <item msgid="515055375277271756">"در حال تأیید اعتبار..."</item>
     <item msgid="1943354004029184381">"در حال دریافت آدرس IP..."</item>
-    <item msgid="4221763391123233270">"اتصال برقرار شد"</item>
+    <item msgid="4221763391123233270">"متصل"</item>
     <item msgid="624838831631122137">"معلق"</item>
     <item msgid="7979680559596111948">"در حال قطع اتصال..."</item>
     <item msgid="1634960474403853625">"اتصال قطع شد"</item>
@@ -133,9 +133,9 @@
     <item msgid="2330782789550628803">"خارج از محدوده"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 دقیقه"</item>
-    <item msgid="8675215713017289017">"5 دقیقه"</item>
-    <item msgid="477015974247590543">"1 ساعت"</item>
+    <item msgid="8151962652413645395">"۲ دقیقه"</item>
+    <item msgid="8675215713017289017">"۵ دقیقه"</item>
+    <item msgid="477015974247590543">"۱ ساعت"</item>
     <item msgid="5198271470953124739">"بدون مهلت زمانی"</item>
   </string-array>
   <string-array name="wifi_signal">
@@ -207,7 +207,7 @@
     <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>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7112710..2311c5e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"شارژ کردن"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"در حال خالی شدن"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(بی‌سیم)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"شارژ نمی‌شود"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"شارژ نمی‌شود"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"پر"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"جدا کردن از پریز"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"بی‌سیم"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"ناشناس"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"ناشناس"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"تلاش‌های داده:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"سرویس GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"رومینگ:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغییر پین بازگشایی قفل"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغییر رمز ورود بازگشایی قفل"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"رمز ورود باید حداقل %d نویسه باشد"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"پین باید حداقل %d نویسه باشد"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"پین باید حداقل %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="7016906583950201704">"گذرواژه باید کمتر از <xliff:g id="NUMBER">%d</xliff:g> نویسه باشد."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"صرفه‌جویی در مصرف انرژی"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"هنگامی که صفحه خاموش است، در مصرف انرژی صرفه جویی شود"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"پین <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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطه اتصال Wi-Fi قابل حمل"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"در حال روشن کردن نقطه اتصال…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"در حال خاموش کردن نقطه اتصال…"</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="61237027772641155">"تنظیم نقطه اتصال Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"در صورت اتصال به برق، از حالت خواب شروع به کار می‌کند"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"رؤیا"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"هنگام قرار گرفتن در جایگاه یا خواب و شارژ شدن"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"هنگام خواب و شارژ شدن"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"هنگام قرار گرفتن در جایگاه"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"غیرفعال شد"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"آب نبات انتخابی"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"رؤیای انتخابی"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"چه وقت فعال شود"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"پس از <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> عدم استفاده"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"هرگز"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"امتحان کنید!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"هنگام قرارگرفتن در جایگاه نیز آغاز شود"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"شروع در زمان خواب"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"شروع هنگام قرار گرفتن در جایگاه"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
     <string name="title_font_size" msgid="4405544325522105222">"اندازهٔ قلم"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"اندازهٔ قلم"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"نسخهٔ باند پایه"</string>
     <string name="kernel_version" msgid="9192574954196167602">"نسخهٔ اصلی"</string>
     <string name="build_number" msgid="3075795840572241758">"شمارهٔ ساخت"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"وضعیت SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"موجود نیست"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"وضعیت"</string>
     <string name="device_status" msgid="607405385799807324">"وضعیت"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"پاک کردن کارت SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"پاک کردن همه داده‌های موجود در حافظهٔ USB داخلی مانند موسیقی و عکس"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"همه داده‌های موجود در کارت SD مانند موسیقی و عکس‌ها را پاک می‌کند"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"عملکرد MTP یا PTP فعال است"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"داده‌های ذخیره‌سازی USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"کارت SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"حذف نصب"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"غیرفعال کردن"</string>
     <string name="enable_text" msgid="9217362512327828987">"فعال کردن"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"پاک کردن داده‌ها"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"کاربر: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> فرآیند و <xliff:g id="NUMSERVICES">%2$d</xliff:g> سرویس"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> فرآیند و <xliff:g id="NUMSERVICES">%2$d</xliff:g> سرویس"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> فرآیند و <xliff:g id="NUMSERVICES">%2$d</xliff:g> سرویس"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"گزارش‌های اشکال در منوی نیرو"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"گزینه‌ای در منوی نیرو برای گرفتن گزارش اشکال اضافه شود"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"گرفتن گزارش مشکل"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"اطلاعات مربوط به وضعیت دستگاه کنونی شما را جمع‌آوری می‌کند تا به صورت یک پیام ایمیل ارسال شود. از زمان شروع گزارش اشکال تا آماده شدن برای ارسال اندکی زمان می‌برد؛ لطفاً صبور باشید."</string>
-    <string name="report" msgid="302437572240018342">"گزارش"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"گذرواژه نسخهٔ پشتیبان دسک‌تاپ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"نسخه‌های پشتیبان کامل دسک‌تاپ در حال حاضر محافظت نمی‌شوند"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"برای تغییر یا حذف گذرواژه برای نسخه‌های پشتیبان کامل دسک‌تاپ لمس کنید"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"نمایش به‌روزرسانی‌های لایه‌های سخت‌افزار"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"وقتی لایه‌های سخت‌افزاری به‌روزرسانی‌ می‌شوند، به رنگ سبز درآیند"</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>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"افزودن نمایه VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"ویرایش نمایه"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"حذف نمایه"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"غیرفعال"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"مجاز"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"در حال اعمال"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"حساب برای محتوا"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"کارت شناسایی عکس‌دار"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"پخش‌های سلولی"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"انواع هشدارهای اضطراری را برای نمایش انتخاب کنید."</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index bcd9b48..d7e7cbf 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Ladataan"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Tyhjennetään akkua"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(langaton)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Ei laturissa"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ei laturissa"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Täynnä"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Irrotettu laturista"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"langaton"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Tuntematon"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Tuntematon"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Sijainti:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naapuri-CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tiedonsiirtoyrityksiä:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-palvelu:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <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 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_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"Salasanan on oltava lyhyempi kuin <xliff:g id="NUMBER">%d</xliff:g> merkkiä."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Virransäästö"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Säästä virtaa, kun ruutu sammutetaan"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Näppäile wifi-reitittimen pin-koodi <xliff:g id="NUMBER">%1$s</xliff:g>. 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_in_progress" msgid="3372311348221357944">"WPS on jo käynnissä ja 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kannettava wifi-yhteyspiste"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Otetaan yhteyspiste käyttöön..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Poistetaan yhteyspiste käytöstä..."</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="61237027772641155">"Luo wifi-hotspot"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Valitse taustakuva"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Käynnistyy virransäästötilassa, jos virta on päällä"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Unelma"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Telakoituna tai virransäästötilassa ja ladattessa"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Virransäästötilassa ja ladattessa"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Telakoituna"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Ei käytössä"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Candy valittu"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Valittu unelma"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Käyttöönottoaika"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ei koskaan"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Kokeile!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Käynnistä myös telakoituna"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Käynnistä virransäästötilassa"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Käynnistä telakoituna"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Kirjasinkoko"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-versio"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-versio"</string>
     <string name="build_number" msgid="3075795840572241758">"Ohjelmistoversion numero"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-tila"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ei käytettävissä"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Tila"</string>
     <string name="device_status" msgid="607405385799807324">"Tila"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Tyhjennä SD-kortti"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Poistaa kaikki sisäisen USB-tallennustilan tiedot, kuten musiikin tai valokuvat."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Poistaa kaikki SD-kortin tiedot, kuten musiikin ja valokuvat"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- tai PTP-toiminto on käytössä"</string>
     <string name="read_only" msgid="6702420168629076340">" (Vain luku)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Poista USB-tila käytöstä?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Poistetaanko SD-kortti käytöstä?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-tallennustilan tiedot"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kortti"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Poista"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Poista käytöstä"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ota käyttöön"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Tyhjennä tiedot"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Käyttäjä: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosessi ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> palvelu"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosessi ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> palvelua"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosessia ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> palvelu"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Virheraportit virtavalikossa"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Lisää virtavalikkoon virheraportin teko -valinta"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Mikään tili ei tällä hetkellä tallenna varmuuskopioituja tietoja"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaattinen palauttaminen"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Palauta varmuuskopioidut asetukset ja tiedot, kun sovellus asennetaan uudelleen."</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Luo virheraportti"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Toiminto kerää tietoja nykyisestä laitteen tilasta ja lähettää ne sähköpostitse. Kestää hetken aikaa, ennen kuin virheraportti on valmis lähetettäväksi, ole kärsivällinen."</string>
-    <string name="report" msgid="302437572240018342">"Luo raportti"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Varmuuskop. salasana"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Näytä laitt.tason päiv."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Näytä laitteistotasot vihreinä niiden päivittyessä"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Ei käytössä"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Salliva"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Täytäntöönpano"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Käytettävä tili"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Kuvatunnus"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcast -lähetykset"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valitse näytettävät hätäilmoitukset."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6a2383b..90f3f96 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Batterie en charge"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Baisse du niveau de charge"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sans fil)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"N\'est pas en charge"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Débranchée"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Chargée"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Débranché"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"sans fil"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA + USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Inconnu"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Inconnu"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Infos sur la cellule :"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentatives :"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Service GPRS :"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinérance :"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le code PIN de déverrouillage"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Le mot de passe doit comporter au moins %d caractères."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Le code PIN doit comporter au moins %d caractères."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Le code PIN doit comporter au moins %d chiffres."</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="7016906583950201704">"Le mot de passe doit comporter moins de <xliff:g id="NUMBER">%d</xliff:g> caractères."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Économie d\'énergie"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Économiser de l\'énergie lorsque l\'écran est éteint"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Activation du point d\'accès Wi-Fi en cours…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Désactivation du point d\'accès Wi-Fi en cours…"</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="61237027772641155">"Configurer le point d\'accès Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sélectionner fond d\'écran dans"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Économiseur d\'écran"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Activer à la mise en veille, si l\'appareil est branché"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Rêve"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Lorsque l\'appareil est installé sur la station d\'accueil ou lorsqu\'il est en veille et en charge"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Lorsque l\'appareil est en veille et en charge"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Lorsque l\'appareil est installé sur la station d\'accueil"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Désactivé"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Économiseur sélectionné"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Rêve sélectionné"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Délai d\'activation"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Jamais"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Essayer"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Activer également lorsque l\'appareil est installé dans la station d\'accueil"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Activer lorsque l\'appareil est en veille"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Activer lorsque l\'appareil est installé sur la station d\'accueil"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Taille de police"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Version de bande de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Version du noyau"</string>
     <string name="build_number" msgid="3075795840572241758">"Numéro de build"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"État SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Non disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"État"</string>
     <string name="device_status" msgid="607405385799807324">"État"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Effacer la carte SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Effacer les données de la mémoire de stockage USB interne (ex. : musique, photos)"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Effacer toutes les données de la carte SD, telles que la musique et les photos"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La fonctionnalité MTP ou PTP est active."</string>
     <string name="read_only" msgid="6702420168629076340">" (Lecture seule)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Désinstaller mémoire USB ?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Désinstaller la carte SD ?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Données sur USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Carte SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Désinstaller"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Désactiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activer"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Effacer les données"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Utilisateur : <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> services"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Rapports de bug du menu de démarrage"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclure une option permettant d\'établir un rapport de bug dans le menu de démarrage"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Aucun compte ne stocke actuellement des données sauvegardées."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restaurer automatiquement"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Lors de la réinstallation d\'une application, restaurer les paramètres et les données sauvegardées"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Établir un rapport de bug"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Cela permet de recueillir des informations concernant l\'état actuel de votre appareil, qui sont ensuite envoyées sous forme d\'e-mail. Merci de patienter pendant la préparation du rapport de bug. Cette opération peut prendre quelques instants."</string>
-    <string name="report" msgid="302437572240018342">"Générer le rapport"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Mot de passe sauvegarde PC"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les sauvegardes complètes sur PC ne sont pas protégées actuellement."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Appuyez pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes complètes sur PC."</string>
@@ -1548,6 +1568,8 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Faire clignoter les surfaces à chaque 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">"Faire clignoter les éléments dessinés avec le GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Mises à jour couches mat."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Couches matérielles en vert une fois mises à jour"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Désact. superpos. matér."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser le GPU pour la composition écran"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Activer les traces"</string>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1687,6 +1717,9 @@
     <!-- 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="selinux_status_disabled" msgid="924551035552323327">"Désactivé"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissif"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Application"</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>
@@ -1705,6 +1738,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Compte pour contenu"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Diffusions cellulaires"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Sélectionnez les types d\'alertes d\'urgence à afficher."</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 2128f67..29600d3 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"चार्ज हो रही है"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"डिस्‍चार्ज हो रही है"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(वायरलेस)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"चार्ज नहीं हो रही है"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"चार्ज नहीं हो रही है"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"भरी"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"अनप्लग किया गया"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"वायरलेस"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"अज्ञात"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"अज्ञात"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"सेल जानकारी:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"डेटा प्रयास:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS सेवा:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"रोमिंग:"</string>
@@ -291,7 +294,7 @@
     <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" 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>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदलें"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलॉक पासवर्ड बदलें"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"पासवर्ड में कम से कम %d वर्ण होने चाहिए"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"पिन में कम से कम %d वर्ण होने चाहिए"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"पासवर्ड <xliff:g id="NUMBER">%d</xliff:g> से कम वर्णों का होना चाहिए."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"पावर बचत"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"स्क्रीन के बंद होने पर पावर बचाएं"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"अपने 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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"पोर्टेबल Wi-Fi हॉट स्‍पॉट"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्‍पॉट को चालू किया जा रहा है…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्‍पॉट को बंद किया जा रहा है…"</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="61237027772641155">"Wi-Fi हॉटस्‍पॉट सेट करें"</string>
@@ -666,20 +679,23 @@
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"टेबलेट घुमाने पर स्‍वचालित रूप से अभिविन्‍यास स्‍विच करें"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"फ़ोन घुमाने पर अभिविन्‍यास स्‍वचालित रूप से स्‍विच करें"</string>
     <string name="brightness" msgid="2354961343555249270">"चमक"</string>
-    <string name="brightness_summary" msgid="838917350127550703">"स्‍क्रीन की चमक समायोजित करें"</string>
+    <string name="brightness_summary" msgid="838917350127550703">"स्‍क्रीन की चमक एडजस्ट करें"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"यहां से वॉलपेपर चुनें:"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"स्क्रीन कैंडी"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"निष्क्रिय मोड में पावर से कनेक्‍ट होने पर प्रारंभ हो जाएगा"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"स्वप्न"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"डॉक किए जाने या निष्क्रिय और चार्ज होने पर"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"निष्क्रिय और चार्ज होने पर"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"डॉक किए जाने पर"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"अक्षम"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"चयनित कैंडी"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"चयनित स्‍वप्न"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"कब सक्रिय करें"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> निष्क्रिय रहने के बाद"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"कभी नहीं"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"इसे आज़माएं!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"डॉक किए जाने पर भी प्रारंभ करें"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"निष्क्रिय होने पर प्रारंभ करें"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"डॉक किए जाने पर प्रारंभ करें"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"स्‍वचालित चमक"</string>
     <string name="title_font_size" msgid="4405544325522105222">"फ़ॉन्ट आकार"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"फ़ॉन्ट आकार"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband संस्‍करण"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel संस्‍करण"</string>
     <string name="build_number" msgid="3075795840572241758">"बिल्‍ड नबंर"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux स्‍थिति"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"उपलब्ध नहीं"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"स्थिति"</string>
     <string name="device_status" msgid="607405385799807324">"स्थिति"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD कार्ड मिटाएं"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"आंतरिक USB संग्रहण का सभी डेटा मिटाता है, जैसे संगीत और फ़ोटो"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD कार्ड का सभी डेटा मिटाता है, जैसे संगीत और फ़ोटो"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP या PTP प्रकार्य सक्रिय है"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB संग्रहण डेटा"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD कार्ड"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"अनइंस्टॉल करें"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"अक्षम करें"</string>
     <string name="enable_text" msgid="9217362512327828987">"सक्षम करें"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"डेटा साफ़ करें"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"उपयोगकर्ता: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया और <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया और <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवाएं"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रियाएं और <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"पावर मेनू बग रिपोर्ट"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"बग रिपोर्ट लेने के लिए पावर मेनू में विकल्‍प शामिल करें"</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>
@@ -1280,7 +1303,7 @@
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास विवरण"</string>
     <string name="details_title" msgid="3792801565213935385">"विवरणों का उपयोग करें"</string>
     <string name="details_subtitle" msgid="32593908269911734">"विवरणों का उपयोग करें"</string>
-    <string name="controls_subtitle" msgid="390468421138288702">"पावर उपयोग समायोजित करें"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"पावर उपयोग एडजस्ट करें"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"शामिल पैकेज"</string>
     <string name="power_screen" msgid="3023346080675904613">"स्क्रीन"</string>
     <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"बग रिपोर्ट लें"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"ईमेल संदेश के रूप में भेजने के लिए, इसके द्वारा आपके उपकरण की वर्तमान स्थिति के बारे में जानकारी एकत्रित की जाएगी. बग रिपोर्ट प्रारंभ करने से लेकर भेजने के लिए तैयार करने में कुछ समय लगेगा; कृपया धैर्य रखें."</string>
-    <string name="report" msgid="302437572240018342">"रिपोर्ट"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्‍कटॉप बैकअप पासवर्ड"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्‍कटॉप पूर्ण बैकअप वर्तमान में सुरक्षित नहीं हैं"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटॉप के पूर्ण बैकअप के पासवर्ड को बदलने या निकालने के लिए स्‍पर्श करें."</string>
@@ -1549,6 +1569,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"हार्डवेयर लेयर अप. दिखाएं"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"हार्डवेयर लेयर अपडेट होने पर हरे फ़्लैश होते हैं"</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>
@@ -1668,6 +1690,14 @@
     <string name="vpn_create" msgid="5628219087569761496">" VPN प्रोफ़ाइल जोड़ें"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"प्रोफ़ाइल संपादित करें"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"प्रोफ़ाइल हटाएं"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1686,6 +1716,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"अक्षम"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"अनुमति देने वाला"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"लागू किया जा रहा है"</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>
@@ -1704,6 +1737,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"सामग्री के लिए खाता"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"फ़ोटो आईडी"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"सेल प्रसारण"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"प्रदर्शित करने के लिए आपातकालीन अलर्ट के प्रकारों को चुनें."</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c317c39..ad33552 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Punjenje"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Pražnjenje"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bežično povezivanje)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Ne puni se"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ne puni se"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Puna"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Neuključeno"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"bežično povezivanje"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nepoznato"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nepoznato"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik upotrebljava HTTP proxy poslužitelj, ali druge aplikacije ne mogu ga upotrebljavati."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susjedski CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacije o ćeliji:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokušaji za podatke:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS usluga:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Promijeni PIN za otključavanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni zaporku za otključavanje"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Zaporka mora imati najmanje ovoliko znakova: %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mora imati najmanje ovoliko znakova %d"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"Zaporka mora imati manje od ovoliko znakova: <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Štednja energije"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Štedi energiju kada je zaslon isključen"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"WPS je već u tijeku, a do završ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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prijenosna pristupna WiFi točka"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje žarišne točke…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje žarišne točke…"</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="61237027772641155">"Postavljanje WiFi pristupne točke"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadinska slika"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Odabir pozadinske slike iz"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Čuvar zaslona"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Pokreće se u mirovanju ako je priključeno napajanje"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"San"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kada je uređaj na priključnoj stanici ili kada miruje i puni se"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kada uređaj miruje i puni se"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kada je uređaj na priključnoj stanici"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Onemogućeno"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Odabrani čuvar"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Odabrani san"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kada aktivirati"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> u mirovanju"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikad"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Isprobajte!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Pokreni i na priključnoj stanici"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Pokreni pri mirovanju"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Pokreni kada je uređaj na priključnoj stanici"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Veličina fonta"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Osnovna verzija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzija jezgre"</string>
     <string name="build_number" msgid="3075795840572241758">"Broj međuverzije"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Status SELinuxa"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nije dostupno"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Izbriši karticu SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Briše sve podatke na unutarnjoj memoriji USB, poput glazbe ili fotografija"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Briše sve podatke na kartici SD, poput glazbe i fotografija"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP ili PTP funkcija aktivna je"</string>
     <string name="read_only" msgid="6702420168629076340">" (samo za čitanje)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Isključiti USB pohranu?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Isključiti SD karticu?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB uređaj za pohranu podataka"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kartica"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstaliraj"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Onemogući"</string>
     <string name="enable_text" msgid="9217362512327828987">"Omogući"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Izbriši podatke"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Korisnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces i <xliff:g id="NUMSERVICES">%2$d</xliff:g> usluga"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces i <xliff:g id="NUMSERVICES">%2$d</xliff:g> usluga"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Broj procesa: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, broj usluga: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Izvješća o bugovima u izborniku napajanja"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"U izbornik napajanja uključi opciju za izradu izvješća o bugovima"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Nijedan račun trenutno ne stvara sigurnosne kopije podataka"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatska obnova"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri ponovnoj instalaciji aplikacije vratiti postavke i podatke za koje su stvorene sigurnosne kopije"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Izradi izvješće o bugu"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Time će se prikupiti informacije o trenutačnom stanju vašeg uređaja koje ćete nam poslati u e-poruci. Za pripremu izvješća o bugu potrebno je nešto vremena pa vas molimo za strpljenje."</string>
-    <string name="report" msgid="302437572240018342">"Prijavi"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Zaporka sigurnosne kopije"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Prikaži ažuriranja hardverskih slojeva"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Neka hardverski slojevi bljeskaju zeleno kad se ažuriraju"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Onemogućeno"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Omogućeno"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Provođenje"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Poruke mobilne mreže"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Odaberite vrste hitnih obavijesti za prikaz."</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6823779..ea6fce23 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Töltés"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(Hálózat)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Lemerülés"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(vezeték nélküli)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nem tölt"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nem töltődik"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Tele"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Nincs bedugva"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Hálózat"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"vezeték nélküli"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Hálózat+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Ismeretlen"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Ismeretlen"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Hely:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Környező CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellainformáció:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Adatkísérletek:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS szolgáltatás:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Barangolás:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN-kód módosítása"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A jelszónak legalább %d karakter hosszúnak kell lennie"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"A PIN-kódnak legalább %d karakter hosszúnak kell lennie"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"A PIN kódnak legalább %d számjegyűnek 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="7016906583950201704">"A jelszónak rövidebbnek kell lennie <xliff:g id="NUMBER">%d</xliff:g> karakternél."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Energiatakarékos"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Energiamegtakarítás amikor a képernyő kikapcsolt állapotban van"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Írja be a Wi-Fi router PIN 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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hordozható Wi-Fi hotspot"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot bekapcsolása..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot kikapcsolása..."</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="61237027772641155">"Wi-Fi hotspot beállítása"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Háttérkép"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Válasszon tapétát innen:"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Képernyővédő"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Alvó módban elindul, ha hálózati feszültségről üzemel"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Álom"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Dokkolt vagy alvó állapotban, amikor tölt."</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Alvó állapotban, amikor tölt"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Dokkolt állapotban"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Letiltva"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Kiválasztott modul"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Kiválasztott álom"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Mikor aktiválódjon"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tétlenség után"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Soha"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Próbálja ki!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Dokkolt állapotban is induljon el"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Alvó üzemmódban induljon el."</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Dokkolt állapotban induljon el."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Betűméret"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Alapsáv verziója"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel verziója"</string>
     <string name="build_number" msgid="3075795840572241758">"Build-szám"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux állapota"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nem érhető el"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Állapot"</string>
     <string name="device_status" msgid="607405385799807324">"Állapot"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD-kártya törlése"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Minden adat, például zenék és képek törlése a belső USB-tárról"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Törli az összes adatot (például a zenéket és fotókat) az SD-kártyáról"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"aktív MTP vagy PTP funkcióval"</string>
     <string name="read_only" msgid="6702420168629076340">" (Írásvédett)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Leválasztja az USB-tárat?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD-kártya leválasztása?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-adatok"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kártya"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Eltávolítás"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Letiltás"</string>
     <string name="enable_text" msgid="9217362512327828987">"Engedélyezés"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Adatok törlése"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Felhasználó: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> folyamat és <xliff:g id="NUMSERVICES">%2$d</xliff:g> szolgáltatás"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> folyamat és <xliff:g id="NUMSERVICES">%2$d</xliff:g> szolgáltatás"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> folyamat és <xliff:g id="NUMSERVICES">%2$d</xliff:g>szolgáltatás"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Hibajelentések az energiaellátási menüben"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Lehetőség az energiaellátási menüben a hibajelentésekre"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"Hibajelentés készítése"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Ezzel információt fog gyűjteni az eszköz jelenlegi állapotáról, amelyet a rendszer e-mailben fog elküldeni. Kérjük, legyen türelemmel, amíg a hibajelentés elkészül, és küldhető állapotba kerül."</string>
-    <string name="report" msgid="302437572240018342">"Jelentés"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Asztali mentés jelszava"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Hardverréteg-frissítések"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Frissítéskor a hardverrétegek zölden villognak"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1687,6 +1717,9 @@
     <!-- 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="selinux_status_disabled" msgid="924551035552323327">"Letiltva"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Engedélyezve"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Kényszerítve"</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>
@@ -1705,6 +1738,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Tartalom fiókja"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Fotóazonosító"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cellán belüli adások"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Válassza ki a megjelenítendő vészriasztások típusait."</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c1c2c2c..7ba0a86 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Mengisi daya"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Pengosongan"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(nirkabel)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Tidak mengisi daya"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Tidak mengisi daya"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Dicabut"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"nirkabel"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Tidak diketahui"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Tidak diketahui"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Upaya data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Layanan GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <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 %d karakter"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN minimal terdiri dari %d karakter"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN paling tidak harus sepanjang %d digit"</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="7016906583950201704">"Sandi harus kurang dari <xliff:g id="NUMBER">%d</xliff:g> karakter."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Penghematan daya"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Hemat daya saat layar dimatikan"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi Anda. Penyiapan memerlukan waktu hingga dua menit untuk 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_in_progress" msgid="3372311348221357944">"WPS sedang berlangsung dan memerlukan waktu hingga dua menit untuk 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabel"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Menyalakan hotspot..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Mematikan hotspot..."</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">"Kesalahan hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Siapkan hotspot Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih wallpaper dari"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Permen Layar"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Akan dimulai saat memasuki mode tidur jika terhubung ke daya listrik"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Mimpi"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Saat di dok atau tidur dan mengisi baterai"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Saat tidur dan mengisi baterai"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Saat di dok"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Nonaktif"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Permen terpilih"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Mimpi terpilih"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Waktu pengaktifan"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Setelah menganggur selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Tidak akan"</string>
     <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="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Mulai saat tidur"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Mulai saat di dok"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukuran font"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versi pita basis"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versi kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Nomor bentukan"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"status SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Tidak tersedia."</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Hapus kartu SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Hapus semua data di penyimpanan USB internal, seperti musik dan foto"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Hapus semua data di kartu SD, seperti musik dan foto"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Fungsi MTP atau PTP aktif"</string>
     <string name="read_only" msgid="6702420168629076340">" (Hanya-baca)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Lepas penyimpanan USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Lepaskan kartu SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data penyimpanan USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kartu SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Copot pemasangan"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Nonaktifkan"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktifkan"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Hapus data"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Pengguna: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g>layanan"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> layanan"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> layanan"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Laporan bug menu daya"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Menyertakan opsi dalam menu daya untuk mengambil laporan bug"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Saat ini, tidak ada akun yang menyimpan data cadangan"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan otomatis"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Memulihkan cadangan setelan dan data ketika memasang ulang apl"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Ambil laporan bug"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Ini akan mengumpulkan informasi tentang status perangkat Anda saat ini, untuk dikirimkan sebagai pesan e-mail. Perlu waktu untuk memulai laporan bug sampai siap dikirim; mohon kesabarannya."</string>
-    <string name="report" msgid="302437572240018342">"Laporan"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Sandi cadangan 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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Tunjukkan pembaruan lapisan hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Lapisan hardware berkedip hijau saat memperbarui"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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">"Pembaruan sistem tambahan"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Nonaktif"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Tidak Wajib"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Wajib"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Akun untuk konten"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID Foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis peringatan darurat yang akan ditampilkan."</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index e66963f..3ae7071 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -213,8 +213,8 @@
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Breve"</item>
-    <item msgid="2560532955514699713">"Media"</item>
-    <item msgid="2372711992605524591">"Lunga"</item>
+    <item msgid="2560532955514699713">"Medio"</item>
+    <item msgid="2372711992605524591">"Lungo"</item>
   </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Non verificare mai"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 39aaa35..cd1ea3d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"In carica"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"In uso"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Non in carica"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Non in carica"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Carica"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Non collegato"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wireless"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Sconosciuto"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Sconosciuto"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Il proxy HTTP viene utilizzato dal browser ma potrebbe non essere utilizzato da altre applicazioni."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posizione:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID adiacente:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativi dati:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servizio GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambia PIN di sblocco"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambia password di sblocco"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La password deve essere lunga almeno %d caratteri"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN deve essere lungo almeno %d caratteri"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Il PIN deve essere formato da almeno %d cifre"</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="7016906583950201704">"La password deve contenere meno di <xliff:g id="NUMBER">%d</xliff:g> caratteri."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Risparmio energia"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Risparmio energia quando lo schermo è spento"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portatile"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Attivazione hotspot..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Disattivazione hotspot..."</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="61237027772641155">"Configura hotspot Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Sfondo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Scegli sfondo da"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Schermo Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Attiva al momento della sospensione se collegato alla corrente"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quando inserito nel dock o in stand-by e ricarica"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quando in stand-by e ricarica"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quando inserito nel dock"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Disattivato"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Candy selezionato"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Sogno selezionato"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando attivarlo"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mai"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Prova!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Attiva anche quando inserito nel dock"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Attiva in stand-by"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Attiva quando inserito nel dock"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensioni carattere"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versione banda di base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versione kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Numero build"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stato di SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Non disponibile"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stato"</string>
     <string name="device_status" msgid="607405385799807324">"Stato"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Cancella scheda SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Cancella i dati nell\'archivio USB interno, come musica e foto"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Cancella tutti i dati sulla scheda SD, come musica e foto"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La funzione MTP o PTP è attiva"</string>
     <string name="read_only" msgid="6702420168629076340">" (Sola lettura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Smontare l\'archivio USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Smontare la scheda SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dati in archivio USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Scheda SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Disinstalla"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Disattiva"</string>
     <string name="enable_text" msgid="9217362512327828987">"Attiva"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Cancella dati"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Utente: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> servizio"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> servizi"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processi e <xliff:g id="NUMSERVICES">%2$d</xliff:g> servizio"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Segnalazioni di bug nel menu di accensione"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Includi opzione per aprire una segnalazione bug nel menu di accensione"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Al momento nessun account memorizza i dati di backup"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ripristino automatico"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In caso di reinstallazione di un\'applicazione, ripristina impostazioni e dati di backup"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Apri segnalazione bug"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Raccoglierà informazioni sullo stato corrente del dispositivo che verranno inviate sotto forma di messaggio email. Passerà un po\' di tempo prima che la segnalazione di bug aperta sia pronta per essere inviata; ti preghiamo di avere pazienza."</string>
-    <string name="report" msgid="302437572240018342">"Segnala"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Password di backup desktop"</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>
@@ -1548,6 +1568,8 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash delle superfici delle finestre all\'aggiornamento"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Aggiornamenti visualizz. GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash delle visualizzazioni dentro le finestre se disegnate con GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Aggiornam. livelli hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Lampeggia verde se aggiornam. livelli hardware"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Disattivato"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Applicazione"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Account per i contenuti"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcast"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Seleziona i tipi di avvisi di emergenza da visualizzare."</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2656a9c..f621d7d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"טוען"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"פורקת"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(אלחוטי)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"לא בטעינה"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"לא טוען"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"מלא"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"מנותקת"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"אלחוטי"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"לא ידוע"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"לא ידוע"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך יישומים אחרים לא יכולים להשתמש בו."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"מיקום:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID שכן:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"נתונים:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ניסיונות נתונים:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"שירות GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"נדידה:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"שנה PIN של ביטול נעילה"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"שנה סיסמת ביטול נעילה"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"אורך הסיסמה חייב להיות %d תווים לפחות"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"ה-PIN חייב להכיל %d תווים לפחות"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"מספר ה-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="7016906583950201704">"הסיסמה אינה יכולה להכיל יותר מ-<xliff:g id="NUMBER">%d</xliff:g> תווים."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"מצב חיסכון בחשמל"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"חסוך בחשמל כאשר המסך כבוי"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"הזן את מספר ה-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_in_progress" msgid="3372311348221357944">"התקנת 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"נקודה חמה ניידת של Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"מפעיל נקודה חמה…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"מכבה נקודה חמה…"</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="61237027772641155">"הגדר נקודה חמה של Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <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">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"יופעל בעת כניסה למצב שינה אם מחובר לחשמל"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"חלום"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"בזמן עגינה או בזמן שינה כשמתבצעת טעינה"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"בזמן שינה כשמתבצעת טעינה"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"בזמן עגינה"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"מושבת"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"מבחר Candy"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"חלום נבחר"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"מתי להפעיל"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ללא פעילות"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"אף פעם"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"נסה בעצמך!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"הפעל גם כשמחובר למעגן"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"הפעל בזמן שינה"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"הפעל בזמן עגינה"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
     <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"גודל גופן"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"גרסת פס בסיס"</string>
     <string name="kernel_version" msgid="9192574954196167602">"גרסת ליבה"</string>
     <string name="build_number" msgid="3075795840572241758">"מספר Build"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"סטטוס SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"לא זמין"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"סטטוס"</string>
     <string name="device_status" msgid="607405385799807324">"סטטוס"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"מחק כרטיס SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"מוחק את כל הנתונים שבאמצעי האחסון הפנימי מסוג USB, כגון מוסיקה ותמונות."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"מוחק את כל הנתונים שבכרטיס SD, כגון מוסיקה ותמונות."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"פונקציית MTP או PTP פעילה"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"נתוני אחסון USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"כרטיס SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"הסר התקנה"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"השבת"</string>
     <string name="enable_text" msgid="9217362512327828987">"הפעל"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"נקה נתונים"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"משתמש: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"תהליך <xliff:g id="NUMPROCESS">%1$d</xliff:g> ושירות <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"תהליך <xliff:g id="NUMPROCESS">%1$d</xliff:g> ו-‏<xliff:g id="NUMSERVICES">%2$d</xliff:g> שירותים"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> תהליכים ושירות <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"דיווחי באגים ב-Power Menu"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"כלול אפשרות ב-Power Menu לביצוע דיווח על באג"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"מלא דיווח על באג"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"פעולה זו תאסוף מידע על מצב המכשיר הנוכחי שלך על מנת לשלוח לנו הודעת דוא\"ל. היא תימשך זמן קצר מרגע פתיחת דיווח הבאג ועד שיהיה ניתן לבצע שליחה. התאזר בסבלנות."</string>
-    <string name="report" msgid="302437572240018342">"דווח"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"סיסמת גיבוי מקומי"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"גיבויים מלאים בשולחן העבודה אינם מוגנים כעת"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"גע כדי לשנות או להסיר את הסיסמה עבור גיבויים מלאים בשולחן העבודה"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"הצג עדכוני שכבות חומרה"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"הצג הבהוב ירוק לשכבות חומרה כשהן מתעדכנות"</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>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"הוספת פרופיל VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"ערוך פרופיל"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"מחק פרופיל"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"מושבת"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"מתירני"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"אכיפה"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"חשבון לתוכן"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"זיהוי תמונה"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"שידורים סלולריים"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"בחר את סוגי התראות החירום להצגה."</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4484304..8ebdae5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -84,7 +84,8 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"放電中"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"（無線）"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"充電していません"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"充電していません"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for battery_info_status_full (2824614753861462808) -->
@@ -92,6 +93,7 @@
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"電池使用時間:"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"無線"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"不明"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"不明"</string>
@@ -192,6 +194,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"セル情報:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"データの試行:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRSサービス:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ローミング:"</string>
@@ -364,7 +367,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ロック解除PINの変更"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ロック解除パスワードの変更"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"パスワードを%d文字以上で入力してください"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PINを%d文字以上で入力してください"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"パスワードは<xliff:g id="NUMBER">%d</xliff:g>文字未満で指定してください。"</string>
@@ -511,6 +514,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"電池の節約"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"画面がOFFの際に電池を節約できます"</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>
@@ -530,10 +535,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -597,6 +602,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -604,7 +611,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"ポータブルWi-Fiアクセスポイント"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"アクセスポイントをONにしています…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"アクセスポイントをOFFにしています…"</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="61237027772641155">"Wi-Fiアクセスポイントを設定"</string>
@@ -673,15 +686,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"電源接続時、スリープで開始"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"スクリーンセーバー"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"ホルダー装着時またはスリープ/充電時"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"スリープ/充電時"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"ホルダー装着時"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"無効"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"選択したスクリーンセーバー"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"選択されているスクリーンセーバー"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"開始のタイミング"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"アイドル状態が<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>続いた後"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"設定しない"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"プレビュー"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"ホルダーに置いたときも開始する"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"スリープ時に起動する"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"ホルダー装着時に起動する"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"フォントサイズ"</string>
@@ -718,6 +734,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"ベースバンドバージョン"</string>
     <string name="kernel_version" msgid="9192574954196167602">"カーネルバージョン"</string>
     <string name="build_number" msgid="3075795840572241758">"ビルド番号"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinuxのステータス"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"該当なし"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"端末の状態"</string>
     <string name="device_status" msgid="607405385799807324">"端末の状態"</string>
@@ -772,6 +789,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SDカード内データを消去"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"内部USBストレージ内の全データ（音楽、写真など）の消去"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SDカード内の全データ（音楽、写真など）の消去"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTPまたはPTP機能が有効です"</string>
     <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>
@@ -1003,6 +1021,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USBストレージデータ"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SDカード"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"アンインストール"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"無効にする"</string>
     <string name="enable_text" msgid="9217362512327828987">"有効にする"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"データを消去"</string>
@@ -1096,6 +1116,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"ユーザー: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>個のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>個のサービス"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>個のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>個のサービス"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>個のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>個のサービス"</string>
@@ -1201,6 +1222,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"電源メニューのバグレポート"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"電源メニューにバグレポートを取得するオプションを含める"</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>
@@ -1418,9 +1441,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"バグレポートを取得"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"現在の端末の状態に関する情報が収集され、その内容がメールで送信されます。バグレポートが開始してから送信可能な状態となるまでには多少の時間がかかりますのでご了承ください。"</string>
-    <string name="report" msgid="302437572240018342">"レポート"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"PCバックアップパスワード"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"デスクトップのフルバックアップは現在保護されていません"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"デスクトップのフルバックアップ用のパスワードを変更または削除する場合にタップします"</string>
@@ -1550,6 +1570,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"ハードウェア層情報を表示"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"ハードウェア層が更新されると緑を表示"</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>
@@ -1669,6 +1691,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPNプロフィールの追加"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"プロフィールを編集"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"プロフィールを削除"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1687,6 +1717,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</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>
@@ -1705,6 +1738,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"コンテンツのアカウント"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"画像ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"エリアメール"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"表示する緊急警報の種類を選択してください。"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 58d12e4..0aa796e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"충전 중"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"사용 중"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(무선)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"충전 안함"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"충전 안함"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"충전 완료"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"전원연결되지 않음"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"무선"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"알 수 없음"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"알 수 없음"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"데이터 시도:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 서비스:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"로밍:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"잠금해제 PIN 변경"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"잠금해제 비밀번호 변경"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"비밀번호는 %d자 이상이어야 합니다."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN은 %d자 이상이어야 합니다."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"비밀번호는 <xliff:g id="NUMBER">%d</xliff:g>자 미만이어야 합니다."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"절전"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"화면이 꺼지면 절전"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"휴대용 Wi-Fi 핫스팟"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"핫스팟 켜는 중…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"핫스팟 끄는 중…"</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="61237027772641155">"Wi-Fi 핫스팟 설정"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"전원에 연결된 경우 절전 모드 시 시작"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"스크린 세이버 모듈"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"도킹할 때 또는 대기상태이거나 충전할 때"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"대기상태이거나 충전할 때"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"도킹할 때"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"사용 안함"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"선택한 캔디"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"선택한 모듈"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"활성화 시기"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 유휴 상태일 때"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"안함"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"사용해 보기"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"도킹할 때도 시작"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"절전 모드 시 시작"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"도킹할 때 시작"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
     <string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"글꼴 크기"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"기저대역 버전"</string>
     <string name="kernel_version" msgid="9192574954196167602">"커널 버전"</string>
     <string name="build_number" msgid="3075795840572241758">"빌드 번호"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux 상태"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"표시할 수 없음"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"상태"</string>
     <string name="device_status" msgid="607405385799807324">"상태"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD 카드 지우기"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"내부 USB 저장소에 있는 모든 데이터(예: 음악 및 사진)를 지웁니다."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD 카드에 있는 모든 데이터(예: 음악 및 사진) 지우기"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP 또는 PTP 기능 사용 중"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 저장소 데이터"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 카드"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"제거"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"사용 안함"</string>
     <string name="enable_text" msgid="9217362512327828987">"사용"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"데이터 지우기"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"사용자: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"프로세스 <xliff:g id="NUMPROCESS">%1$d</xliff:g>개 및 서비스 <xliff:g id="NUMSERVICES">%2$d</xliff:g>개"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"프로세스 <xliff:g id="NUMPROCESS">%1$d</xliff:g>개 및 서비스 <xliff:g id="NUMSERVICES">%2$d</xliff:g>개"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"프로세스 <xliff:g id="NUMPROCESS">%1$d</xliff:g>개 및 서비스 <xliff:g id="NUMSERVICES">%2$d</xliff:g>개"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"전원 메뉴 버그 신고"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"전원 메뉴에 버그 신고 옵션 포함"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"버그 신고 받기"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"이렇게 하면 현재 기기 상태에 대한 정보를 수집하여 이메일 메시지로 전송합니다. 버그 신고를 시작하여 전송할 준비가 되려면 약간 시간이 걸립니다."</string>
-    <string name="report" msgid="302437572240018342">"신고"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"데스크톱 백업 비밀번호"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"데스크톱 전체 백업에 비밀번호가 설정되어 있지 않습니다."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"데스크톱 전체 백업에 대한 비밀번호를 변경하거나 삭제하려면 터치하세요."</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"하드웨어 업데이트 표시"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"업데이트 할 때 하드웨어 레이어 깜박이기"</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>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN 프로필 추가"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"프로필 수정"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"프로필 삭제"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"사용 안함"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"허가"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"시행"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"콘텐츠용 계정"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"사진 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"셀 브로드캐스트"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"표시할 긴급 알림 유형을 선택합니다."</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c4b76e3..02063df 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Kraunasi..."</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Iškraunama"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(belaidis)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nekraunama"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nekraunama"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Visiškai įkrautas"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Neįjungtas į lizdą"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"belaidis"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC ir USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nežinomas"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nežinomas"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP įgaliotąjį serverį naudoja naršyklė, bet jo negali naudoti kitos programos."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Šalia esantis CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mob. tel. informacija:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Duomenų bandymai:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS paslauga:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Tarptinklinis ryšys:"</string>
@@ -362,7 +365,7 @@
     <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_pin_too_short" msgid="2252847623267704683">"PIN kodą turi sudaryti mažiausiai %d simboliai (-ių)"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN kodą turi sudaryti mažiausiai %d skaitm."</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="7016906583950201704">"Slaptažodį turi sudaryti mažiau nei <xliff:g id="NUMBER">%d</xliff:g> simboliai (-ių)."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Energijos taupymas"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Taupyti energiją, kai ekranas išjungtas"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Įveskite „Wi-Fi“ maršruto parinktuvo PIN kodą <xliff:g id="NUMBER">%1$s</xliff:g>. Sąranka gali užtrukti iki dviejų minučių."</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_in_progress" msgid="3372311348221357944">"WPS jau vykdoma ir gali užtrukti iki dviejų minučių, 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Perkeliama „Wi-Fi“ aktyvioji sritis"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Įjungiamas viešosios interneto prieigos taškas…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Išjungiamas viešosios interneto prieigos taškas…"</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="61237027772641155">"Nustatyti „Wi-Fi“ viešosios interneto prieigos tašką"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pasirinkti darbalaukio foną iš"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekrano užsklandos"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Bus pradėta, kai veikia miego režimas, jei įjungta į lizdą"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Svajonė"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kai yra doke arba kai veikia miego režimas ir kraunamas akumuliatorius"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kai veikia miego režimas ir kraunamas akumuliatorius"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kai yra doke"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Išjungta"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Pasirinkta ekrano užsklanda"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Pasirinkta svajonė"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kada aktyvinti"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Kai <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neatliekama jokių veiksmų"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Niekada"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Išbandykite!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Taip pat pradėti, kai įrenginys yra doke"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Pradėti, kai veikia miego režimas"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Pradėti, kai įrenginys yra doke"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Šrifto dydis"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Nemoduliuojamo perdavimo versija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"„Kernel“ versija"</string>
     <string name="build_number" msgid="3075795840572241758">"Versijos numeris"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"„SELinux“ būsena"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Negalima"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Būsena"</string>
     <string name="device_status" msgid="607405385799807324">"Būsena"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Ištrinti SD kortelę"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Ištrinami visi vidinės USB atmint. duomenys, pvz., muzikos failai ir nuotraukos"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Ištrinami visi SD kortelės duomenys, pvz., muzikos failai ir nuotraukos"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP ar PTP funkcija aktyvi"</string>
     <string name="read_only" msgid="6702420168629076340">" (tik skaitoma)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Pašalinti USB atmintį?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Išimti SD kortelę?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB atminties duomenys"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kortelė"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Pašalinti"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Neleisti"</string>
     <string name="enable_text" msgid="9217362512327828987">"Įgalinti"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Išvalyti duomenis"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Naudotojas: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesas ir <xliff:g id="NUMSERVICES">%2$d</xliff:g> paslauga"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesas ir <xliff:g id="NUMSERVICES">%2$d</xliff:g> paslaugos (-ų)"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesai (-ų) ir <xliff:g id="NUMSERVICES">%2$d</xliff:g> paslauga"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Įjungimo meniu pranešimai apie triktis"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Įtraukti parinktį į įjungimo meniu, kad būtų galima pranešti apie triktį"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Šiuo metu jokioje paskyroje nesaugomi atsarginės kopijos duomenys"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatinis atkūrimas"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Iš naujo įdiegdami programą atkurkite nustatymus ir duomenis, kurių atsarginės kopijos buvo sukurtos"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Pranešti apie triktį"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Bus surinkta informacija apie dabartinę įrenginio būklę ir išsiųsta el. pašto pranešimu. Šiek tiek užtruks, kol pranešimas apie triktį bus paruoštas siųsti; būkite kantrūs."</string>
-    <string name="report" msgid="302437572240018342">"Pranešti"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Viet. atsrg. kop. slapt."</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Rod. apar. įr. sl. nauj."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Kai atsin. apar. įr. sl., rod. juos blyks. ž. sp."</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Neleidžiama"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Negriežta"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Vykdoma"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Turiniui skirta paskyra"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Nuotraukos ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Tinklo transliacijos"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pasirinkite rodomų nepaprastųjų įspėjimų tipus."</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4323d7d..ad2c087 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Uzlāde"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Izlāde"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezvadu)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nenotiek uzlāde"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenotiek uzlāde"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Pilns"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Atvienots"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Maiņstrāva"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"bezvadu"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nezināms"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nezināms"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Atrašanās vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Tuvējais CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Tālruņa atrašanās vietas informācija:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datu mēģinājumi:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS pakalpojums:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Viesabonēšana:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mainīt atbloķēšanas PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mainīt atbloķēšanas paroli"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parolē jābūt vismaz %d rakstzīmēm"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN kodā jābūt vismaz %d rakstzīmēm"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN kodā ir jābūt vismaz %d cipariem."</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="7016906583950201704">"Parole nedrīkst būt garāka par <xliff:g id="NUMBER">%d</xliff:g> rakstzīmēm."</string>
@@ -509,6 +512,8 @@
     <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nelietot Wi-Fi tīklu, ja vien tam nav labs 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_suspend_optimizations" msgid="7104856682836591734">"Enerģijas taupīšana"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Taupīt enerģiju, kad ekrāns ir izslēgts."</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Ievadiet uz Wi-Fi maršrutētāja norādīto 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_in_progress" msgid="3372311348221357944">"Jau notiek Wi-Fi aizsargātā iestatīšana, 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Pārnēsājams Wi-Fi tīklājs"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Notiek tīklāja ieslēgšana…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Notiek tīklāja izslēgšana…"</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="61237027772641155">"Iestatīt Wi-Fi tīklāju"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fona tapetes izvēle no"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekrānsaudzētājs"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Tiks aktivizēts miega režīma laikā, ja ierīce tiks pievienota strāvas avotam"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Ekrānsaudzētājs"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kad ierīce tiek dokota vai ir miega režīmā un notiek uzlāde"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kad ierīce ir miega režīmā un notiek uzlāde"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kad ierīce tiek dokota"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Atspējots"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Atlasītais ekrānsaudzētājs"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Atlasītais ekrānsaudzētājs"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktivizēšanas laiks"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pēc dīkstāves laika: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nekad"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Izmēģiniet!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Aktivizēt arī tad, kad ierīce tiek dokota"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Aktivizēt, kad ierīce ir miega režīmā"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Aktivizēt, kad ierīce tiek dokota"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fonta lielums"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Pamatjoslas versija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel versija"</string>
     <string name="build_number" msgid="3075795840572241758">"Būvējuma numurs"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux statuss"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nav pieejams"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Statuss"</string>
     <string name="device_status" msgid="607405385799807324">"Statuss"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Dzēst SD karti"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Dzēst visus iekšējā USB krātuvē saglabātos datus, piem., mūziku vai fotoattēlus."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Dzēš visus SD kartē saglabātos datus, piemēram, mūzikas failus un fotoattēlus."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP vai PTP funkcija ir aktīva."</string>
     <string name="read_only" msgid="6702420168629076340">" (Tikai lasāms)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Vai atvienot USB atmiņu?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Vai atvienot SD karti?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB atmiņas dati"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD karte"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Atinstalēt"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Atspējot"</string>
     <string name="enable_text" msgid="9217362512327828987">"Iespējot"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Notīrīt datus"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Lietotājs: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process un <xliff:g id="NUMSERVICES">%2$d</xliff:g> pakalpojums"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process un <xliff:g id="NUMSERVICES">%2$d</xliff:g> pakalpojumi"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesi un <xliff:g id="NUMSERVICES">%2$d</xliff:g> pakalpojums"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Barošanas izvēlnes kļūdu ziņojumi"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Iekļaut barošanas izvēlnē kļūdu ziņojuma sagatavošanas opciju"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Pašlaik nevienā kontā netiek uzglabāti dublēti dati."</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automātiska atjaunošana"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Atkārtoti instalējot lietotni, atjaunot dublētos iestatījumus un datus"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Kļūdu ziņojuma sagatavošana"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Veicot šo darbību, tiks apkopota informācija par jūsu ierīces pašreizējo stāvokli un nosūtīta e-pasta ziņojuma veidā. Kļūdu ziņojuma pabeigšana, lai to varētu nosūtīt, var ilgt kādu laiku. Lūdzu, esiet pacietīgs."</string>
-    <string name="report" msgid="302437572240018342">"Sagatavot ziņojumu"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Datora dublējuma parole"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Rādīt apar. slāņu atjaun."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Atjaunin. aparatūras slāņiem ir jāmirgo zaļā krāsā"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Atspējots"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Atļaujošs"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Īstenots"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Konts saturam"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Dokuments ar foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Šūnu apraides"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Atlasiet rādāmos ārkārtas situāciju brīdinājumus."</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 5f40e43..e54a3eb 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Mengecas"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Menyahcas"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wayarles)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Tidak mengecas"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Tidak mengecas"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Palam dicabut"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"(AC)"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wayarles"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Tidak diketahui"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Tidak diketahui"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi HTTP digunakan oleh penyemak imbas tetapi tidak boleh digunakan oleh aplikasi lain."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID berdekatan:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Info Sel:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Percubaan data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Perkhidmatan GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Perayauan:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Tukar PIN buka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Tkr kta lluan bka knci"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Kata laluan mesti sekurang-kurangnya %d aksara"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mestilah sekurang-kurangnya %d aksara"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN mesti sekurang-kurangnya %d digit"</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="7016906583950201704">"Kata laluan mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> aksara."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Jimat kuasa"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Menjimatkan kuasa apabila skrin dimatikan"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Titik panas Wi-Fi mudah alih"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Menghidupkan tempat liputan..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Mematikan tempat liputan..."</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="61237027772641155">"Sediakan tempat liputan Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Kertas dinding"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih kertas dinding dari"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Gul-gula Skrin"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Akan bermula daripada tidur jika disambungkan kepada kuasa"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Impian"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Apabila didok atau tidur dan dicas"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Apabila tidur dan dicas"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Apabila didok"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Dilumpuhkan"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Gula-gula yang dipilih"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Mimpi pilihan"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Bila hendak diaktifkan"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> terbiar melahu"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Tidak sekali-kali"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Cubalah!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Juga bermula apabila didok"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Mula pada status tidur"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Bermula apabila didok"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Saiz fon"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versi jalur dasar"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versi inti"</string>
     <string name="build_number" msgid="3075795840572241758">"Nombor binaan"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Status SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Tidak tersedia"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Padam kad SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Memadamkan semua data pada storan USB dalaman, seperti muzik dan foto"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Memadamkan semua data pada kad SD, seperti muzik dan foto"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Fungsi MTP atau PTP adalah aktif"</string>
     <string name="read_only" msgid="6702420168629076340">" (Baca sahaja)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Nyahlekap storan USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Nyahlekap kad SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data storan USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kad SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Nyahpasang"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Lumpuhkan"</string>
     <string name="enable_text" msgid="9217362512327828987">"Dayakan"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Padam bersih data"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Pengguna: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> perkhidmatan"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> perkhidmatan"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> perkhidmatan"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Laporan pepijat menu kuasa"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Masukkan pilihan dalam menu kuasa untuk mengambil laporan pepijat"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Tiada akaun yang sedang menyimpan data sandaran buat masa ini"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan automatik"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Apabila memasang semula aplikasi, pulihkan tetapan dan data yang disandarkan"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Ambil laporan pepijat"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Ini akan mengumpul maklumat tentang keadaan peranti semasa anda untuk dihantarkan sebagai mesej e-mel. Ini akan mengambil sedikit masa bermula dari laporan pepijat sehingga siap untuk dihantar; jadi diharap bersabar."</string>
-    <string name="report" msgid="302437572240018342">"Laporkan"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kata laluan sandaran 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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Menunjukkan lapisan kemas kini perkakasan"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Pancar hijau lapisan perkakasan yg dikemas kini"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Dilumpuhkan"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisif"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Menguatkuasakan"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Akaun untuk kandungan"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID Berfoto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis amaran kecemasan untuk dipaparkan."</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 85cba56..50d9fe2 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -133,8 +133,8 @@
     <item msgid="2330782789550628803">"Utenfor rekkevidde"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"To minutter"</item>
-    <item msgid="8675215713017289017">"Fem minutter"</item>
+    <item msgid="8151962652413645395">"2 minutter"</item>
+    <item msgid="8675215713017289017">"5 minutter"</item>
     <item msgid="477015974247590543">"Én time"</item>
     <item msgid="5198271470953124739">"Aldri tidsavbrudd"</item>
   </string-array>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f111751..2bce46c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Lader"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"På batteristrøm"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(trådløs)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Lader ikke"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Lader ikke"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Ikke plugget i"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Nettstrøm"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"trådløs"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Nettstrøm+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Ukjent"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Ukjent"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre apper."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posisjon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celleinfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøk:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjeneste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Endre PIN-koden for opplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Endre passord for opplåsning"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Passord må bestå av minst %d tegn"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden må bestå av minst %d tegn"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koden må bestå av minst %d tall"</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="7016906583950201704">"Passordet må inneholde færre enn <xliff:g id="NUMBER">%d</xliff:g> tegn."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Strømsparing"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Spar strøm når skjermen er slått av"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Flyttbar trådløs sone"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Slår på Wi-Fi-sone …"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Slår av 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="61237027772641155">"Konfigurer Wi-Fi-sone"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivivitet"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrunnsbilde"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Velg bakgrunnsbilde fra"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Skjermpynt"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Starter ved dvalemodus hvis koblet til strømnettet"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Drøm"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Når enheten er plassert i dokken eller under lading i hvilemodus"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Når enheten lades i hvilemodus"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Når enheten er plassert i dokken"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktivert"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Valgt pynt"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Valgt drøm"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktiveringstidspunkt"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> i uvirksomhet"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldri"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Prøv den!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Starter også når i dokk"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Start når enheten går i hvilemodus"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Start når enheten er plassert i dokken"</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>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Radioprogramvare"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kjerneversjon"</string>
     <string name="build_number" msgid="3075795840572241758">"Byggnummer"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgjengelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Slett SD-kort"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sletter intern USB-lagring, som musikk og bilder"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Sletter alle data på SD-kortet, for eksempel musikk og bilder"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- eller PTP-funksjonen er aktiv"</string>
     <string name="read_only" msgid="6702420168629076340">" (skrivebeskyttet)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Vil du koble fra USB-lagring?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Vil du koble fra SD-kortet?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-lagringsvolum for data"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Avinstaller"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Deaktiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktiver"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Fjern data"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Bruker:<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosess og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjeneste"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosesser og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjenester"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosesser og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjeneste"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Feilrapporter i batterimenyen"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inkluder alternativet for å utføre feilrapport i batterimenyen"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ingen konto lagrer for øyeblikket sikkerhetskopierte data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Auto-gjenoppretting"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Når du installerer en app, bør du gjenopprette sikkerhetskopierte innstillinger og data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Utfør feilrapport"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Informasjon om den nåværende tilstanden til enheten din samles inn og sendes som en e-post. Det tar litt tid fra du starter feilrapporten til e-posten er klar, så vær tålmodig."</string>
-    <string name="report" msgid="302437572240018342">"Rapportér"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Passord for sikkerhetskopiering 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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Vis opp. for mask.varelag"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"La maskinvarelag blinke i grønt når oppdatert"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Deaktivert"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Valgfri"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Håndhevende"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Konto for innhold"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Kringkastede meldinger"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Velg hvilke nødvarsler som skal vises."</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 542cc73..9acd3ad 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Opladen"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Ontladen"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(draadloos)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Wordt niet opgeladen"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Wordt niet opgeladen"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Volledig"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Niet aangesloten"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"draadloos"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Onbekend"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Onbekend"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locatie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celinfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Gegevenspogingen:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"PIN-code voor ontgrendelen wijzigen"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ontgrendelingswachtwoord wijzigen"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Wachtwoord moet ten minste %d tekens lang zijn"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-code moet ten minste %d tekens lang zijn"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Pincode moet ten minste %d cijfers 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="7016906583950201704">"Wachtwoord moet korter zijn dan <xliff:g id="NUMBER">%d</xliff:g> tekens."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Energiebesparing"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Energie besparen wanneer het scherm is uitgeschakeld"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Geef de pincode <xliff:g id="NUMBER">%1$s</xliff:g> op uw wifi-router op. De configuratie kan twee minuten duren."</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_in_progress" msgid="3372311348221357944">"WPS wordt al uitgevoerd en 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Draagbare Wi-Fi-hotspot"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot inschakelen…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot uitschakelen…"</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="61237027772641155">"Wifi-hotspot instellen"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Achtergrond"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Achtergrond kiezen van"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Wordt gestart bij activeren van slaapstand indien aangesloten op stroomvoorziening"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Dromen"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Wanneer gedockt, in slaapstand of tijdens het opladen"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"In de slaapstand en tijdens het opladen"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Wanneer gedockt"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Uitgeschakeld"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Geselecteerde candy"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Geselecteerde droom"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Wanneer activeren"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nooit"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Probeer het eens!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Ook starten indien gedockt"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Starten in slaapstand"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Starten wanneer gedockt"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Smalbandversie"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-versie"</string>
     <string name="build_number" msgid="3075795840572241758">"Build-nummer"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Niet beschikbaar"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD-kaart wissen"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Wist alle gegevens in de interne USB-opslag, zoals muziek en foto\'s"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Hiermee worden alle gegevens op de SD-kaart gewist, zoals muziek en foto\'s"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- of PTP-functie is actief"</string>
     <string name="read_only" msgid="6702420168629076340">" (Alleen-lezen)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB-opslag ontkoppelen?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD-kaart ontkoppelen?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-opslaggegevens"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kaart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Verwijderen"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Uitschakelen"</string>
     <string name="enable_text" msgid="9217362512327828987">"Inschakelen"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Gegevens wissen"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Gebruiker: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces en <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces en <xliff:g id="NUMSERVICES">%2$d</xliff:g> services"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processen en <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Foutenrapporten in afsluitmenu"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Optie opnemen in afsluitmenu voor het genereren van een foutenrapport"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Er is momenteel geen account ingesteld voor het opslaan van back-upgegevens"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisch terugzetten"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In een back-up opgeslagen instellingen of andere gegevens herstellen bij het opnieuw installeren van een app"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Foutenrapport genereren"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Hiermee worden gegevens over de huidige status van uw apparaat verzameld en als e-mail verzonden. Wanneer u een foutenrapport start, duurt het even voordat het kan worden verzonden. Even geduld alstublieft."</string>
-    <string name="report" msgid="302437572240018342">"Rapport maken"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Wachtwoord desktopback-up"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Updaten hardwarelgn wrgvn"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hardwarelagen knipperen groen bij updates"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Disabled (Uitgeschakeld)"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive (Tolerant)"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Wordt afgedwongen)"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Account voor inhoud"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecteer de typen noodoproepen die moeten worden weergegeven."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e5799f8..b8a3b11 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Ładowanie"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"rozładowywanie"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezprzewodowo)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nie ładuje"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nie ładuje"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Pełna"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Odłączone"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Zasilacz"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"bezprzewodowo"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Zasilacz i USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nieznane"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nieznane"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokalizacja:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sąsiadujący CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacje:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Próby danych:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Usługa GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmień kod PIN odblokowania"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmień hasło odblokowania"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Liczba znaków w haśle musi wynosić co najmniej %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN musi mieć co najmniej %d znaki"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN musi mieć co najmniej %d cyfr"</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="7016906583950201704">"Hasło musi mieć mniej znaków niż <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Oszczędzanie energii"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Oszczędzaj energię, gdy ekran jest wyłączony"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Wpisz PIN <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_in_progress" msgid="3372311348221357944">"Konfiguracja WPS już się rozpoczęła i może potrwać do dwóch minut"</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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Przenośny punkt Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Włączanie punktu dostępu…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Wyłączanie punktu dostępu…"</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="61237027772641155">"Skonfiguruj hotspot Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <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="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_title" msgid="4458091032540874366">"Sen"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Gdy zadokowane lub uśpione i podczas ładowania"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Gdy uśpione i podczas ładowania"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Gdy zadokowane"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Wyłączone"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Wybrane upiększenia"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Wybrany sen"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Włączenie wygaszacza"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nigdy"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Wypróbuj"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Także, gdy zadokowany."</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Uruchamiaj, gdy uśpione"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Uruchamiaj, gdy zadokowane"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Rozmiar czcionki"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Wersja pasma podstawowego"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Wersja jądra"</string>
     <string name="build_number" msgid="3075795840572241758">"Numer kompilacji"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stan SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Niedostępna"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Informacje o telefonie"</string>
     <string name="device_status" msgid="607405385799807324">"Informacje o telefonie"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Wyczyść kartę SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Wymazuje wszystkie dane z wewnętrznego nośnika USB, np. pliki muzyczne i zdjęcia"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Wymazuje z karty SD telefonu wszystkie dane, takie jak muzyka czy zdjęcia"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funkcja MTP lub PTP jest aktywna"</string>
     <string name="read_only" msgid="6702420168629076340">" (Tylko do odczytu)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Odłączyć nośnik USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Odłączyć kartę SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dane w pamięci USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinstaluj"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Dezaktywuj"</string>
     <string name="enable_text" msgid="9217362512327828987">"Włącz"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Wyczyść dane"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"Pamięć RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Użytkownik: <xliff:g id="USER_NAME">%1$s</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>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Zgłaszanie błędów w menu zasilania"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Dodaj w menu zasilania opcję zgłaszania błędu"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Żadne z kont nie przechowuje obecnie kopii zapasowej danych"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Autoprzywracanie"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Przy ponownej instalacji aplikacji przywróć ustawienia i dane z kopii zapasowej."</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Zgłoś błąd"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Informacje o bieżącym stanie urządzenia zostaną zebrane i wysłane e-mailem. Przygotowanie zgłoszenia błędu do wysłania chwilę potrwa, więc zachowaj cierpliwość."</string>
-    <string name="report" msgid="302437572240018342">"Zgłoś"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Hasło kopii zapasowych"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Pokaż akt. warstw sprzętu"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Oznaczaj aktualizowane warstwy sprzętowe na zielono"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Wyłączony"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Pobłażliwy"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Restrykcyjny"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Konto na materiały"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Identyfikator zdjęcia"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisje komórkowe"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wybierz typy alertów o zagrożeniu, które chcesz wyświetlić."</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 07139bc..e921ac1 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"A carregar"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"A descarregar"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sem fios)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Não está a carregar"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está a carregar"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Completo"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desligado"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"sem fios"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconhecido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconhecido"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Local:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviço GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar palavra-passe de desbloqueio"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A palavra-passe tem de ter no mínimo %d caracteres"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN tem de ter no mínimo %d caracteres"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"O PIN tem de ter, pelo menos, %d dígitos"</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="7016906583950201704">"A palavra-passe tem de ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Economia de energia"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Economizar energia quando o ecrã estiver desligado"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"O WPS já está em curso e pode demorar até dois minutos a concluir"</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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portátil"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"A ativar zona Wi-Fi..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"A desativar zona Wi-Fi..."</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="61237027772641155">"Configurar zona Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagem de fundo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Escolher imagem de fundo de"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Proteção de Ecrã"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Será iniciado ao suspender, se estiver ligado à alimentação"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Sonho"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quando ancorado ou em suspensão e a carregar"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quando em suspensão e a carregar"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quando ancorado"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desativado"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Proteção de Ecrã selecionada"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Sonho selecionado"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando ativar"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Experimente!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Também iniciar quando ancorado"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar quando em suspensão"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar quando ancorado"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho do tipo de letra"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versão de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versão do kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilação"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Estado SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Apagar cartão SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Apaga todos os dados do armazenamento USB interno, como músicas e fotografias"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Apaga todos os dados do cartão SD, tais como música e fotografias"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"A função MTP ou PTP está ativa"</string>
     <string name="read_only" msgid="6702420168629076340">" (Só de leitura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Desmontar mem. arm. USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Desmontar cartão SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dados de armazenamento USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Cartão SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Desactivar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Limpar dados"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Utilizador: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviço"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviços"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processos e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviço"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Relatórios de erros do menu avançado"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opção no menu avançado para criar um relatório de erros"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Actualmente, nenhuma conta está a armazenar dados com cópia de segurança"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauro automático"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar uma aplicação, restaurar definições e dados da cópia de segurança"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Criar um relatório de erro"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Isto irá recolher informações sobre o estado atual do seu dispositivo para enviar através de uma mensagem de email. Demorará um pouco desde o início do relatório de erro até que este se encontre pronto para ser enviado. Aguarde um pouco."</string>
-    <string name="report" msgid="302437572240018342">"Relatório"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Pal.-passe cópia do comp"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Mostrar atual. cam. hard."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Camadas de hard. flash verdes quando estão atuali."</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Desativado"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Forçador"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID da fotografia"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões celulares"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a apresentar."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index af3e925..529b5a9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Carregando"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Descarregando"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sem fio)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Não está carregando"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está carregando"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Cheio"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desconectado"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"sem fio"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconhecido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconhecido"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outros aplicativos."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Localização:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviço GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar senha de desbloqueio"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A senha deve ter no mínimo %d caracteres"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN deve ter no mínimo %d caracteres."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"A senha deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Economia de energia"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Economizar energia quando a tela estiver desligada"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi portátil"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Ativando o ponto de acesso..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desativando o ponto de acesso..."</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="61237027772641155">"Config. ponto de acesso Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecionar plano de fundo de"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Começará no modo de espera se estiver conectado à energia"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Sonho"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quando encaixado ou em suspensão e carregamento"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quando em suspensão e carregamento"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quando encaixado"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desativada"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Candy selecionado"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Sonho selecionado"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando ativar"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Teste-o!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Começar também quando estiver encaixado"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar em suspensão"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar quando encaixado"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho da fonte"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versão da banda de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versão do kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número da versão"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Status do SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Apagar cartão SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Apaga todos os dados do armazenamento USB interno, como músicas e fotos"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Apaga todos os dados do cartão SD, como músicas e fotos"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"A função MTP ou PTP está ativa"</string>
     <string name="read_only" msgid="6702420168629076340">" (Somente leitura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Desconectar armazenamento USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Desconectar cartão SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dados de armazenamento USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Cartão SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Desativar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ativar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Limpar dados"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Usuário: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviço"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviços"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processos e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviço"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Relatórios de bugs no menu do botão de ligar"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir a opção de obter um relatório de bugs no menu do botão de ligar"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Nenhuma conta está armazenando o backup dos dados"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauração automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar um aplicativo, restaura as configurações de backup e dados"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Obter relatório de bugs"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Isto coletará informações sobre o estado atual do dispositivo para enviá-las em uma mensagem de e-mail. Após iniciar o relatório de bugs, será necessário aguardar algum tempo até que esteja pronto para ser enviado. Tenha paciência."</string>
-    <string name="report" msgid="302437572240018342">"Gerar relatório"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Senha do backup local"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Atual. camad. de hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Piscar camadas de hardware em verde ao atualizar"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Desativado"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Impondo"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões por celular"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a exibir."</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 650bf49..d375bb2 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -99,12 +99,17 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Vegn chargià"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Stgargiada"</string>
+    <!-- no translation found for battery_info_status_charging_wireless (1822125795446772771) -->
+    <skip />
+    <!-- no translation found for battery_info_status_discharging (310932812698268588) -->
+    <skip />
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Na vegn betg chargià"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plain"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Betg connectà"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <!-- no translation found for battery_info_power_wireless (6819163295739305097) -->
+    <skip />
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nunenconuschent"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nunenconuschent"</string>
@@ -261,6 +266,8 @@
     <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posiziun:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vischin:"</string>
+    <!-- no translation found for radio_info_cellinfo_label (1300937728020622362) -->
+    <skip />
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Emprovas datas:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servetsch GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -525,7 +532,8 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Midar il PIN da debloccaziun"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Midar il pled-clav da debloccaziun"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Il pled-clav sto cuntegnair almain %d caracters."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN sto cuntegnair almain %d caracters."</string>
+    <!-- no translation found for lockpassword_pin_too_short (1677649103470518953) -->
+    <skip />
     <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 (7016906583950201704) -->
@@ -739,6 +747,10 @@
     <skip />
     <!-- no translation found for wifi_setting_sleep_policy_error (8174902072673071961) -->
     <skip />
+    <!-- no translation found for wifi_suspend_optimizations (7104856682836591734) -->
+    <skip />
+    <!-- no translation found for wifi_suspend_optimizations_summary (2696244454434564259) -->
+    <skip />
     <!-- no translation found for wifi_add_network (6234851776910938957) -->
     <skip />
     <string name="wifi_access_points" msgid="2664629396767022441">"Raits WLAN"</string>
@@ -771,13 +783,13 @@
     <skip />
     <!-- no translation found for wifi_wps_onstart_pbc (7204827509934892103) -->
     <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8116564886303972764) -->
+    <!-- no translation found for wifi_wps_onstart_pin (8067502591043979939) -->
     <skip />
     <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
     <skip />
     <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
     <skip />
-    <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
+    <!-- no translation found for wifi_wps_in_progress (3372311348221357944) -->
     <skip />
     <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
     <skip />
@@ -878,6 +890,8 @@
     <skip />
     <!-- no translation found for wifi_p2p_peer_devices (299526878463303432) -->
     <skip />
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <!-- no translation found for wifi_p2p_failed_connect_message (8921447388048243547) -->
     <skip />
     <!-- no translation found for wifi_p2p_failed_rename_message (2562182284946936380) -->
@@ -892,7 +906,15 @@
     <skip />
     <!-- no translation found for wifi_p2p_cancel_connect_message (7477756213423749402) -->
     <skip />
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punct d\'access WLAN mobil"</string>
+    <!-- no translation found for wifi_tether_starting (1322237938998639724) -->
+    <skip />
+    <!-- no translation found for wifi_tether_stopping (4835852171686388107) -->
+    <skip />
     <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>
     <!-- no translation found for wifi_tether_configure_ap_text (61237027772641155) -->
@@ -994,13 +1016,17 @@
     <skip />
     <!-- no translation found for wallpaper_settings_fragment_title (519078346877860129) -->
     <skip />
-    <!-- no translation found for screensaver_settings_title (3848608373818910549) -->
+    <!-- no translation found for screensaver_settings_title (4458091032540874366) -->
     <skip />
-    <!-- no translation found for screensaver_settings_summary_on (433728808047613634) -->
+    <!-- no translation found for screensaver_settings_summary_both (1175671101656240599) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_sleep (7231274537626605107) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_summary_dock (4450616262936082466) -->
     <skip />
     <!-- no translation found for screensaver_settings_summary_off (7019248565878953105) -->
     <skip />
-    <!-- no translation found for screensaver_component_title (8596216100441725363) -->
+    <!-- no translation found for screensaver_component_title (5786117148360329058) -->
     <skip />
     <!-- no translation found for screensaver_timeout_title (4882666970355550822) -->
     <skip />
@@ -1010,7 +1036,9 @@
     <skip />
     <!-- no translation found for screensaver_test (3048249263811694128) -->
     <skip />
-    <!-- no translation found for screensaver_activate_on_dock_title (3753003388633168862) -->
+    <!-- no translation found for screensaver_activate_on_sleep_title (5463857907577089065) -->
+    <skip />
+    <!-- no translation found for screensaver_activate_on_dock_title (5594601783697028555) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Clerezza automatica"</string>
     <!-- no translation found for title_font_size (4405544325522105222) -->
@@ -1058,6 +1086,8 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versiun Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versiun dal kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Numer dal build"</string>
+    <!-- no translation found for selinux_status (6212165375172061672) -->
+    <skip />
     <string name="device_info_not_available" msgid="8062521887156825182">"Betg disponibel"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1138,6 +1168,8 @@
     <skip />
     <!-- no translation found for sd_format_summary (212703692181793109) -->
     <skip />
+    <!-- no translation found for mtp_ptp_mode_summary (3710436114807789270) -->
+    <skip />
     <string name="read_only" msgid="6702420168629076340">" (mo per lectura)"</string>
     <!-- no translation found for dlg_confirm_unmount_title (3077285629197874055) -->
     <skip />
@@ -1479,6 +1511,8 @@
     <!-- no translation found for external_data_size_label (626414192825329708) -->
     <skip />
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstallar"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Deactivar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Stizzar las datas"</string>
@@ -1627,6 +1661,8 @@
     <skip />
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <!-- no translation found for running_process_item_user_label (3129887865552025943) -->
+    <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process ed <xliff:g id="NUMSERVICES">%2$d</xliff:g> servetsch"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process e <xliff:g id="NUMSERVICES">%2$d</xliff:g> servetschs"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process ed <xliff:g id="NUMSERVICES">%2$d</xliff:g> servetsch"</string>
@@ -1793,6 +1829,10 @@
     <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 bugreport_in_power (4548816486587403971) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (5764234382355067053) -->
+    <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>
@@ -2117,12 +2157,6 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauraziun automatica"</string>
     <!-- no translation found for auto_restore_summary (4235615056371993807) -->
     <skip />
-    <!-- no translation found for bugreport_title (1009498799922543551) -->
-    <skip />
-    <!-- no translation found for bugreport_message (1182209569732110590) -->
-    <skip />
-    <!-- no translation found for report (302437572240018342) -->
-    <skip />
     <!-- no translation found for local_backup_password_title (3860471654439418822) -->
     <skip />
     <!-- no translation found for local_backup_password_summary_none (393503434408227110) -->
@@ -2365,6 +2399,10 @@
     <skip />
     <!-- no translation found for show_hw_screen_updates_summary (1115593565980196197) -->
     <skip />
+    <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+    <skip />
+    <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+    <skip />
     <!-- no translation found for disable_overlays (2074488440505934665) -->
     <skip />
     <!-- no translation found for disable_overlays_summary (3578941133710758592) -->
@@ -2602,6 +2640,14 @@
     <skip />
     <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
     <skip />
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <!-- no translation found for vpn_no_network (3050233675132726155) -->
     <skip />
     <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
@@ -2638,6 +2684,12 @@
     <skip />
     <!-- no translation found for additional_system_update_settings_list_item_title (214987609894661992) -->
     <skip />
+    <!-- no translation found for selinux_status_disabled (924551035552323327) -->
+    <skip />
+    <!-- no translation found for selinux_status_permissive (6004965534713398778) -->
+    <skip />
+    <!-- no translation found for selinux_status_enforcing (2252703756208463329) -->
+    <skip />
     <!-- no translation found for user_settings_title (5189224330534906766) -->
     <skip />
     <!-- no translation found for user_list_title (2152311434413878709) -->
@@ -2674,6 +2726,10 @@
     <skip />
     <!-- no translation found for help_label (1107174367904110532) -->
     <skip />
+    <!-- no translation found for user_account_title (1127193807312271167) -->
+    <skip />
+    <!-- no translation found for user_picture_title (7297782792000291692) -->
+    <skip />
     <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
     <skip />
     <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1f89441..c4980b7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Încarcă"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Descărcare"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nu se încarcă"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nu încarcă"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Complet"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Deconectat"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wireless"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Necunoscut"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Necunoscut"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locaţie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vecin:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informaţii celulă:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Încercări de date:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviciu GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Schimbaţi codul PIN de deblocare"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Schimbaţi parola pentru deblocare"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parola trebuie să conţină minimum %d (de) caractere"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Codul PIN trebuie să conţin minimum %d (de) caractere"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Codul PIN trebuie să aibă minimum %d cifre"</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="7016906583950201704">"Parola trebuie să aibă mai puţin de <xliff:g id="NUMBER">%d</xliff:g> (de) caractere."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Economisirea energiei"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Economisiţi energie când ecranul este oprit"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"WPS este deja în desfăşurare. Finalizarea poate dura până la două minute."</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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabil"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Se activează hotspotul..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Se dezactivează hotspotul..."</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="61237027772641155">"Configuraţi hotspotul Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aleg. o imag. de fundal de la"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Abţibilduri pentru ecran"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Va porni după un interval de inactivitate, dacă dispozitivul este conectat la alimentare"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Vis"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Când dispozitivul este andocat sau în modul inactiv şi se realizează încărcarea"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Când dispozitivul este în modul inactiv şi se realizează încărcarea"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Când dispozitivul este andocat"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Dezactivat"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Abţibild pentru ecran selectat"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Visul selectat"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Când se activează"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"După un interval de inactivitate de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Niciodată"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Încercaţi-l!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Porneşte şi când dispozitivul este andocat"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Porneşte când dispozitivul este în modul inactiv"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Porneşte când dispozitivul este andocat"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensiune font"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versiunea benzii de bază"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versiune nucleu"</string>
     <string name="build_number" msgid="3075795840572241758">"Numărul versiunii"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stare SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Indisponibil"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stare"</string>
     <string name="device_status" msgid="607405385799807324">"Stare"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Ştergeţi cardul SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Şterge toate datele din stocarea USB internă, cum ar fi muzica şi fotografiile"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Şterge toate datele de pe cardul SD, cum ar fi muzica şi fotografiile"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funcţia MTP sau PTP este activă"</string>
     <string name="read_only" msgid="6702420168629076340">" (numai citire)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Demontaţi stocarea USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Demontaţi cardul SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Stocare date pe USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Card SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Dezinstalaţi"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Dezactivaţi"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activaţi"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ştergeţi datele"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Utilizator: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces şi <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviciu"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces şi <xliff:g id="NUMSERVICES">%2$d</xliff:g> (de) servicii"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (de) procese şi <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviciu"</string>
@@ -1200,6 +1221,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Rapoarte despre erori în meniul de pornire"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Includeţi în meniul de pornire opţiunea de a executa un raport despre erori"</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>
@@ -1417,9 +1440,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"În prezent, niciun cont nu stochează datele cu copii de rezervă"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restabilire automată"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"La reinstalarea unei aplicaţii, restabiliţi setările şi datele pentru care aţi creat o copie de rezervă"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Executaţi un raport despre erori"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Acest raport va colecta informaţii despre starea actuală a dispozitivului, pentru a le trimite ca mesaj de e-mail. Va dura un timp din momentul pornirii raportului despre erori şi până când acesta va fi gata pentru a fi trimis, prin urmare vă rugăm să aveți puțină răbdare."</string>
-    <string name="report" msgid="302437572240018342">"Raportaţi"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă cop. rez. 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>
@@ -1549,6 +1569,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Actualiz. strat. hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Straturile hardware clipesc verde la actualizare"</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>
@@ -1668,6 +1690,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1686,6 +1716,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Dezactivat"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Facultativ"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatoriu"</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>
@@ -1704,6 +1737,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Cont pentru conţinut"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisii celulare"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selectaţi tipurile de alerte de urgenţă de afişat."</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e83ecf3..4b757b8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Идет зарядка"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"от сети"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"по USB"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Работа от батареи"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"Wi-Fi"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Не заряжается"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряжается"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Батарея заряжена"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Не подключено"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Питание от сети"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"Wi-Fi"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Питание от сети и USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Неизвестно"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Неизвестно"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"Индекс сети:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Попыток данных:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Услуга GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Изменить ПИН-код разблокировки"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Изменить пароль разблокировки"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль должен содержать не менее %d символов"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-код должен содержать не менее %d символов"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"Пароль должен содержать не более <xliff:g id="NUMBER">%d</xliff:g> симв."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Экономия энергии"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Переходить в режим экономии энергии, когда экран выключен"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Введите 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_in_progress" msgid="3372311348221357944">"Выполняется настройка 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Точка доступа Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Включение точки доступа…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключение точки доступа…"</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="61237027772641155">"Настройка точки доступа"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Активация в спящем режиме при зарядке"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Заставка"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"При подключении к док-станции, при переходе в спящий режим и во время зарядки"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"При переходе в спящий режим и во время зарядки"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"При подключении к док-станции"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Выключено"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Заставка"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Заставка"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Время до активации"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Выкл."</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Попробовать"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Вкл. в док-станции"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Активировать при переходе в спящий режим"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Активировать при подключении к док-станции"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Размер шрифта"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Прошивка модуля связи"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Версия ядра"</string>
     <string name="build_number" msgid="3075795840572241758">"Номер сборки"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Статус SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Недоступно"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Общая информация"</string>
     <string name="device_status" msgid="607405385799807324">"Общая информация"</string>
@@ -770,6 +787,8 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Очистить SD-карту"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Удаление с внутреннего USB-накопителя телефона всех данных, включая музыку и фотографии."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Удаляет все данные с SD-карты, например музыку и фотографии"</string>
+    <!-- no translation found for mtp_ptp_mode_summary (3710436114807789270) -->
+    <skip />
     <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>
@@ -1001,6 +1020,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"на USB-накопителе"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Удалить"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Отключить"</string>
     <string name="enable_text" msgid="9217362512327828987">"Включить"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Стереть данные"</string>
@@ -1094,6 +1115,7 @@
     <string name="memory" msgid="6609961111091483458">"ОЗУ"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Пользователь: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Процессов: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Процессов: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Процессов: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1199,6 +1221,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Отчеты об ошибках"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Показывать в меню опцию отправки отчета об ошибке"</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>
@@ -1416,9 +1440,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"Создание отчета об ошибке"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Информация о текущем состоянии вашего устройства будет собрана для отправки по электронной почте. Чтобы приготовить отчет об ошибке потребуется некоторое время."</string>
-    <string name="report" msgid="302437572240018342">"Сообщить"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для резервного копирования"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Полные резервные копии в настоящее время не защищены"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Изменить или удалить пароль для резервного копирования"</string>
@@ -1548,6 +1569,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Показ. аппаратные обновл."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Выделять аппаратные уровни зеленым при обновлении"</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>
@@ -1667,6 +1690,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Добавить профиль VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Изменить профиль"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Удалить профиль"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1687,6 +1718,9 @@
     <!-- no translation found for percentage (5866131581207788624) -->
     <skip />
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дополнительные обновления системы"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Отключено"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Только предупреждение"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Блокировка"</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>
@@ -1705,6 +1739,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Аккаунт для контента"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Документ с фото"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Широковещательная передача сообщений"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Выберите типы экстренных оповещений на экране."</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d9d7e08..7e19d66 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Nabíjanie"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Vybíjanie"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezdrôtové)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nenabíja sa"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenabíja sa"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plná"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Odpojené"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"bezdrôtové"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Neznáme"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Neznáme"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Poloha:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susedný identifikátor CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy údajov:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Služba GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmena bezpečnostného kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmeniť bezpečnostné heslo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Heslo musí obsahovať najmenej %d znakov"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovať najmenej %d znakov"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Kód PIN musí obsahovať najmenej %d číslic"</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="7016906583950201704">"Heslo musí mať menej ako <xliff:g id="NUMBER">%d</xliff:g> znakov."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Úsporný režim"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Šetriť batériu pri vypnutom displeji"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Zadajte na 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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosný prístupový bod Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Prebieha zapínanie hotspotu..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Prebieha vypínanie hotspotu..."</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="61237027772641155">"Nastaviť hotspot Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu z"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Dekorácia obrazovky"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Ak je zariadenie pripojené ku zdroju, spustí sa pri prechode do režimu spánku"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Sen"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Pri vložení do doku alebo pri nabíjaní v režime spánku"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Pri nabíjaní v režime spánku"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Pri vložení do doku"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Zakázané"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Vybratá dekorácia"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Vybratý sen"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Čas aktivácie"</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_zero_summary" msgid="1274235565189071582">"Nikdy"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Vyskúšať"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Spustiť aj po vložení do doku"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Spustiť v režime spánku"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Spustiť pri vložení do doku"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Veľkosť písma"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Verzia základného pásma"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzia jadra"</string>
     <string name="build_number" msgid="3075795840572241758">"Číslo zostavy"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stav zabezpečenia SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nie je k dispozícii"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stav"</string>
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Vymazať kartu SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Vymaže vš. údaje v internom uklad. priestore USB, napr. hudbu alebo fotografie."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Vymaže všetky údaje na karte SD, ako je hudba alebo fotografie"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funkcia MTP alebo PTP je aktívna"</string>
     <string name="read_only" msgid="6702420168629076340">" (Iba na čítanie)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Odpojiť úložisko USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Odpojiť kartu SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Údaje ukladacieho priestoru USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinštalovať"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Zakázať"</string>
     <string name="enable_text" msgid="9217362512327828987">"Povoliť"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Vymazanie údajov"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Používateľ: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Počet procesov: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služieb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Počet procesov: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služieb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Počet procesov: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služieb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Nahlasovať chyby z hlavnej ponuky"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"V hlavnej ponuke zahrnúť možnosť na vytvorenie správy o chybe"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Momentálne nie sú záložné údaje ukladané do žiadneho účtu"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatické obnovenie"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri preinštalovaní aplikácie obnoviť zálohované údaje a nastavenia"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Zaznamenať správu o chybe"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Zhromažďuje informácie o aktuálnom stave zariadenia a tieto informácie je následne možné odoslať prostredníctvom e-mailovej správy. Od spustenia vytvárania správy o chybe až do chvíle, kedy je tento nástroj pripravený odoslať prvú správu, môže uplynúť nejaký čas. Prosíme vás preto o trpezlivosť."</string>
-    <string name="report" msgid="302437572240018342">"Vytvoriť prehľad"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo pre zálohu do PC"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Zobr. aktual. hardv. vrs."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hard. vrstvy pri aktualizácii blikajú na zeleno"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Zakázané"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Mierne"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Prísne"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Účet pre obsah"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hromadné zasielanie správ v rámci bunky"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vyberte typy tiesňových upozornení, ktoré sa majú zobraziť."</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bae9e24..c214d9a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Polnjenje"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Praznjenje"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(brezžično)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Se ne polni"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Se ne polni"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Polna"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Odklopljeno"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Napajanje"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"brezžično"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Napajanje + USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Neznano"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Neznano"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP lahko uporablja brskalnik, drugi programi pa ne."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID v bližini:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Podatki o celici:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Podatkovni poskusi:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Storitev GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Gostovanje:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Spremeni kodo PIN za odklepanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Spremeni geslo za odklepanje"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Geslo mora vsebovati vsaj %d znakov"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Koda PIN mora vsebovati vsaj %d znakov"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Koda PIN mora biti vsaj %d-mestna"</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="7016906583950201704">"Geslo mora imeti manj kot toliko znakov: <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Varčevanje z energijo"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Varčevanje z energijo, ko je zaslon izklopljen"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Vnesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> za usmerjevalnik Wi-Fi. Nastavitev lahko traja največ 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_in_progress" msgid="3372311348221357944">"Nastavitev WPS že poteka in lahko traja največ 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosna brezžična dostopna točka"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Vklop dostopne točke  ..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Izklop dostopne točke ..."</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="61237027772641155">"Nastavitev dostopne točke Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ozadje"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Izberite ozadje iz"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Zaslonske sladkarije"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Zagon v stanju pripravljenosti, če je priključeno napajanje"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Sanje"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"V stojalu ali v stanju pripravljenosti in se polni"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"V stanju pripravljenosti in se polni"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"V stojalu"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Onemogočeno"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Izbrane sladkarije"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Izbrane sanje"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kdaj aktivirati"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikoli"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Poskusite!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Zaženi tudi, ko je v stojalu"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Zaženi v stanju pripravljenosti"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Zaženi, ko je v stojalu"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost pisave"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Različica radijske programske opreme"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Različica jedra"</string>
     <string name="build_number" msgid="3075795840572241758">"Delovna različica"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stanje za SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ni na voljo"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stanje"</string>
     <string name="device_status" msgid="607405385799807324">"Stanje"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Izbriši kartico SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Izbriše vse podatke na notranjem pomnilniku USB, na primer glasbo ali fotografije"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Izbriše vse podatke na kartici SD, na primer glasbo ali fotografije"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funkcija MTP ali PTP je aktivna"</string>
     <string name="read_only" msgid="6702420168629076340">" (Samo za branje)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Želite izpeti pomnilnik USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Želite izpeti kartico SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Podatki na pogonu USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kartica SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odstrani"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Onemogoči"</string>
     <string name="enable_text" msgid="9217362512327828987">"Omogoči"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Počisti podatke"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Uporabnik: <xliff:g id="USER_NAME">%1$s</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> storitev"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>proces, število storitev: <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> procesov in <xliff:g id="NUMSERVICES">%2$d</xliff:g> storitev"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Poročila o napakah v meniju z možnostmi za izklop/vklop"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Vključitev možnosti za poročila o napakah v meniju z možnostmi izklop/vklop"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Trenutno v nobenem računu niso shranjeni varnostno kopirani podatki"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Samodejna obnovitev"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri vnovični namestitvi programa obnovite varnostno kopirane nastavitve in podatke"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Ustvari poročilo o napakah"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"S tem bodo zbrani podatki o trenutnem stanju naprave, ki bodo poslani v elektronskem sporočilu. Izvedba poročila o napakah in priprava trajata nekaj časa, zato bodite potrpežljivi."</string>
-    <string name="report" msgid="302437572240018342">"Poročilo"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Geslo za varn. kop. rač."</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Pokaži pos. sl. str. opr."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Obarvaj sloje strojne opreme zeleno ob posodobitvi"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Onemogočeno"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Dopuščajoče"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Uveljavljajoče"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Račun za vsebino"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Oddaje v celici"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Izberite vrste nujnih opozoril, ki jih želite prikazati."</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e5fe25e..de8dba3 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Пуњење"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Пражњење"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(бежично)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Не пуни се"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не пуни се"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Пуно"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Акустично"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"бежично"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Непознато"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Непознато"</string>
@@ -190,6 +192,7 @@
     <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">"Суседни ИД клијента:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Информације о ћелији:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Покушаји преноса података:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS услуга:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роминг:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промена PIN-а за откључавање"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промена лозинке за откључавање"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Минимални број знакова који лозинка мора да садржи је %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Минимални број знакова у PIN коду је %d"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Минимални број цифара у 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="7016906583950201704">"Лозинка мора да има мање од <xliff:g id="NUMBER">%d</xliff:g> знак(ов)а."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Штедња струје"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Штеди струју када је екран угашен"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Унесите 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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносна Wi-Fi приступна тачка"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Укључивање хотспота…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Искључивање хотспота..."</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="61237027772641155">"Подеси Wi-Fi хотспот"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Активираће се када пређе у стање спавања ако је прикључен на напајање"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Сан"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Када је на базној станици или у стању спавања и пуни се"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Када је у стању спавања и пуни се"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Када је на базној станици"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Онемогућен"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Изабрана бомбона"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Изабрани сан"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Када да се активира"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Након стања неактивности од <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Никада"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Испробај!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Активирај и када је на постољу"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Покрени у стању спавања"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Покрени када је на базној станици"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Величина фонта"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Величина фонта"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Верзија основног пропусног опсега"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Верзија језгра"</string>
     <string name="build_number" msgid="3075795840572241758">"Број верзије"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux статус"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Није доступно"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Статус"</string>
     <string name="device_status" msgid="607405385799807324">"Статус"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Брисање SD картице"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Брише све податке из интерне USB меморије, као што су музика и фотографије"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Брише све податке са SD картице, као што су музика и фотографије"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Функција MTP или PTP је активна"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Подаци о USB меморији"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD картица"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Деинсталирај"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Онемогући"</string>
     <string name="enable_text" msgid="9217362512327828987">"Омогући"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Обриши податке"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Корисник: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуге"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процеса и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Извештаји о грешкама у менију напајања"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Омогућите опцију за прављење извештаја о грешкама у менију напајања"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"Направи извештај о грешци"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Ово ће прикупити информације о тренутном стању уређаја и послати их у виду поруке е-поште. Од започињања извештаја о грешци до тренутка за његово слање проћи ће неко време; будите стрпљиви."</string>
-    <string name="report" msgid="302437572240018342">"Направи извештај"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Рез. копија лоз. рачунара"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Резервне копије читавог система тренутно нису заштићене"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Додирните да бисте променили или уклонили лозинку за прављење резервних копија читавог система на рачунару"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Прикажи ажурирања хардверских слојева"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Хардверски слојеви трепере зелено када се ажурирају"</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>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Додавање VPN профила"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Измени профил"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Избриши профил"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Онемогућено"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Омогућено"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Спровођење"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Налог за садржај"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ИД слике"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Поруке инфо сервиса"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изаберите типове упозорења на хитне случајеве који ће се приказивати."</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 28b3373..e533984 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Laddar"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Laddar ur"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(trådlös)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Laddar inte"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Laddar inte"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Fullt"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Urkopplad"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"trådlös"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Okänd"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Okänd"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plats:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Närliggande CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellinfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataförsök:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjänst:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ändra PIN-kod för upplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ändra lösenord för upplåsning"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Lösenordet måste innehålla minst %d tecken"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden måste innehålla minst %d tecken"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koden måste innehålla minst %d siffror"</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="7016906583950201704">"Lösenordet får inte innehålla mer än  <xliff:g id="NUMBER">%d</xliff:g> tecken."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Energisparläge"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Spara ström när skärmen är avstängd"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobil Wi-Fi-surfpunkt"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverar trådlös surfzon ..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Trådlös surfzon inaktiveras ..."</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="61237027772641155">"Konfigurera trådlös surfzon via Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Välj bakgrund från"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Alternativ för skärmsläckare"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Skärmsläckaren aktiveras när enheten sätts i viloläge om den är ansluten till en strömkälla"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Dröm"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"När enheten dockas eller laddas i viloläge"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"När enheten laddas i viloläge"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"När enheten dockas"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inaktiverad"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Valt alternativ"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Vald dröm"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Tidsgräns för skärmsläckare"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldrig"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Testa!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Starta även när enheten är dockad"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Starta i viloläge"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Starta när enheten dockas"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Teckenstorlek"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Basbandsversion"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-version"</string>
     <string name="build_number" msgid="3075795840572241758">"Version"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Inte tillgänglig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Radera SD-kort"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Raderar alla data på den interna USB-lagringsenheten, som musik och foton"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Alla data tas bort från på SD-kortet, bland annat musik och foton"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- eller PTP-funktionen är aktiv"</string>
     <string name="read_only" msgid="6702420168629076340">" (Skrivskyddad)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Ta bort USB-enheten?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Vill du ta bort SD-kortet?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data på USB-lagringsenhet"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Avinstallera"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Inaktivera"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivera"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Rensa data"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Användare: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process och <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjänst"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process och <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjänster"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processer och <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjänst"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Felrapporter på startmenyn"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inkludera alternativet att skapa en felrapport på startmenyn"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Säkerhetskopierade data lagras för tillfället inte på något konto"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk återställning"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"När du installerar om en app återställs säkerhetskopierade inställningar och data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Skapa felrapport"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Nu hämtas information om aktuell status för enheten, som sedan skickas i ett e-postmeddelade. Det tar en liten stund innan felrapporten är färdig och kan skickas, så vi ber dig ha tålamod."</string>
-    <string name="report" msgid="302437572240018342">"Rapportera"</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="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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Visa maskinvaruskiktuppd."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Låt maskinvaruskikt blinka grönt vid uppdateringar"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Inaktiverad"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Tillåtande"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Genomdrivande"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Konto för innehåll"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Välj vilka typer av varningsmeddelanden som ska visas."</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 901d793..4aac1e7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Inachaji"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Inaondoa"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(pasiwaya)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Haichaji"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Haichaji"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Imejaa"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Imechopolewa"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"pasiwaya"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Haijulikani"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Haijulikani"</string>
@@ -192,6 +194,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi ya HTTP inayotumiwa na kivinjari lakini haiwezi kutumika na programu zingine."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Mahali:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ya ujirani:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Maelezo ya Simu:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Majaribio ya data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Huduma ya GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"urandaji:"</string>
@@ -364,7 +367,9 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Badilisha PIN ya kufungua"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Badilisha nenosiri la kufungua"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Nenosiri lazima iwe angalau na vibambo %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN lazima iwe angalau na vibambo %d"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_pin_too_short (1677649103470518953) -->
+    <skip />
     <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="7016906583950201704">"Nenosiri lazima liwe na vibambo chini ya <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -499,6 +504,8 @@
     <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Usitumie mtandao wa Wi-Fi isipokuwa kama una 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_suspend_optimizations" msgid="7104856682836591734">"Hifadhi kawi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Hifadhi kawi wakati skrini imezimwa"</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>
@@ -518,10 +525,10 @@
     <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 kiteua njia chako. 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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"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>
@@ -585,6 +592,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -592,7 +601,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Ubebezi wa Mipangilo ya ubebezi wa eneo maalum la Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inalemaza mtandao-hewa…"</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="61237027772641155">"Sanidi mtandao-hewa wa Wi-Fi"</string>
@@ -661,15 +676,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ya kutokuwa na shughuli"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Mandhari"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chagua mandhari kutoka"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Itaanza ikilala ikiwa imeunganishwa kwenye nguvu"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Ndoto"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Wakati imewekwa kwenye gati au kulala na inachaji"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Wakati inalala au kuchaji"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Wakati kimewekwa kwenye gati"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Imelemazwa"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Pipi iliyochaguliwa"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Ndoto iliyochaguliwa"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Wakati wa kuamilisha"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> uliotumika bila kufanya kitu"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Kamwe"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Ijaribu!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Pia anza wakati imewekwa kwenye kituo"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Anza kinapolala"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Anza wakati kimewekwa kwenye gati"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa maandishi"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukubwa wa fonti"</string>
@@ -706,6 +724,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Toleo la Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Toleo la kiini"</string>
     <string name="build_number" msgid="3075795840572241758">"Nambari ya ujenzi"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Hali ya SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Haipatikani"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Hali"</string>
     <string name="device_status" msgid="607405385799807324">"Hali"</string>
@@ -760,6 +779,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Futa kadi ya SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Futa data yote kwenye hifadhi ya ndani ya USB, kama vile muziki na picha"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Futa data yote kwenye kadi ya SD, kama vile muziki na picha"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Kitendaji cha MTP au PTP ni amilifu"</string>
     <string name="read_only" msgid="6702420168629076340">" (Soma-pekee)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Angua hifadhi ya USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Ondoa kadi ya SD?"</string>
@@ -991,6 +1011,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Hifadhi data ya USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kadi ya SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Ondoa"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Lemaza"</string>
     <string name="enable_text" msgid="9217362512327828987">"Wezesha"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Futa data"</string>
@@ -1084,6 +1106,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Mtumiaji: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulika na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulika na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulikia na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
@@ -1189,6 +1212,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Ripoti za hitilafu za menyu ya nguvu"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Jumuisha chaguo katika menyu ya nguvu kwa kupeleka ripoti ya hitilafu"</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>
@@ -1406,9 +1431,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Hakuna akaunti inayohifadhi kwa sasa data iliyochelezwa"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wakati kusanidi upya prog, rejeza mipangilio iliyohifadhiwa na data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Chukua ripoti ya hitilafu"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Hii itakusanya maelezo kuhusu hali yako ya sasa ya kifaa, na kutuma kama barua pepe. Itachukua muda mfupi kuanzisha ripoti ya hitilafu hadi iwe tayari kutumwa; tafadhali vumilia."</string>
-    <string name="report" msgid="302437572240018342">"Ripoti"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la chelezo ya 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>
@@ -1538,6 +1560,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Onyesha sasisho za safu za maunzi"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Angaza kijani safu za maunzi zinaposasisha"</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>
@@ -1657,6 +1681,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Ongeza wasifu wa VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Hariri wasifu"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Futa wasifu"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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 wasifu."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Mfumo"</string>
@@ -1675,6 +1707,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Imelemazwa"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Ya kuruhusu"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Inatekeleza"</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>
@@ -1693,6 +1728,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Akaunti ya maudhui"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Kitambulisho cha Picha"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Matangazo ya simu"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chagua aina ya arifa za dharura za kuonyesha."</string>
 </resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 2b01d7f..f780f53 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -24,8 +24,8 @@
         <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>
-        <item name="android:layout_marginRight">16dip</item>
+        <item name="android:layout_marginStart">16dip</item>
+        <item name="android:layout_marginEnd">16dip</item>
         <item name="android:orientation">horizontal</item>
         <item name="android:gravity">center_vertical</item>
     </style>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2c0e398..f7d22e4 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"กำลังชาร์จ"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"ไม่ได้กำลังชาร์จแบต"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ระบบไร้สาย)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"ไม่ได้ชาร์จ"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ไม่ได้ชาร์จ"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"เต็ม"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"ไม่ได้เสียบปลั๊ก"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"ระบบไร้สาย"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"ไม่ทราบ"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"ไม่ทราบ"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"ข้อมูลเซลล์:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ความพยายามใช้ข้อมูล:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"บริการ GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"โรมมิ่ง:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"เปลี่ยน PIN สำหรับปลดล็อก"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"เปลี่ยนรหัสผ่านสำหรับปลดล็อก"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"รหัสผ่านจะต้องมีอักขระอย่างน้อย %d ตัว"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN จะต้องมีอักขระอย่างน้อย %d ตัว"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"รหัสผ่านต้องยาวไม่เกิน <xliff:g id="NUMBER">%d</xliff:g> อักขระ"</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"ประหยัดพลังงาน"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"ประหยัดพลังงานเมื่อปิดหน้าจอ"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"ป้อน 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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi ฮอตสปอตแบบพกพา"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"กำลังเปิดฮอตสปอต…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"กำลังปิดฮอตสปอต…"</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="61237027772641155">"ตั้งค่า WiFi ฮอตสปอต"</string>
@@ -671,15 +684,18 @@
     <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">"หน้าจอ Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"จะเริ่มเมื่อเข้าสู่โหมดสลีปหากชาร์จไฟ"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"เมื่อวางบนแท่นชาร์จหรืออยู่ในโหมดสลีปและกำลังชาร์จ"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"เมื่ออยู่ในโหมดสลีปและกำลังชาร์จ"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"เมื่อวางบนแท่นชาร์จ"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"ปิดใช้งานแล้ว"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Candy ที่เลือก"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Dream ที่เลือก"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"เวลาที่เปิดใช้งาน"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"หลังจากไม่มีกิจกรรมเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"ไม่เลย"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"ลองใช้!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"เริ่มต้นเมื่อวางบนแท่นชาร์จด้วย"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"เริ่มต้นเมื่ออยู่ในโหมดสลีป"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"เริ่มต้นเมื่อวางบนแท่นชาร์จ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"ขนาดตัวอักษร"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"เวอร์ชันเบสแบนด์"</string>
     <string name="kernel_version" msgid="9192574954196167602">"เวอร์ชันเคอร์เนล"</string>
     <string name="build_number" msgid="3075795840572241758">"หมายเลขบิวด์"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"สถานะ SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"ใช้งานไม่ได้"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"สถานะ"</string>
     <string name="device_status" msgid="607405385799807324">"สถานะ"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"ลบการ์ด SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"ลบข้อมูลทั้งหมดบนที่เก็บข้อมูล USB ภายใน เช่น เพลงและรูปภาพ"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"ลบข้อมูลทั้งหมดบนการ์ด SD เช่น เพลงและรูปภาพ"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"เปิดใช้งานฟังก์ชัน MTP หรือ PTP อยู่"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"ข้อมูลที่จัดเก็บใน USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"การ์ด SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"ถอนการติดตั้ง"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"ปิดใช้งาน"</string>
     <string name="enable_text" msgid="9217362512327828987">"เปิดใช้งาน"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"ล้างข้อมูล"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"ผู้ใช้: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> กระบวนการและ <xliff:g id="NUMSERVICES">%2$d</xliff:g> บริการ"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> กระบวนการและ <xliff:g id="NUMSERVICES">%2$d</xliff:g> บริการ"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> กระบวนการและ <xliff:g id="NUMSERVICES">%2$d</xliff:g> บริการ"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"รายงานข้อบกพร่องเกี่ยวกับเมนูเปิดปิด"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"เพิ่มตัวเลือกในเมนูเปิดปิดสำหรับการใช้รายงานข้อบกพร่อง"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"ใช้รายงานข้อผิดพลาด"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"การดำเนินการนี้จะรวบรวมข้อมูลเกี่ยวกับสถานะปัจจุบันของอุปกรณ์ของคุณ โดยจะส่งไปในรูปแบบข้อความอีเมล อาจใช้เวลาสักครู่ตั้งแต่เริ่มการสร้างรายงานข้อผิดพลาดจนกระทั่งเสร็จสมบูรณ์ โปรดอดทนรอ"</string>
-    <string name="report" msgid="302437572240018342">"รายงาน"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"รหัสผ่านการสำรองข้อมูลในเดสก์ท็อป"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"การสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อปไม่ได้รับการป้องกันในขณะนี้"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"แตะเพื่อเปลี่ยนหรือลบรหัสผ่านสำหรับการสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"แสดงอัปเดตเลเยอร์ฮาร์ดแวร์"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"เลเยอร์ฮาร์ดแวร์กะพริบเป็นสีเขียวเมื่อมีการอัปเดต"</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>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"เพิ่มโปรไฟล์ VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"แก้ไขโปรไฟล์"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"ลบโปรไฟล์"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"ปิดใช้งานแล้ว"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"อนุญาต"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"บังคับใช้งาน"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"บัญชีสำหรับเนื้อหา"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID รูปภาพ"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"การแจ้งเครือข่ายที่ใช้งาน"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"เลือกประเภทของการแจ้งเตือนฉุกเฉินที่จะแสดง"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cd5fe0f..c0d6b1d 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Pag-charge"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Pagdiskarga"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Hindi nagcha-charge"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Hindi nagkakarga"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Buo"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Naka-unplug"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wireless"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Hindi Kilala"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Hindi Kilala"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ang HTTP proxy ay ginagamit ng browser ngunit hindi maaaring gamitin ng iba pang apps."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasyon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Katabing CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Mga pagtatangka ng data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serbisyong GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Palitan ang PIN na pang-unlock"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Baguhin ang naka-unlock na password"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Dapat hindi bababa sa %d (na) character ang password"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Dapat na hindi bababa sa %d (na) character ang PIN"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Ang PIN ay hindi dapat bababa sa %d (na) digit"</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="7016906583950201704">"Dapat mas kaunti sa <xliff:g id="NUMBER">%d</xliff:g> (na) character ang password."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Magtipid ng power"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Magtipid ng power kapag naka-off ang screen"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Ilagay ang pin na <xliff:g id="NUMBER">%1$s</xliff:g> sa iyong router ng Wi-Fi. Maaaring tumagal nang hanggang dalawang minuto upang makumpleto ang pag-setup."</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_in_progress" msgid="3372311348221357944">"Umuusad na ang WPS at maaaring tumagal nang hanggang 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable na Wi-Fi hotspot"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Pag-on sa hotspot…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Pag-off sa 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="61237027772641155">"I-set up ang Wi-Fi hotspot"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pumili ng wallpaper mula sa"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Candy sa Screen"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Magsisimula kapag naka-sleep kung nakakonekta sa kuryente"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kapag naka-dock o naka-sleep at nagcha-charge"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kapag naka-sleep at nagcha-charge"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kapag naka-dock"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Hindi pinagana"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Napiling candy"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Piniling dream"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kailan isasaaktibo"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> na ginugol na idle"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Hindi kailanman"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Subukan ito!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Simulan din kapag naka-dock"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Magsimula sa sleep"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Simulan kapag naka-dock"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Laki ng font"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Bersyon ng baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Bersyon ng Kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Numero ng build"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Katayuan ng SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Hindi available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Katayuan"</string>
     <string name="device_status" msgid="607405385799807324">"Katayuan"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Burahin ang SD card"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Buburahin lahat ng data sa panloob na imbakan na USB, gaya ng musika at larawan"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Binubura ang lahat ng data sa SD card, gaya ng mga musika at larawan"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Aktibo ang paggana ng MTP o PTP"</string>
     <string name="read_only" msgid="6702420168629076340">" (Read-only)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"I-unmount USB storage?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"I-unmount ang SD card?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data ng USB storage"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD card"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"I-uninstall"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Huwag Paganahin"</string>
     <string name="enable_text" msgid="9217362512327828987">"Paganahin"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"I-clear ang data"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"User: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (na) proseso at <xliff:g id="NUMSERVICES">%2$d</xliff:g> (na) serbisyo"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (na) proseso at <xliff:g id="NUMSERVICES">%2$d</xliff:g> (na) serbisyo"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (na) proseso at <xliff:g id="NUMSERVICES">%2$d</xliff:g> (na) serbisyo"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Mga ulat sa bug sa menu ng power"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Isama ang pagpipilian sa menu ng power para sa pagkuha ng ulat sa bug"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Walang account ang kasalukuyang nag-iimbak ng na-back up na data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Awtomatikong pagbalik"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Kapag muling ini-install ang isang app, ipanumbalik ang mga na-back up na setting at data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Kunin ang ulat ng bug"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Mangongolekta ito ng impormasyon tungkol sa kasalukuyang katayuan ng iyong device, na ipapadala bilang mensaheng e-mail. Gugugol ito ng kaunting oras mula sa pagsisimula sa ulat ng bug hanggang sa handa na itong ipadala; mangyaring maging mapagpasensya."</string>
-    <string name="report" msgid="302437572240018342">"Ulat"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Password ng 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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Pakita upd hardware layer"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"I-flash berde hardware layer pag nag-update ito"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Hindi pinagana"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Nagpapahintulot"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Nagpapatupad"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Account para sa nilalaman"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mga cell broadcast"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Piliin ang mga uri ng mga alerto sa emergency na ipapakita."</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 2ad979f..88d6c2b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Şarj oluyor"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Kullanılıyor"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(kablosuz)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Şarj olmuyor"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Şarj etmiyor"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Dolu"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Prize takılı değil"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"kablosuz"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Bilinmiyor"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Bilinmiyor"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy\'yi tarayıcı kullanıyor, ancak diğer uygulamalar tarafından kullanılamayabilir."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Konum:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Komşu CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Hücre Bilgileri:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Veri giriş denemeleri:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS hizmeti:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Dolaşım:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilit açma PIN\'ini değiştir"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilit açma şifresini değiştir"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Şifre en az %d karakter olmalıdır"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN, en az %d karakter olmalıdır"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN en az %d basamaklı 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="7016906583950201704">"Şifre <xliff:g id="NUMBER">%d</xliff:g> karakterden kısa olmalıdır."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Güç tasarrufu"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Ekran kapatıldığında güç tasarrufu yap"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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_in_progress" msgid="3372311348221357944">"WPS zaten devam ediyor ve tamamlanması iki dakika alabilir"</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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Taşınabilir kablosuz ortak erişim noktası"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot açılıyor…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot kapatılıyor…"</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="61237027772641155">"Kablosuz hotspot kurulumu yap"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Duvar Kağıdı"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Şuradan duvar kağıdı seçin:"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekran Şekeri"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Prize takılıysa, uyku moduna geçtiğinde başlar"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Rüya"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Yuvasına yerleştirildiğinde veya uyku modunda ve şarj edilirken"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Uyku modunda ve şarj edilirken"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Yuvasına yerleştirildiğinde"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Devre dışı"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Seçilen şeker"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Seçili rüya"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Etkinleştirme zamanı"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> boşta kaldıktan sonra"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Hiçbir zaman"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Deneyin!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Yuvasına yerleştirildiğinde de başlat"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Uyku modunda başlat"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Yuvasına yerleştirildiğinde başlat"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Yazı tipi boyutu"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Ana bant sürümü"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Çekirdek sürümü"</string>
     <string name="build_number" msgid="3075795840572241758">"Derleme numarası"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux durumu"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Uygun değil"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Durum"</string>
     <string name="device_status" msgid="607405385799807324">"Durum"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD kartı sil"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Dahili USB bellekteki müzik ve fotoğraf gibi tüm verileri siler"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD karttaki müzik ve fotoğraf gibi tüm verileri siler"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP veya PTP işlevi etkin"</string>
     <string name="read_only" msgid="6702420168629076340">" (Salt okunur)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB belleğin bağlantısı kesilsin mi?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD kartının bağlantısı kesilsin mi?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB bellek verileri"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Kaldır"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Devre dışı bırak"</string>
     <string name="enable_text" msgid="9217362512327828987">"Etkinleştir"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Verileri temizle"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Kullanıcı: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> işlem ve <xliff:g id="NUMSERVICES">%2$d</xliff:g> hizmet"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> işlem ve <xliff:g id="NUMSERVICES">%2$d</xliff:g> hizmet"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> işlem ve<xliff:g id="NUMSERVICES">%2$d</xliff:g> hizmet"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Güç menüsü hata raporları"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Güç menüsünde hata raporunu alma seçeneğini dahil et"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Şu anda, yedeklenmiş verileri depolayan hiçbir hesap yok"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Otomatik geri yükle"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Bir uygulama yeniden yüklendiğinde, yedeklenen ayarları ve diğer verileri geri yükle"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Hata raporu al"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Bu rapor, e-posta iletisi olarak göndermek üzere mevcut cihazınızın durumuyla ilgili bilgi toplar. Hata raporu başlatıldıktan sonra hazır olması biraz zaman alabilir; lütfen sabırlı olun."</string>
-    <string name="report" msgid="302437572240018342">"Rapor oluştur"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Masaüstü yedekleme şifresi"</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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Donanım katmanı güncellemelerini göster"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Flash donanım katmanları güncellendiğinde yeşildir"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Disabled (Devre dışı)"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive (Serbest)"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Zorunlu)"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"İçerik için kullanılan hesap"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Fotoğraflı Kimlik"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hücre yayınları"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Görüntülenecek acil durum uyarı türünü seçin."</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f74f691..0054dfc 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарядж-ся"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Розрядження"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(бездротовий доступ)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Не заряджається"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряджається"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Повна"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Відключено"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"бездротовий доступ"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Невідомо"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Невідомо"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"Інформація про телефон:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Спроб даних:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Служба GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роумінг:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змінити PIN розблок."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змінити пароль розблок."</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль має складатися з мінімум %d симв."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-код має скл. з мінімум %d симв."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"Максимальна кількість символів у паролі: <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Енергозбереження"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Зберігати енергію, коли екран вимкнено"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Введіть 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_in_progress" msgid="3372311348221357944">"Налаштування 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Портат. точка дост. Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Увімкнення точки доступу…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Вимкнення точки доступу…"</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="61237027772641155">"Налаштувати точку доступу Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <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">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Запуститься в режимі сну, якщо підключений до живлення"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Сон"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Коли в док-станції або в режимі сну й заряджання"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Коли в режимі сну й заряджання"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Коли в док-станції"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Вимкнено"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Вибрана заставка"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Вибраний режим сну"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Час для активації"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Через <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> в режимі очікування"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ніколи"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Спробувати!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Також запускати, коли пристрій у док-станції"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Запускати в режимі сну"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Запускати, коли в док-станції"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Розмір шрифту"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Версія радіоприйм."</string>
     <string name="kernel_version" msgid="9192574954196167602">"Версія ядра"</string>
     <string name="build_number" msgid="3075795840572241758">"Номер складання"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Статус SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Недоступний"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Стан"</string>
     <string name="device_status" msgid="607405385799807324">"Стан"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Очистити карту SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Видаляє всі дані на внутрішньому носії USB, такі як музика та фото"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Стирає всі дані на карті SD, як-от музику та фото"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Протоколи MTP або PTP активовано"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Дані на носії USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Карта SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Видалити"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Вимкнути"</string>
     <string name="enable_text" msgid="9217362512327828987">"Увімкнути"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Очистити дані"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"Опер. пам."</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Користувач: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Процес: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, служба: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Процесів: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Процесів: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Повідомлення про помилки в меню \"Живлення\""</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Внести в меню \"Живлення\" опцію створення повідомлень про помилку"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"Зробити звіт про помилки"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Збиратиметься інформація про поточний стан вашого пристрою для подальшого надсилання електронною поштою. Від початку створення звіту про помилки до його повної готовності для надсилання потрібен певний час, тож будьте терплячими."</string>
-    <string name="report" msgid="302437572240018342">"Звіт"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль резерв.копії на ПК"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Повні резервні копії на комп’ютері наразі не захищені"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Торкніться, щоб змінити чи видалити пароль для повного резервного копіювання на комп’ютер"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Показ. апаратні оновлення"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Виділяти апаратні рівні зеленим під час оновлення"</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>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"Додати профіль VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Редагувати профіль"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Видалити профіль"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Вимкнено"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Дозволено"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Застосовано"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Обліковий запис для вмісту"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"Ідентифікатор фотографії"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Широкомовні повідомлення мережі"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Виберіть типи сповіщень про надзвичайні ситуації, які мають відображатися."</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 49342bc..61f758b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Đang sạc"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Ngưng sạc"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(không dây)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Hiện không sạc"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Hiện không sạc"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Đầy"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Đã tháo đầu cắm"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"không dây"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Không xác định"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Không xác định"</string>
@@ -190,6 +192,7 @@
     <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>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vị trí:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID lân cận:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Nỗ lực dữ liệu:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Dịch vụ GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Chuyển vùng:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Thay đổi mã PIN mở khóa"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Thay đổi mật khẩu mở khóa"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Mật khẩu phải có ít nhất %d ký tự"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Mã PIN phải có ít nhất %d ký tự"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Mã PIN phải có ít nhất %d chữ số"</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="7016906583950201704">"Mật khẩu phải ít hơn <xliff:g id="NUMBER">%d</xliff:g> ký tự."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Tiết kiệm điện"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Tiết kiệm điện khi tắt màn hình"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"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 đa 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_in_progress" msgid="3372311348221357944">"WPS đã được xử lý và có thể mất tối đa hai phút để 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Điểm phát sóng Wi-Fi di động"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Đang bật điểm phát sóng…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Đang tắt điểm phát só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="61237027772641155">"Thiết lập điểm phát sóng Wi-Fi"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hình nền"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chọn hình nền từ"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Kẹo trên màn hình"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Sẽ được bật nếu được kết nối với nguồn"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Mô-đun"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Khi được gắn đế hoặc ở chế độ ngủ và sạc pin"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Khi ở chế độ ngủ và sạc pin"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Khi được gắn đế"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Đã bị tắt"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Kẹo được chọn"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Mô-đun đã chọn"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Thời điểm kích hoạt"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> không hoạt động"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Không bao giờ"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Hãy dùng thử!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Cũng kích hoạt khi được gắn"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Bắt đầu khi ở chế độ ngủ"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Bắt đầu khi được gắn đế"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Kích thước phông chữ"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Phiên bản dải tần cơ sở"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Phiên bản Kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Số phiên bản"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Trạng thái SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Không khả dụng"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Trạng thái"</string>
     <string name="device_status" msgid="607405385799807324">"Trạng thái"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Xóa thẻ SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Xóa tất cả dữ liệu trên bộ nhớ trong USB, chẳng hạn như nhạc và ảnh"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc và ảnh"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Chức năng MTP hoặc PTP đang hoạt động"</string>
     <string name="read_only" msgid="6702420168629076340">" (Chỉ đọc)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Ngắt kết nối bộ lưu trữ USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Tháo thẻ SD?"</string>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dữ liệu bộ lưu trữ USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Thẻ SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Gỡ cài đặt"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Tắt"</string>
     <string name="enable_text" msgid="9217362512327828987">"Bật"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Xóa dữ liệu"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Người dùng: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> quá trình và <xliff:g id="NUMSERVICES">%2$d</xliff:g> dịch vụ"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> quá trình và <xliff:g id="NUMSERVICES">%2$d</xliff:g> dịch vụ"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> quá trình và <xliff:g id="NUMSERVICES">%2$d</xliff:g> dịch vụ"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Báo cáo lỗi trong trình đơn nguồn"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Bao gồm tùy chọn trong trình đơn nguồn để thêm báo cáo lỗi"</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>
@@ -1416,9 +1439,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Hiện không có tài khoản nào lưu trữ dữ liệu được sao lưu"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Tự động khôi phục"</string>
     <string name="auto_restore_summary" msgid="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="bugreport_title" msgid="1009498799922543551">"Nhận báo cáo lỗi"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Báo cáo này sẽ thu thập thông tin về tình trạng thiết bị hiện tại của bạn, để gửi dưới dạng thông báo qua email. Sẽ mất một chút thời gian kể từ khi bắt đầu báo cáo lỗi cho tới khi báo cáo sẵn sàng để gửi; xin vui lòng kiên nhẫn."</string>
-    <string name="report" msgid="302437572240018342">"Báo cáo"</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="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>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Hiện c.nhật lớp phần cứng"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Lớp phần cứng flash có màu xanh khi chúng cập nhật"</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>
@@ -1667,6 +1689,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Đã tắt"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Cho phép"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Thực thi"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"Tài khoản dành cho nội dung"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID ảnh"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Phát sóng trên di động"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chọn các loại cảnh báo khẩn cấp để hiển thị."</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 640be72..70615bd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"正在充电"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"（交流电）"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"正在耗电"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"（无线）"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"未在充电"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"未在充电"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"电量充足"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"未插电"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"交流电"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"无线"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"交流电 + USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"未知"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"未知"</string>
@@ -190,6 +192,7 @@
     <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_cellinfo_label" msgid="1300937728020622362">"小区信息："</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"数据尝试次数："</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 服务："</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"漫游："</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"更改解锁 PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"更改解锁密码"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"密码必须至少包含 %d 个字符"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN 必须至少包含 %d 个字符"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"密码必须少于 <xliff:g id="NUMBER">%d</xliff:g> 个字符。"</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"节约电量"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"关闭屏幕后尽量节约电量"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"请在 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_in_progress" msgid="3372311348221357944">"正在设置 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"便携式 Wi-Fi 热点"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"正在打开热点..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在关闭热点..."</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="61237027772641155">"设置 Wi-Fi 热点"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"连接电源后在进入休眠模式时启动"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"梦"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"插入基座或休眠且正在充电时"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"休眠且正在充电时"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"插入基座时"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"已停用"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"所选模块"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"所选的梦"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"激活时间"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"闲置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"永不"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"试试看！"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"插入基座时也启动"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"休眠时启动"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"插入基座时启动"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"字体大小"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"基带版本"</string>
     <string name="kernel_version" msgid="9192574954196167602">"内核版本"</string>
     <string name="build_number" msgid="3075795840572241758">"版本号"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux 状态"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"不可用"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"状态信息"</string>
     <string name="device_status" msgid="607405385799807324">"状态信息"</string>
@@ -770,7 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"格式化 SD 卡"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除内部 USB 存储设备中的全部数据，例如音乐和照片"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除 SD 卡中的全部数据，例如音乐和照片"</string>
-    <string name="mtp_ptp_mode_summary">正在使用媒体设备(MTP)或相机(PTP)传输模式</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP 或 PTP 功能已启用"</string>
     <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>
@@ -1002,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 存储（数据）"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 卡"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"卸载"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"停用"</string>
     <string name="enable_text" msgid="9217362512327828987">"启用"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"清除数据"</string>
@@ -1095,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"用户：<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 个进程和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 个服务"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 个进程和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 个服务"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 个进程和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 个服务"</string>
@@ -1200,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"电源键菜单错误报告"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在电源键菜单中添加提交错误报告的选项"</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>
@@ -1417,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"获取错误报告"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"这会收集有关当前设备状态的信息，并以电子邮件的形式进行发送。从开始生成错误报告到准备好发送需要一点时间，请耐心等待。"</string>
-    <string name="report" msgid="302437572240018342">"报告"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面备份密码"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"桌面完整备份当前未设置密码保护"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"触摸可更改或删除用于桌面完整备份的密码"</string>
@@ -1549,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"显示硬件层更新"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Flash 硬件层在进行更新时会显示为绿色"</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>
@@ -1668,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"添加 VPN 配置文件"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"修改配置文件"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"删除配置文件"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1686,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"许可"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"执行中"</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>
@@ -1704,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"内容帐户"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"照片 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"小区广播"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"请选择要显示的紧急消息类型。"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f49f0c6..67d7d96 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"放電中"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(無線網路)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"非充電中"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"非充電中"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"電力充足"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"未插入"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"無線網路"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"不明"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"不明"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy，但其他應用程式不一定會採用這項設定。"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"位置："</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號："</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"儲存格資訊："</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"嘗試資料："</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 服務："</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"漫遊："</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"密碼必須有至少 %d 個字元"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN 必須有至少 %d 個字元"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"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="7016906583950201704">"密碼最多只能有 <xliff:g id="NUMBER">%d</xliff:g> 個字元。"</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"節省電力"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"關閉螢幕時切換至省電模式"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"請在 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_in_progress" msgid="3372311348221357944">"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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"可攜式 Wi-Fi 無線基地台"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"正在開啟無線基地台…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在關閉無線基地台…"</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="61237027772641155">"設定 WiFi 無線基地台"</string>
@@ -671,15 +684,18 @@
     <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>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"如果連接電源，進入休眠狀態時即啟動"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"安置於座架上、休眠及充電時"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"休眠及充電時"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"安置於座架上時"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"已停用"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"已選取的螢幕保護程式模組"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"選取的 Dream"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"啟動時間"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"永遠不要"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"試試看！"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"安置於座架上時一併啟動"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"休眠時啟動"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"安置於座架上時啟動"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"字型大小"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"基頻版本"</string>
     <string name="kernel_version" msgid="9192574954196167602">"核心版本"</string>
     <string name="build_number" msgid="3075795840572241758">"版本號碼"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux 狀態"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"無法取得"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"狀態"</string>
     <string name="device_status" msgid="607405385799807324">"狀態"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"清除 SD 卡"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除內部 USB 儲存裝置中的所有資料，例如音樂和相片"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除 SD 卡中的所有資料，例如音樂和相片"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP 或 PTP 功能已啟用"</string>
     <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>
@@ -1001,6 +1019,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 儲存裝置資料"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 卡"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"解除安裝"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"停用"</string>
     <string name="enable_text" msgid="9217362512327828987">"啟用"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"清除資料"</string>
@@ -1094,6 +1114,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"使用者：<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 項處理程序和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 項服務"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 項處理程序和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 項服務"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 項處理程序和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 項服務"</string>
@@ -1199,6 +1220,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"電源選單錯誤報告"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在電源選單中納入取得錯誤報告的選項"</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>
@@ -1416,9 +1439,6 @@
     <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="bugreport_title" msgid="1009498799922543551">"取得錯誤報告"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"這會收集您目前裝置狀態的相關資訊，並透過電子郵件傳送給您。從開始建立錯誤報告到準備傳送，這段過程可能需要一點時間，敬請耐心等候。"</string>
-    <string name="report" msgid="302437572240018342">"報告"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"電腦備份密碼"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"電腦完整備份目前未受保護"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"輕觸即可變更或移除電腦完整備份的密碼"</string>
@@ -1548,6 +1568,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"顯示硬體層更新"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"在硬體層更新時閃綠燈"</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>
@@ -1667,6 +1689,14 @@
     <string name="vpn_create" msgid="5628219087569761496">"新增 VPN 設定檔"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"編輯設定檔"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"刪除設定檔"</string>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1685,6 +1715,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"許可"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"執行中"</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>
@@ -1703,6 +1736,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"內容帳戶"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"相片 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"區域廣播"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"選取要顯示的緊急警示類型。"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ebb267a..e18cc50 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -84,12 +84,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Iyashaja"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Iyanqamula"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(okungenantambo)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Ayishaji"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ayishaji"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Kugcwele"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Okumonxuliwe"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"I-AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"I-USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"okungenantambo"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"I-AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Akwaziwa"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Akwaziwa"</string>
@@ -190,6 +192,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Iphrokzi ye-HTTP isetshenziswa isiphequluli kodwa kungenzeka ingasetshenziswa ezinye izinhlelo zokusebenza"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Indawo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"I-CID Yokwakhelana:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Ulwazi leseli:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Imizamo yedatha:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Iseva ye-GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Ukuzulazula:"</string>
@@ -362,7 +365,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Shintsha i-PIN yokuvula"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Shintsha iphasiwedi yokuvula"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Iphasiwedi kumele okungenani ibe nezinhlamvu ezingu-%d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"I-PIN kumele okungenani ibe izinhlamvu ezingu-%d"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Iphinikhodi kumele okungenani ibe amadijithi angu-%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="7016906583950201704">"Iphasiwedi kumele ibe ngaphansi ngezinhlamvu ezingu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -509,6 +512,8 @@
     <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_suspend_optimizations" msgid="7104856682836591734">"Ukulondoloza amandla"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2696244454434564259">"Londoloza amandla uma isikrini sicimile"</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>
@@ -528,10 +533,10 @@
     <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_onstart_pin" msgid="8067502591043979939">"Faka iphinikhodi <xliff:g id="NUMBER">%1$s</xliff:g> kumzila wakho we-Wi-Fi. 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_in_progress" msgid="3372311348221357944">"I-WPS isivele iyaqhubeka futhi ingathatha amaminithi angafika kwamabili 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>
@@ -595,6 +600,8 @@
     <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>
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <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>
@@ -602,7 +609,13 @@
     <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>
+    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
+    <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Indawo ephathekayo ye-Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Ikhanyisa indawo ekudonseka kuyo…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Icima ndawo ekudonseka kuyo…"</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="61237027772641155">"Setha i-Wi-Fi hotspot"</string>
@@ -671,15 +684,18 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Iphephadonga"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Khetha iphephalodonga kwi"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"I-Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Iyoqala emva kokulala uma ixhunywe kugesi"</string>
+    <string name="screensaver_settings_title" msgid="4458091032540874366">"Iphupho"</string>
+    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Uma kudokhiwe noma kulelwe futhi ishaja"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Uma ilele futhi ishaja"</string>
+    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Uma kudokhiwe"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Kukhutshaziwe"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Khethe i-candy"</string>
+    <string name="screensaver_component_title" msgid="5786117148360329058">"Iphupho elikhethiwe"</string>
     <string name="screensaver_timeout_title" msgid="4882666970355550822">"Qlisa nini"</string>
     <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> esithithwe kungenziwa lutho"</string>
     <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nhlobo"</string>
     <string name="screensaver_test" msgid="3048249263811694128">"Yizame!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Iqale futhi uma iboshiwe"</string>
+    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Qala kulelwe"</string>
+    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Qala uma kudokhiwe"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ubukhulu befonti"</string>
@@ -716,6 +732,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Inguqulo ye-Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Inguqulo ye-Kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Inombolo yesakhi"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Isimo se-SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Akutholakali"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Isimo"</string>
     <string name="device_status" msgid="607405385799807324">"Isimo"</string>
@@ -770,6 +787,7 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Sula ikhadi le-SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sula yonke idatha ekugcineni nge-USB kwangaphakathi, njengomculo nezithombe"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Isula yonke idatha ekhadini le-SD, njengomculo nezithombe"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Umsebenzi we-MTP noma we-PTP uyasebenza"</string>
     <string name="read_only" msgid="6702420168629076340">" (Funda kuphela)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Yehlisa indawo yokugcina ye-USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Yehlisa ikhadi le-SD"</string>
@@ -1002,6 +1020,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Idatha yesitoreji se-USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Ikhadi le-SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Khipha"</string>
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Valiwe"</string>
     <string name="enable_text" msgid="9217362512327828987">"Vumela"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Sula idatha"</string>
@@ -1101,6 +1121,7 @@
     <string name="memory" msgid="6609961111091483458">"i-RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Umsebenzisi: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <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> 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>
@@ -1206,6 +1227,8 @@
     <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="bugreport_in_power" msgid="4548816486587403971">"Imibiko yeziphazamiso zenenyu yamandla"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Faka phakathi inketho kumenyu yamandla yokuthatha umbiko wesiphazamiso"</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>
@@ -1423,9 +1446,6 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ayikho i-akhawunti okwamanje egcina ukusekela ngokulondoloza idatha"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Ukubuyisela esimweni okuzenzakalelayo"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Uma ufaka futhi uhlelo lokusebenza, buyisela okuhlelwe ukusebenza kwezipele kanye nemininingo"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Thatha umbiko wesiphazamiso"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Lokhu kuzoqoqa ulwazi mayelana nesimo manje sedivayisi yakho, ukuthumela imilayezo ye-imeyili. Kuzothatha isikhathi esincane kusuka ekuqaleni umbiko wesiphazamiso uze ulungele ukuthunyelwa; sicela ubekezele."</string>
-    <string name="report" msgid="302437572240018342">"Bika"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Iphasiwedi yokusekela ngokulondoloza ye-Desktop"</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>
@@ -1555,6 +1575,8 @@
     <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="show_hw_layers_updates" msgid="5645728765605699821">"Bonisa izibuyekezo zezendlalelo izingxenyekazi zekhompyutha"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Izendlalelo zengxenyekazi zekhompyutha eziluhlaza uma zibuyekeza"</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>
@@ -1674,6 +1696,14 @@
     <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>
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <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>
@@ -1692,6 +1722,9 @@
     <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="selinux_status_disabled" msgid="924551035552323327">"Kukhutshaziwe"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Kunemvume"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Ukuphoqelela"</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>
@@ -1710,6 +1743,8 @@
     <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>
+    <string name="user_account_title" msgid="1127193807312271167">"I-akhawunti yokuqukethwe"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"I-ID yesithombe"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Ukusakazwa kweselula"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Khetha izinhlobo zezaziso zesimo esiphuthumayo ongazibonisa."</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 3367a57..e699dc2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -652,6 +652,24 @@
         <item>10</item>
     </string-array>
 
+    <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] -->
+    <string-array name="overlay_display_devices_entries">
+        <item>None</item>
+        <item>720x480 mdpi</item>
+        <item>1280x720 tvdpi</item>
+        <item>1920x1080 xhdpi</item>
+        <item>1280x720 tvdpi and 1920x1080 xhdpi</item>
+    </string-array>
+
+    <!-- Values for overlay display devices preference. -->
+    <string-array name="overlay_display_devices_values" translatable="false" >
+        <item></item>
+        <item>720x480/160</item>
+        <item>1280x720/213</item>
+        <item>1920x1080/320</item>
+        <item>1280x720/213;1920x1080/320</item>
+    </string-array>
+
     <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
     <string-array name="app_process_limit_entries">
         <item>Standard limit</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f81d614..d6e9150 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -25,6 +25,8 @@
     <color name="memory_dcim">#793A7F</color>
     <color name="memory_music">#8E562A</color>
     <color name="memory_misc">#7C3030</color>
+    <color name="memory_user_light">#479392</color>
+    <color name="memory_user_dark">#316665</color>
 
     <color name="crypt_keeper_clock_background">#ff9a9a9a</color>
     <color name="crypt_keeper_clock_foreground">#ff666666</color>
@@ -34,4 +36,4 @@
     <color name="title_color">@android:color/holo_blue_light</color>
     <color name="setup_divider_color">#333333</color>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 071c19d..2bce5d7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -176,8 +176,10 @@
     <string name="battery_info_status_charging_ac">(AC)</string>
     <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_status_charging_usb">(USB)</string>
+    <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="battery_info_status_charging_wireless">(wireless)</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="battery_info_status_discharging">Discharging</string>
+    <string name="battery_info_status_discharging">Not charging</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_status_not_charging">Not charging</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -187,6 +189,7 @@
     <string name="battery_info_power_unplugged">Unplugged</string>
     <string name="battery_info_power_ac">AC</string>
     <string name="battery_info_power_usb">USB</string>
+    <string name="battery_info_power_wireless">wireless</string>
     <string name="battery_info_power_ac_usb">AC+USB</string>
     <string name="battery_info_power_unknown">Unknown</string>
 
@@ -416,6 +419,8 @@
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_neighboring_location_label">Neighboring CID:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radio_info_cellinfo_label">CellInfo:</string>
+    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_data_attempts_label">Data attempts:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
 
@@ -1206,6 +1211,10 @@
     <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. -->
     <string name="wifi_setting_sleep_policy_error">There was a problem changing the setting</string>
+    <!-- Checkbox title for option to toggle suspend power optimizations -->
+    <string name="wifi_suspend_optimizations">Power save</string>
+    <!-- Checkbox summary for option to toggle suspend power optimizations -->
+    <string name="wifi_suspend_optimizations_summary">Save power when screen is turned off</string>
     <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
     <string name="wifi_add_network">Add network</string>
     <!-- Header for the list of wifi networks-->
@@ -1247,13 +1256,13 @@
     <!-- 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>
+    <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 up to 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>
+    <string name="wifi_wps_in_progress">WPS is already in progress and can take up to 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] -->
@@ -1405,7 +1414,7 @@
     <!-- Label for the DNS (second one)-->
     <string name="wifi_dns2">DNS 2</string>
     <!-- Hint text for DNS -->
-    <string name="wifi_dns2_hint" translatable="false">4.4.4.4</string>
+    <string name="wifi_dns2_hint" translatable="false">8.8.4.4</string>
     <!-- Label for the gateway of the network -->
     <string name="wifi_gateway">Gateway</string>
     <!-- Hint text for the gateway -->
@@ -1687,24 +1696,25 @@
     <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
     <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
     <!-- Display settings screen, trigger for screen saver options -->
-    <string name="screensaver_settings_title">Screen Candy</string>
-    <!-- Display settings screen, summary for screen saver options, screen saver is turned on -->
-    <string name="screensaver_settings_summary_on">Will start upon sleep if connected to power</string>
+    <string name="screensaver_settings_title">Dream</string>
+    <!-- Display settings screen, summary fragment for screen saver options, activated on sleep or docked -->
+    <string name="screensaver_settings_summary_either_long">When docked or asleep and charging</string>
+    <!-- Dream settings screen, dialog option, activated on sleep or docked -->
+    <string name="screensaver_settings_summary_either_short">Either</string>
+    <!-- Display settings screen, summary fragment for screen saver options, activated on sleep -->
+    <string name="screensaver_settings_summary_sleep">While asleep and charging</string>
+    <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
+    <string name="screensaver_settings_summary_dock">While docked</string>
     <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
     <string name="screensaver_settings_summary_off">Disabled</string>
-    <!-- Screen saver settings, setting option name to select a module -->
-    <string name="screensaver_component_title">Selected candy</string>
-    <!-- Screen saver settings, setting option name to change activation timeout -->
-    <string name="screensaver_timeout_title">When to activate</string>
-    <!-- Screen saver settings, setting option summary to change activation timeout -->
-    <string name="screensaver_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> spent idle</string>
-    <!-- Screen saver settings, setting option summary to change activation timeout, shown when disabled -->
-    <string name="screensaver_timeout_zero_summary">Never</string>
-    <!-- Screen saver settings, button allowing the user to test/try the current module -->
-    <string name="screensaver_test">Try it!</string>
-    <!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when
-         the device is docked -->
-    <string name="screensaver_activate_on_dock_title">Also start when docked</string>
+    <!-- Dream settings screen, caption for when dreams are disabled -->
+    <string name="screensaver_settings_disabled_prompt">To control what happens when the phone is docked and/or sleeping, turn Dreams on.</string>
+    <!-- Dream settings screen, action label, start dreaming -->
+    <string name="screensaver_settings_start_dreaming">Start dreaming now</string>
+    <!-- Dream settings screen, action label, when to dream -->
+    <string name="screensaver_settings_when_to_dream">When to dream</string>
+    <!-- Dream settings screen, button label to start dreaming -->
+    <string name="screensaver_settings_dream_start">Start</string>
     <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
     <string name="automatic_brightness">Automatic brightness</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
@@ -2412,6 +2422,8 @@
     <string name="external_data_size_label" product="default">SD card</string>
     <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
     <string name="uninstall_text">Uninstall</string>
+    <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+    <string name="install_text">Install</string>
     <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
     <string name="disable_text">Disable</string>
     <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
@@ -2616,6 +2628,8 @@
     <string name="memory">RAM</string>
     <!-- Text to label a process entry with the process name. -->
     <string name="service_process_name"><xliff:g id="process">%1$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+    <string name="running_process_item_user_label">User: <xliff:g id="user_name">%1$s</xliff:g></string>
     <!-- Descriptive text of a running process: singular process, singular service. -->
     <string name="running_processes_item_description_s_s"><xliff:g id="numprocess">%1$d</xliff:g>
         process and <xliff:g id="numservices">%2$d</xliff:g> service</string>
@@ -2868,6 +2882,10 @@
     <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>
+    <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
+    <string name="bugreport_in_power">Power menu bug reports</string>
+    <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
+    <string name="bugreport_in_power_summary">Include option in power menu for taking a bug report</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  -->
@@ -3317,6 +3335,34 @@
     <string name="gadget_title">Power control</string>
     <string name="gadget_toggle_wifi">Updating Wi-Fi setting</string>
     <string name="gadget_toggle_bluetooth">Updating Bluetooth setting</string>
+    <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
+    <string name="gadget_state_template"><xliff:g name="feature" example="Wi-Fi">%1$s</xliff:g> <xliff:g name="state" example="off">%2$s</xliff:g></string>
+    <!-- Gadget value used to describe on state. -->
+    <string name="gadget_state_on">on</string>
+    <!-- Gadget value used to describe off state. -->
+    <string name="gadget_state_off">off</string>
+    <!-- Gadget value used to describe turning on state. -->
+    <string name="gadget_state_turning_on">turning on</string>
+    <!-- Gadget value used to describe turning off state. -->
+    <string name="gadget_state_turning_off">turning off</string>
+    <!-- Spoken description for the Wi-Fi power control gadget. -->
+    <string name="gadget_wifi">Wi-Fi</string>
+    <!-- Spoken description for the Bluetooth power control gadget. -->
+    <string name="gadget_bluetooth">Bluetooth</string>
+    <!-- Spoken description for the GPS power control gadget. -->
+    <string name="gadget_gps">GPS</string>
+    <!-- Spoken description for the data synchronization gadget. -->
+    <string name="gadget_sync">Sync</string>
+    <!-- Template for brightness gadget toggle button description. -->
+    <string name="gadget_brightness_template">Brightness <xliff:g name="state" example="half">%1$s</xliff:g></string>
+    <!-- Brightness gadget value used to describe automatic brightness state. -->
+    <string name="gadget_brightness_state_auto">auto</string>
+    <!-- Brightness gadget value used to describe maximum brightness state. -->
+    <string name="gadget_brightness_state_full">full</string>
+    <!-- Brightness gadget value used to describe half brightness state. -->
+    <string name="gadget_brightness_state_half">half</string>
+    <!-- Brightness gadget value used to describe minimum brightness state. -->
+    <string name="gadget_brightness_state_off">off</string>
 
     <!-- Title of preference to enter the VPN settings activity -->
     <string name="vpn_settings_title">VPN</string>
@@ -3396,16 +3442,6 @@
     <!-- Summary text of the "automatic restore" setting -->
     <string name="auto_restore_summary">When reinstalling an app, restore backed up settings and data</string>
 
-    <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
-    <string name="bugreport_title">Take bug report</string>
-    <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
-    <string name="bugreport_message">This will collect information about your
-        current device state, to send as an e-mail message.  It will take a little
-        time from starting the bug report until it is ready to be sent; please be
-        patient.</string>
-    <!-- Button in bugreport dialog to confirm starting the report [CHAR LIMIT=NONE] -->
-    <string name="report">Report</string>
-
     <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
     <string name="local_backup_password_title">Desktop backup password</string>
     <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
@@ -3744,6 +3780,11 @@
     <!-- 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: show when hardware layers get updated [CHAR LIMIT=25] -->
+    <string name="show_hw_layers_updates">Show hardware layers updates</string>
+    <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
+    <string name="show_hw_layers_updates_summary">Flash hardware layers green when they update</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] -->
@@ -3790,6 +3831,9 @@
     <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
     <string name="animator_duration_scale_title">Animator duration scale</string>
 
+    <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
+    <string name="overlay_display_devices_title">Simulate secondary displays</string>
+
     <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
     <string name="debug_applications_category">Apps</string>
 
@@ -4017,6 +4061,15 @@
     <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>
+    <!-- Menu item to select always-on VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_menu_lockdown">Always-on VPN</string>
+
+    <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
+    <string name="vpn_lockdown_summary">Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN.</string>
+    <!-- List item indicating that no always-on VPN is selected. [CHAR LIMIT=64] -->
+    <string name="vpn_lockdown_none">None</string>
+    <!-- Error indicating that the selected VPN doesn't meet requirements. [CHAR LIMIT=NONE] -->
+    <string name="vpn_lockdown_config_error">Always-on VPN requires an IP address for both server and DNS.</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>
@@ -4072,7 +4125,7 @@
     <skip/>
 
     <!-- User settings screen title [CHAR LIMIT=25] -->
-    <string name="user_settings_title">Users &amp; restrictions</string>
+    <string name="user_settings_title">Users</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] -->
@@ -4136,6 +4189,13 @@
     <string name="help_url_backup_reset" translatable="false"></string>
     <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
     <string name="help_url_tether" translatable="false"></string>
+    <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
+    <string name="help_url_dreams" translatable="false"></string>
+
+    <!-- User account title [CHAR LIMIT=30] -->
+    <string name="user_account_title">Account for content</string>
+    <!-- User picture title [CHAR LIMIT=30] -->
+    <string name="user_picture_title">Photo ID</string>
 
     <!-- Cell Broadcast settings title [CHAR LIMIT=50] -->
     <string name="cell_broadcast_settings">Cell broadcasts</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 42f2837..502d76d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,7 +20,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:textAppearance">@style/TextAppearance.info_label</item>
-        <item name="android:paddingRight">4dip</item>
+        <item name="android:paddingEnd">4dip</item>
     </style>
 
     <style name="info_value">
@@ -37,9 +37,9 @@
 
     <style name="info_layout">
         <item name="android:orientation">vertical</item>
-        <item name="android:paddingLeft">10dip</item>
+        <item name="android:paddingStart">10dip</item>
         <item name="android:paddingTop">10dip</item>
-        <item name="android:paddingRight">10dip</item>
+        <item name="android:paddingEnd">10dip</item>
         <item name="android:paddingBottom">10dip</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
@@ -110,10 +110,10 @@
         <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>
-        <item name="android:layout_marginRight">16dip</item>
+        <item name="android:layout_marginStart">16dip</item>
+        <item name="android:layout_marginEnd">16dip</item>
         <item name="android:orientation">vertical</item>
-        <item name="android:gravity">left</item>
+        <item name="android:gravity">start</item>
     </style>
 
     <style name="wifi_item_label">
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 47e58da..34c0ae3 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -18,8 +18,8 @@
         android:title="@string/development_settings_title">
     <com.android.settings.BugreportPreference
             android:key="bugreport"
-            android:title="@string/bugreport_title"
-            android:dialogTitle="@string/bugreport_title" />
+            android:title="@*android:string/bugreport_title"
+            android:dialogTitle="@*android:string/bugreport_title" />
 
     <PreferenceScreen
             android:key="local_backup_password"
@@ -58,6 +58,11 @@
             android:summary="@string/enable_adb_summary"/>
 
         <CheckBoxPreference
+            android:key="bugreport_in_power"
+            android:title="@string/bugreport_in_power"
+            android:summary="@string/bugreport_in_power_summary"/>
+
+        <CheckBoxPreference
             android:key="allow_mock_location"
             android:title="@string/allow_mock_location"
             android:summary="@string/allow_mock_location_summary"/>
@@ -101,6 +106,11 @@
             android:summary="@string/show_hw_screen_updates_summary"/>
 
         <CheckBoxPreference
+            android:key="show_hw_layers_udpates"
+            android:title="@string/show_hw_layers_updates"
+            android:summary="@string/show_hw_layers_updates_summary"/>
+
+        <CheckBoxPreference
             android:key="show_screen_updates"
             android:title="@string/show_screen_updates"
             android:summary="@string/show_screen_updates_summary"/>
@@ -136,6 +146,13 @@
             android:title="@string/force_hw_ui"
             android:summary="@string/force_hw_ui_summary"/>
 
+        <ListPreference
+            android:key="overlay_display_devices"
+            android:title="@string/overlay_display_devices_title"
+            android:persistent="false"
+            android:entries="@array/overlay_display_devices_entries"
+            android:entryValues="@array/overlay_display_devices_values" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_monitoring_category"
diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml
index 6569bc7..a13032f 100644
--- a/res/xml/dream_settings.xml
+++ b/res/xml/dream_settings.xml
@@ -15,25 +15,28 @@
 -->
 
 <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"
-            />
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/screensaver_settings_title" >
 
     <CheckBoxPreference
-            android:key="activate_on_dock"
-            android:persistent="false"
-            android:title="@string/screensaver_activate_on_dock_title"
-            android:defaultValue="true" />
+        android:key="activate_on_sleep"
+        android:persistent="false"
+        android:title="@string/screensaver_activate_on_sleep_title" />
 
-</PreferenceScreen>
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="activate_on_dock"
+        android:persistent="false"
+        android:title="@string/screensaver_activate_on_dock_title" />
+
+    <com.android.settings.DreamComponentPreference
+        android:key="screensaver_component"
+        android:persistent="false"
+        android:title="@string/screensaver_component_title" />
+
+    <com.android.settings.DreamTesterPreference
+        android:key="test"
+        android:persistent="false"
+        android:title="@string/screensaver_test" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 2089bac..c426a0d 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -19,7 +19,8 @@
 
 
     <!-- WIRELESS and NETWORKS -->
-    <header android:title="@string/header_category_wireless_networks" />
+    <header android:id="@+id/wireless_section"
+        android:title="@string/header_category_wireless_networks" />
 
     <!-- Wifi -->
     <header
@@ -58,7 +59,8 @@
         android:icon="@drawable/empty_icon" />
 
     <!-- DEVICE -->
-    <header android:title="@string/header_category_device" />
+    <header android:id="@+id/device_section"
+        android:title="@string/header_category_device" />
 
     <!-- Sound -->
     <header
@@ -95,6 +97,13 @@
         android:title="@string/applications_settings"
         android:id="@+id/application_settings" />
 
+    <!-- Manage users -->
+    <header
+        android:fragment="com.android.settings.users.UserSettings"
+        android:icon="@drawable/ic_settings_sync"
+        android:title="@string/user_settings_title"
+        android:id="@+id/user_settings" />
+
     <!-- Manufacturer hook -->
     <header
         android:fragment="com.android.settings.WirelessSettings"
@@ -104,14 +113,8 @@
 
 
     <!-- PERSONAL -->
-    <header android:title="@string/header_category_personal" />
-
-    <!-- Manage users -->
-    <header
-        android:fragment="com.android.settings.users.UserSettings"
-        android:icon="@drawable/ic_settings_sync"
-        android:title="@string/user_settings_title"
-        android:id="@+id/user_settings" />
+    <header android:id="@+id/personal_section"
+        android:title="@string/header_category_personal" />
 
     <!-- Location -->
     <header
@@ -155,7 +158,8 @@
     </header>
 
     <!-- SYSTEM -->
-    <header android:title="@string/header_category_system" />
+    <header android:id="@+id/system_section"
+        android:title="@string/header_category_system" />
 
     <!-- Dock -->
     <header
diff --git a/res/xml/tts_engine_settings.xml b/res/xml/tts_engine_settings.xml
index 03414e8..176bdbc 100644
--- a/res/xml/tts_engine_settings.xml
+++ b/res/xml/tts_engine_settings.xml
@@ -19,16 +19,19 @@
         android:key="tts_default_lang"
         android:title="@string/tts_default_lang_title"
         android:summary="@string/tts_default_lang_summary"
-        android:persistent="false" />
+        android:persistent="false"
+        android:order="100" />
 
     <Preference
         android:key="tts_engine_settings"
         android:persistent="false"
-        android:title="@string/tts_engine_settings_title" />
+        android:title="@string/tts_engine_settings_title"
+        android:order="200" />
 
     <Preference
         android:key="tts_install_data"
         android:persistent="false"
         android:title="@string/tts_install_data_title"
-        android:summary="@string/tts_install_data_summary" />
+        android:summary="@string/tts_install_data_summary"
+        android:order="300" />
 </PreferenceScreen>
diff --git a/res/xml/user_details.xml b/res/xml/user_details.xml
index 257eee4..f36fd45 100644
--- a/res/xml/user_details.xml
+++ b/res/xml/user_details.xml
@@ -26,37 +26,11 @@
                 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"
+        <Preference
+                android:key="user_picture"
+                android:title="@string/user_picture_title"
                 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/vpn_settings2.xml b/res/xml/vpn_settings2.xml
index 38632cc..08075a6 100644
--- a/res/xml/vpn_settings2.xml
+++ b/res/xml/vpn_settings2.xml
@@ -16,8 +16,4 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/vpn_title">
-    <Preference android:key="add_network"
-            android:title="@string/vpn_create"
-            android:order="1"
-            android:persistent="false"/>
 </PreferenceScreen>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 3000666..10eab29 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -47,6 +47,12 @@
             android:entries="@array/wifi_frequency_band_entries"
             android:entryValues="@array/wifi_frequency_band_values"
             />
+
+    <CheckBoxPreference
+            android:key="suspend_optimizations"
+            android:title="@string/wifi_suspend_optimizations"
+            android:summary="@string/wifi_suspend_optimizations_summary"
+            android:persistent="false" />
     
     <Preference android:key="mac_address" 
         style="?android:attr/preferenceInformationStyle" 
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 8cb04cc..4047555 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -586,7 +586,7 @@
         activity.getActionBar().setCustomView(toggleSwitch,
                 new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
                         ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                        Gravity.CENTER_VERTICAL | Gravity.END));
         return toggleSwitch;
     }
 
diff --git a/src/com/android/settings/BatteryInfo.java b/src/com/android/settings/BatteryInfo.java
index d8046cf..ccad236 100644
--- a/src/com/android/settings/BatteryInfo.java
+++ b/src/com/android/settings/BatteryInfo.java
@@ -102,6 +102,9 @@
                     case BatteryManager.BATTERY_PLUGGED_USB:
                         mPower.setText(getString(R.string.battery_info_power_usb));
                         break;
+                    case BatteryManager.BATTERY_PLUGGED_WIRELESS:
+                        mPower.setText(getString(R.string.battery_info_power_wireless));
+                        break;
                     case (BatteryManager.BATTERY_PLUGGED_AC|BatteryManager.BATTERY_PLUGGED_USB):
                         mPower.setText(getString(R.string.battery_info_power_ac_usb));
                         break;
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index eff5c50..858d50f 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -24,6 +24,7 @@
 import android.os.IPowerManager;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.preference.SeekBarDialogPreference;
@@ -37,6 +38,11 @@
 
 public class BrightnessPreference extends SeekBarDialogPreference implements
         SeekBar.OnSeekBarChangeListener, CheckBox.OnCheckedChangeListener {
+    // If true, enables the use of the screen auto-brightness adjustment setting.
+    private static final boolean USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT = false;
+
+    private final int mScreenBrightnessMinimum;
+    private final int mScreenBrightnessMaximum;
 
     private SeekBar mSeekBar;
     private CheckBox mCheckBox;
@@ -51,12 +57,6 @@
 
     private boolean mRestoredOldState;
 
-    // Backlight range is from 0 - 255. Need to make sure that user
-    // doesn't set the backlight to 0 and get stuck
-    private int mScreenBrightnessDim =
-	    getContext().getResources().getInteger(com.android.internal.R.integer.config_screenBrightnessDim);
-    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()) {
@@ -77,6 +77,10 @@
     public BrightnessPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
 
+        PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
+        mScreenBrightnessMinimum = pm.getMinimumScreenBrightnessSetting();
+        mScreenBrightnessMaximum = pm.getMaximumScreenBrightnessSetting();
+
         mAutomaticAvailable = context.getResources().getBoolean(
                 com.android.internal.R.bool.config_automatic_brightness_available);
 
@@ -113,7 +117,7 @@
             mOldAutomatic = getBrightnessMode(0);
             mAutomaticMode = mOldAutomatic == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
             mCheckBox.setChecked(mAutomaticMode);
-            mSeekBar.setEnabled(!mAutomaticMode);
+            mSeekBar.setEnabled(!mAutomaticMode || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
         } else {
             mSeekBar.setEnabled(true);
         }
@@ -137,14 +141,15 @@
         setMode(isChecked ? Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC
                 : Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
         mSeekBar.setProgress(getBrightness());
-        mSeekBar.setEnabled(!mAutomaticMode);
+        mSeekBar.setEnabled(!mAutomaticMode || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
         setBrightness(mSeekBar.getProgress(), false);
     }
 
     private int getBrightness() {
         int mode = getBrightnessMode(0);
         float brightness = 0;
-        if (false && mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
+        if (USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT
+                && mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
             brightness = Settings.System.getFloat(getContext().getContentResolver(),
                     Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0);
             brightness = (brightness+1)/2;
@@ -155,8 +160,8 @@
             } else {
                 brightness = mCurBrightness;
             }
-            brightness = (brightness - mScreenBrightnessDim)
-                    / (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
+            brightness = (brightness - mScreenBrightnessMinimum)
+                    / (mScreenBrightnessMaximum - mScreenBrightnessMinimum);
         }
         return (int)(brightness*SEEK_BAR_RANGE);
     }
@@ -180,7 +185,7 @@
                 == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
         mCheckBox.setChecked(checked);
         mSeekBar.setProgress(getBrightness());
-        mSeekBar.setEnabled(!checked);
+        mSeekBar.setEnabled(!checked || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
     }
 
     @Override
@@ -212,13 +217,13 @@
 
     private void setBrightness(int brightness, boolean write) {
         if (mAutomaticMode) {
-            if (false) {
+            if (USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT) {
                 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);
+                        power.setTemporaryScreenAutoBrightnessAdjustmentSettingOverride(valf);
                     }
                     if (write) {
                         final ContentResolver resolver = getContext().getContentResolver();
@@ -229,13 +234,13 @@
                 }
             }
         } else {
-            int range = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
-            brightness = (brightness*range)/SEEK_BAR_RANGE + mScreenBrightnessDim;
+            int range = (mScreenBrightnessMaximum - mScreenBrightnessMinimum);
+            brightness = (brightness * range)/SEEK_BAR_RANGE + mScreenBrightnessMinimum;
             try {
                 IPowerManager power = IPowerManager.Stub.asInterface(
                         ServiceManager.getService("power"));
                 if (power != null) {
-                    power.setBacklightBrightness(brightness);
+                    power.setTemporaryScreenBrightnessSettingOverride(brightness);
                 }
                 if (write) {
                     mCurBrightness = -1;
diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index e003d61..ba58ef4 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java
@@ -33,8 +33,8 @@
     @Override
     protected void onPrepareDialogBuilder(Builder builder) {
         super.onPrepareDialogBuilder(builder);
-        builder.setPositiveButton(R.string.report, this);
-        builder.setMessage(R.string.bugreport_message);
+        builder.setPositiveButton(com.android.internal.R.string.report, this);
+        builder.setMessage(com.android.internal.R.string.bugreport_message);
     }
 
     @Override
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 2940442..4657be5 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -300,8 +300,8 @@
             int nonletter = 0;
             for (int i = 0; i < password.length(); i++) {
                 char c = password.charAt(i);
-                // allow non white space Latin-1 characters only
-                if (c <= 32 || c > 127) {
+                // allow non control Latin-1 characters only
+                if (c < 32 || c > 127) {
                     return getString(R.string.lockpassword_illegal_character);
                 }
                 if (c >= '0' && c <= '9') {
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 5e20a6e..d0ec1e7 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -85,7 +85,7 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
-import android.os.UserId;
+import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.provider.Settings;
@@ -806,7 +806,7 @@
 
         updateDetailData();
 
-        if (UserId.isApp(appId) && !mPolicyManager.getRestrictBackground()
+        if (UserHandle.isApp(appId) && !mPolicyManager.getRestrictBackground()
                 && isBandwidthControlEnabled() && hasReadyMobileRadio(context)) {
             setPreferenceTitle(mAppRestrictView, R.string.data_usage_app_restrict_background);
             setPreferenceSummary(mAppRestrictView,
@@ -1486,8 +1486,8 @@
             for (int i = 0; i < size; i++) {
                 entry = stats.getValues(i, entry);
 
-                final boolean isApp = UserId.isApp(entry.uid);
-                final int appId = isApp ? UserId.getAppId(entry.uid) : entry.uid;
+                final boolean isApp = UserHandle.isApp(entry.uid);
+                final int appId = isApp ? UserHandle.getAppId(entry.uid) : entry.uid;
                 if (isApp || appId == UID_REMOVED || appId == UID_TETHERING) {
                     AppItem item = knownUids.get(appId);
                     if (item == null) {
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 46ffe83..7708aa7 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -79,6 +79,7 @@
     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 BUGREPORT_IN_POWER_KEY = "bugreport_in_power";
 
     private static final String DEBUG_APP_KEY = "debug_app";
     private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
@@ -91,10 +92,12 @@
     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 SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_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 OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
 
     private static final String ENABLE_TRACES_KEY = "enable_traces";
 
@@ -118,6 +121,7 @@
     private boolean mDontPokeProperties;
 
     private CheckBoxPreference mEnableAdb;
+    private CheckBoxPreference mBugreportInPower;
     private CheckBoxPreference mKeepScreenOn;
     private CheckBoxPreference mEnforceReadExternal;
     private CheckBoxPreference mAllowMockLocation;
@@ -136,10 +140,12 @@
     private CheckBoxPreference mForceHardwareUi;
     private CheckBoxPreference mTrackFrameTime;
     private CheckBoxPreference mShowHwScreenUpdates;
+    private CheckBoxPreference mShowHwLayersUpdates;
     private CheckBoxPreference mDebugLayout;
     private ListPreference mWindowAnimationScale;
     private ListPreference mTransitionAnimationScale;
     private ListPreference mAnimatorDurationScale;
+    private ListPreference mOverlayDisplayDevices;
     private MultiCheckPreference mEnableTracesPref;
 
     private CheckBoxPreference mImmediatelyDestroyActivities;
@@ -170,6 +176,7 @@
         addPreferencesFromResource(R.xml.development_prefs);
 
         mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
+        mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY);
         mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON);
         mEnforceReadExternal = findAndInitCheckboxPref(ENFORCE_READ_EXTERNAL);
         mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION);
@@ -188,6 +195,7 @@
         mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY);
         mTrackFrameTime = findAndInitCheckboxPref(TRACK_FRAME_TIME_KEY);
         mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY);
+        mShowHwLayersUpdates = findAndInitCheckboxPref(SHOW_HW_LAYERS_UPDATES_KEY);
         mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY);
         mWindowAnimationScale = (ListPreference) findPreference(WINDOW_ANIMATION_SCALE_KEY);
         mAllPrefs.add(mWindowAnimationScale);
@@ -198,6 +206,9 @@
         mAnimatorDurationScale = (ListPreference) findPreference(ANIMATOR_DURATION_SCALE_KEY);
         mAllPrefs.add(mAnimatorDurationScale);
         mAnimatorDurationScale.setOnPreferenceChangeListener(this);
+        mOverlayDisplayDevices = (ListPreference) findPreference(OVERLAY_DISPLAY_DEVICES_KEY);
+        mAllPrefs.add(mOverlayDisplayDevices);
+        mOverlayDisplayDevices.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++) {
@@ -260,7 +271,7 @@
         activity.getActionBar().setCustomView(mEnabledSwitch, new ActionBar.LayoutParams(
                 ActionBar.LayoutParams.WRAP_CONTENT,
                 ActionBar.LayoutParams.WRAP_CONTENT,
-                Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                Gravity.CENTER_VERTICAL | Gravity.END));
     }
 
     @Override
@@ -333,9 +344,11 @@
         mHaveDebugSettings = false;
         updateCheckBox(mEnableAdb, Settings.Secure.getInt(cr,
                 Settings.Secure.ADB_ENABLED, 0) != 0);
+        updateCheckBox(mBugreportInPower, Settings.Secure.getInt(cr,
+                Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0);
         updateCheckBox(mKeepScreenOn, Settings.System.getInt(cr,
                 Settings.System.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
-        updateCheckBox(mEnforceReadExternal, isPermissionEnforced(context, READ_EXTERNAL_STORAGE));
+        updateCheckBox(mEnforceReadExternal, isPermissionEnforced(READ_EXTERNAL_STORAGE));
         updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
                 Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
         updateHdcpValues();
@@ -349,8 +362,10 @@
         updateHardwareUiOptions();
         updateTrackFrameTimeOptions();
         updateShowHwScreenUpdatesOptions();
+        updateShowHwLayersUpdatesOptions();
         updateDebugLayoutOptions();
         updateAnimationScaleOptions();
+        updateOverlayDisplayDevicesOptions();
         updateEnableTracesOptions();
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
@@ -370,6 +385,7 @@
         writeAnimationScaleOption(0, mWindowAnimationScale, null);
         writeAnimationScaleOption(1, mTransitionAnimationScale, null);
         writeAnimationScaleOption(2, mAnimatorDurationScale, null);
+        writeOverlayDisplayDevicesOptions(null);
         writeEnableTracesOptions(0);
         writeAppProcessLimitOptions(null);
         mHaveDebugSettings = false;
@@ -581,7 +597,18 @@
 
     private void writeShowHwScreenUpdatesOptions() {
         SystemProperties.set(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
-                mShowHwScreenUpdates.isChecked() ? "true" : "false");
+                mShowHwScreenUpdates.isChecked() ? "true" : null);
+        pokeSystemProperties();
+    }
+
+    private void updateShowHwLayersUpdatesOptions() {
+        updateCheckBox(mShowHwLayersUpdates, SystemProperties.getBoolean(
+                HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false));
+    }
+
+    private void writeShowHwLayersUpdatesOptions() {
+        SystemProperties.set(HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
+                mShowHwLayersUpdates.isChecked() ? "true" : null);
         pokeSystemProperties();
     }
 
@@ -663,6 +690,31 @@
         }
     }
 
+    private void updateOverlayDisplayDevicesOptions() {
+        String value = Settings.System.getString(getActivity().getContentResolver(),
+                Settings.Secure.OVERLAY_DISPLAY_DEVICES);
+        if (value == null) {
+            value = "";
+        }
+
+        CharSequence[] values = mOverlayDisplayDevices.getEntryValues();
+        for (int i = 0; i < values.length; i++) {
+            if (value.contentEquals(values[i])) {
+                mOverlayDisplayDevices.setValueIndex(i);
+                mOverlayDisplayDevices.setSummary(mOverlayDisplayDevices.getEntries()[i]);
+                return;
+            }
+        }
+        mOverlayDisplayDevices.setValueIndex(0);
+        mOverlayDisplayDevices.setSummary(mOverlayDisplayDevices.getEntries()[0]);
+    }
+
+    private void writeOverlayDisplayDevicesOptions(Object newValue) {
+        Settings.System.putString(getActivity().getContentResolver(),
+                Settings.Secure.OVERLAY_DISPLAY_DEVICES, (String)newValue);
+        updateOverlayDisplayDevicesOptions();
+    }
+
     private void updateAppProcessLimitOptions() {
         try {
             int limit = ActivityManagerNative.getDefault().getProcessLimit();
@@ -705,7 +757,6 @@
     }
 
     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;
@@ -809,6 +860,10 @@
                 Settings.Secure.putInt(getActivity().getContentResolver(),
                         Settings.Secure.ADB_ENABLED, 0);
             }
+        } else if (preference == mBugreportInPower) {
+            Settings.Secure.putInt(getActivity().getContentResolver(),
+                    Settings.Secure.BUGREPORT_IN_POWER_MENU, 
+                    mBugreportInPower.isChecked() ? 1 : 0);
         } else if (preference == mKeepScreenOn) {
             Settings.System.putInt(getActivity().getContentResolver(),
                     Settings.System.STAY_ON_WHILE_PLUGGED_IN, 
@@ -850,6 +905,8 @@
             writeTrackFrameTimeOptions();
         } else if (preference == mShowHwScreenUpdates) {
             writeShowHwScreenUpdatesOptions();
+        } else if (preference == mShowHwLayersUpdates) {
+            writeShowHwLayersUpdatesOptions();
         } else if (preference == mDebugLayout) {
             writeDebugLayoutOptions();
         }
@@ -873,6 +930,9 @@
         } else if (preference == mAnimatorDurationScale) {
             writeAnimationScaleOption(2, mAnimatorDurationScale, newValue);
             return true;
+        } else if (preference == mOverlayDisplayDevices) {
+            writeOverlayDisplayDevicesOptions(newValue);
+            return true;
         } else if (preference == mEnableTracesPref) {
             writeEnableTracesOptions();
             return true;
@@ -941,6 +1001,7 @@
 
     void pokeSystemProperties() {
         if (!mDontPokeProperties) {
+            //noinspection unchecked
             (new SystemPropPoker()).execute();
         }
     }
@@ -970,7 +1031,7 @@
     }
 
     /**
-     * Dialog to confirm enforcement of {@link #READ_EXTERNAL_STORAGE}.
+     * Dialog to confirm enforcement of {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}.
      */
     public static class ConfirmEnforceFragment extends DialogFragment {
         public static void show(DevelopmentSettings parent) {
@@ -1005,9 +1066,9 @@
         }
     }
 
-    private static boolean isPermissionEnforced(Context context, String permission) {
+    private static boolean isPermissionEnforced(String permission) {
         try {
-            return ActivityThread.getPackageManager().isPermissionEnforced(READ_EXTERNAL_STORAGE);
+            return ActivityThread.getPackageManager().isPermissionEnforced(permission);
         } 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 fc162e2..622d77e 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -232,10 +232,11 @@
     }
 
     private void updateScreenSaverSummary() {
-        mScreenSaverPreference.setSummary(
-            DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext())
-                ? R.string.screensaver_settings_summary_on
-                : R.string.screensaver_settings_summary_off);
+        int summaryResId = DreamSettings.getSummaryResource(getActivity());
+        if (summaryResId > 0)
+            mScreenSaverPreference.setSummary(summaryResId);
+        else
+            mScreenSaverPreference.setSummary("");
     }
 
     private void updateAccelerometerRotationCheckbox() {
diff --git a/src/com/android/settings/DreamBackend.java b/src/com/android/settings/DreamBackend.java
new file mode 100644
index 0000000..2f0443b
--- /dev/null
+++ b/src/com/android/settings/DreamBackend.java
@@ -0,0 +1,236 @@
+/*
+ * 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 static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK;
+import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP;
+import static android.provider.Settings.Secure.SCREENSAVER_ENABLED;
+
+import android.content.ComponentName;
+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.RemoteException;
+import android.os.ServiceManager;
+import android.provider.Settings;
+import android.service.dreams.Dream;
+import android.service.dreams.IDreamManager;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class DreamBackend {
+    private static final String TAG = DreamSettings.class.getSimpleName() + ".Backend";
+
+    public static class DreamInfo {
+        CharSequence caption;
+        Drawable icon;
+        boolean isActive;
+        public ComponentName componentName;
+        public ComponentName settingsComponentName;
+
+        @Override
+        public String toString() {
+            StringBuilder sb = new StringBuilder(DreamInfo.class.getSimpleName());
+            sb.append('[').append(caption);
+            if (isActive)
+                sb.append(",active");
+            sb.append(',').append(componentName);
+            if (settingsComponentName != null)
+                sb.append("settings=").append(settingsComponentName);
+            return sb.append(']').toString();
+        }
+    }
+
+    private final Context mContext;
+    private final IDreamManager mDreamManager;
+    private final DreamInfoComparator mComparator;
+
+    public DreamBackend(Context context) {
+        mContext = context;
+        mDreamManager = IDreamManager.Stub.asInterface(ServiceManager.getService("dreams"));
+        mComparator = new DreamInfoComparator(getDefaultDream());
+    }
+
+    public List<DreamInfo> getDreamInfos() {
+        logd("getDreamInfos()");
+        ComponentName activeDream = getActiveDream();
+        PackageManager pm = mContext.getPackageManager();
+        Intent dreamIntent = new Intent(Intent.ACTION_MAIN)
+                .addCategory("android.intent.category.DREAM");
+        List<ResolveInfo> resolveInfos = pm.queryIntentServices(dreamIntent,
+                PackageManager.GET_META_DATA);
+        List<DreamInfo> dreamInfos = new ArrayList<DreamInfo>(resolveInfos.size());
+        for (ResolveInfo resolveInfo : resolveInfos) {
+            if (resolveInfo.serviceInfo == null)
+                continue;
+            DreamInfo dreamInfo = new DreamInfo();
+            dreamInfo.caption = resolveInfo.loadLabel(pm);
+            dreamInfo.icon = resolveInfo.loadIcon(pm);
+            dreamInfo.componentName = getDreamComponentName(resolveInfo);
+            dreamInfo.isActive = dreamInfo.componentName.equals(activeDream);
+            dreamInfo.settingsComponentName = getSettingsComponentName(resolveInfo);
+            dreamInfos.add(dreamInfo);
+        }
+        Collections.sort(dreamInfos, mComparator);
+        return dreamInfos;
+    }
+
+    public ComponentName getDefaultDream() {
+        if (mDreamManager == null)
+            return null;
+        try {
+            return mDreamManager.getDefaultDreamComponent();
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed to get default dream", e);
+            return null;
+        }
+    }
+
+    public boolean isEnabled() {
+        return getBoolean(SCREENSAVER_ENABLED);
+    }
+
+    public void setEnabled(boolean value) {
+        logd("setEnabled(%s)", value);
+        setBoolean(SCREENSAVER_ENABLED, value);
+    }
+
+    public boolean isActivatedOnDock() {
+        return getBoolean(SCREENSAVER_ACTIVATE_ON_DOCK);
+    }
+
+    public void setActivatedOnDock(boolean value) {
+        logd("setActivatedOnDock(%s)", value);
+        setBoolean(SCREENSAVER_ACTIVATE_ON_DOCK, value);
+    }
+
+    public boolean isActivatedOnSleep() {
+        return getBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP);
+    }
+
+    public void setActivatedOnSleep(boolean value) {
+        logd("setActivatedOnSleep(%s)", value);
+        setBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP, value);
+    }
+
+    private boolean getBoolean(String key) {
+        return Settings.Secure.getInt(mContext.getContentResolver(), key, 1) == 1;
+    }
+
+    private void setBoolean(String key, boolean value) {
+        Settings.Secure.putInt(mContext.getContentResolver(), key, value ? 1 : 0);
+    }
+
+    public void setActiveDream(ComponentName dream) {
+        logd("setActiveDream(%s)", dream);
+        if (mDreamManager == null)
+            return;
+        try {
+            ComponentName[] dreams = { dream };
+            mDreamManager.setDreamComponents(dream == null ? null : dreams);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed to set active dream to " + dream, e);
+        }
+    }
+
+    public ComponentName getActiveDream() {
+        if (mDreamManager == null)
+            return null;
+        try {
+            ComponentName[] dreams = mDreamManager.getDreamComponents();
+            return dreams != null && dreams.length > 0 ? dreams[0] : null;
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed to get active dream", e);
+            return null;
+        }
+    }
+
+    public void launchSettings(DreamInfo dreamInfo) {
+        logd("launchSettings(%s)", dreamInfo);
+        if (dreamInfo == null || dreamInfo.settingsComponentName == null)
+            return;
+        mContext.startActivity(new Intent().setComponent(dreamInfo.settingsComponentName));
+    }
+
+    public void preview(DreamInfo dreamInfo) {
+        logd("preview(%s)", dreamInfo);
+        if (mDreamManager == null || dreamInfo == null || dreamInfo.componentName == null)
+            return;
+        try {
+            mDreamManager.testDream(dreamInfo.componentName);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed to preview " + dreamInfo, e);
+        }
+    }
+
+    public void startDreaming() {
+        logd("startDreaming()");
+        if (mDreamManager == null)
+            return;
+        try {
+            mDreamManager.dream();
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed to dream", e);
+        }
+    }
+
+    private static ComponentName getDreamComponentName(ResolveInfo resolveInfo) {
+        if (resolveInfo == null || resolveInfo.serviceInfo == null)
+            return null;
+        return new ComponentName(resolveInfo.serviceInfo.packageName, resolveInfo.serviceInfo.name);
+    }
+
+    private static ComponentName getSettingsComponentName(ResolveInfo resolveInfo) {
+        if (resolveInfo == null
+                || resolveInfo.serviceInfo == null
+                || resolveInfo.serviceInfo.metaData == null)
+            return null;
+        String cn = resolveInfo.serviceInfo.metaData.getString(Dream.METADATA_NAME_CONFIG_ACTIVITY);
+        return cn == null ? null : ComponentName.unflattenFromString(cn);
+    }
+
+    private static void logd(String msg, Object... args) {
+        if (DreamSettings.DEBUG)
+            Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args));
+    }
+
+    private static class DreamInfoComparator implements Comparator<DreamInfo> {
+        private final ComponentName mDefaultDream;
+
+        public DreamInfoComparator(ComponentName defaultDream) {
+            mDefaultDream = defaultDream;
+        }
+
+        @Override
+        public int compare(DreamInfo lhs, DreamInfo rhs) {
+            return sortKey(lhs).compareTo(sortKey(rhs));
+        }
+
+        private String sortKey(DreamInfo di) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(di.componentName.equals(mDefaultDream) ? '0' : '1');
+            sb.append(di.caption);
+            return sb.toString();
+        }
+    }
+}
diff --git a/src/com/android/settings/DreamComponentPreference.java b/src/com/android/settings/DreamComponentPreference.java
deleted file mode 100644
index 2114dd1..0000000
--- a/src/com/android/settings/DreamComponentPreference.java
+++ /dev/null
@@ -1,236 +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;
-
-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
index d9953aa..3b14fa5 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 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.
@@ -16,144 +16,338 @@
 
 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.app.AlertDialog;
+import android.app.Dialog;
+import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.res.Configuration;
-import android.database.ContentObserver;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
 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.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.RadioButton;
 import android.widget.Switch;
+import android.widget.TextView;
 
-import java.util.ArrayList;
+import com.android.settings.DreamBackend.DreamInfo;
+
+import java.util.List;
 
 public class DreamSettings extends SettingsPreferenceFragment {
-    private static final String TAG = "DreamSettings";
+    private static final String TAG = DreamSettings.class.getSimpleName();
+    static final boolean DEBUG = false;
+    private static final int DIALOG_WHEN_TO_DREAM = 1;
+    private static final String PACKAGE_SCHEME = "package";
 
-    private static final String KEY_ACTIVATE_ON_DOCK = "activate_on_dock";
+    private final PackageReceiver mPackageReceiver = new PackageReceiver();
 
-    private CheckBoxPreference mActivateOnDockPreference;
+    private Context mContext;
+    private DreamBackend mBackend;
+    private DreamInfoAdapter mAdapter;
+    private Switch mSwitch;
+    private MenuItem[] mMenuItemsWhenEnabled;
+    private boolean mRefreshing;
 
-    private Switch mEnableSwitch;
-    private Enabler mEnabler;
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_dreams;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        logd("onAttach(%s)", activity.getClass().getSimpleName());
+        super.onAttach(activity);
+        mContext = activity;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        logd("onCreate(%s)", icicle);
+        super.onCreate(icicle);
+        Activity activity = getActivity();
+
+        mBackend = new DreamBackend(activity);
+        mSwitch = new Switch(activity);
+        mSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (!mRefreshing) {
+                    mBackend.setEnabled(isChecked);
+                    refreshFromBackend();
+                }
+            }
+        });
+        if (activity instanceof PreferenceActivity) {
+            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+            if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
+                final int padding = activity.getResources().getDimensionPixelSize(
+                        R.dimen.action_bar_switch_padding);
+                mSwitch.setPadding(0, 0, padding, 0);
+                activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                        ActionBar.DISPLAY_SHOW_CUSTOM);
+                activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER_VERTICAL | Gravity.END));
+            }
+        }
+        setHasOptionsMenu(true);
+    }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
+        logd("onActivityCreated(%s)", savedInstanceState);
         super.onActivityCreated(savedInstanceState);
 
-        addPreferencesFromResource(R.xml.dream_settings);
+        ListView listView = getListView();
 
-        mActivateOnDockPreference = (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_DOCK);
+        TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
+        emptyView.setText(R.string.screensaver_settings_disabled_prompt);
+        listView.setEmptyView(emptyView);
 
-        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);
-        }
+        mAdapter = new DreamInfoAdapter(mContext);
+        listView.setAdapter(mAdapter);
     }
 
     @Override
-    public void onResume() {
-        if (mEnabler != null) {
-            mEnabler.resume();
-        }
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        logd("onCreateOptionsMenu()");
 
-        final boolean currentActivateOnDock = 0 != Settings.Secure.getInt(getContentResolver(),
-                SCREENSAVER_ACTIVATE_ON_DOCK, 1);
-        mActivateOnDockPreference.setChecked(currentActivateOnDock);
-        super.onResume();
+        boolean isEnabled = mBackend.isEnabled();
+
+        // create "start" action
+        MenuItem start = createMenuItem(menu, R.string.screensaver_settings_dream_start,
+                MenuItem.SHOW_AS_ACTION_ALWAYS,
+                isEnabled, new Runnable(){
+                    @Override
+                    public void run() {
+                        mBackend.startDreaming();
+                    }});
+
+        // create "when to dream" overflow menu item
+        MenuItem whenToDream = createMenuItem(menu,
+                R.string.screensaver_settings_when_to_dream,
+                MenuItem.SHOW_AS_ACTION_NEVER,
+                isEnabled,
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        showDialog(DIALOG_WHEN_TO_DREAM);
+                    }});
+
+        // create "help" overflow menu item (make sure it appears last)
+        super.onCreateOptionsMenu(menu, inflater);
+
+        mMenuItemsWhenEnabled = new MenuItem[] { start, whenToDream };
+    }
+
+    private MenuItem createMenuItem(Menu menu,
+            int titleRes, int actionEnum, boolean isEnabled, final Runnable onClick) {
+        MenuItem item = menu.add(titleRes);
+        item.setShowAsAction(actionEnum);
+        item.setEnabled(isEnabled);
+        item.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                onClick.run();
+                return true;
+            }
+        });
+        return item;
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        logd("onCreateDialog(%s)", dialogId);
+        if (dialogId == DIALOG_WHEN_TO_DREAM)
+            return createWhenToDreamDialog();
+        return super.onCreateDialog(dialogId);
+    }
+
+    private Dialog createWhenToDreamDialog() {
+        final CharSequence[] items = {
+                mContext.getString(R.string.screensaver_settings_summary_dock),
+                mContext.getString(R.string.screensaver_settings_summary_sleep),
+                mContext.getString(R.string.screensaver_settings_summary_either_short)
+        };
+
+        int initialSelection = mBackend.isActivatedOnDock() && mBackend.isActivatedOnSleep() ? 2
+                : mBackend.isActivatedOnDock() ? 0
+                : mBackend.isActivatedOnSleep() ? 1
+                : -1;
+
+        return new AlertDialog.Builder(mContext)
+                .setTitle(R.string.screensaver_settings_when_to_dream)
+                .setSingleChoiceItems(items, initialSelection, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int item) {
+                        mBackend.setActivatedOnDock(item == 0 || item == 2);
+                        mBackend.setActivatedOnSleep(item == 1 || item == 2);
+                    }
+                })
+                .create();
     }
 
     @Override
     public void onPause() {
-        if (mEnabler != null) {
-            mEnabler.pause();
-        }
-
+        logd("onPause()");
         super.onPause();
+        mContext.unregisterReceiver(mPackageReceiver);
     }
 
     @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (preference == mActivateOnDockPreference) {
-            Settings.Secure.putInt(getContentResolver(),
-                    SCREENSAVER_ACTIVATE_ON_DOCK, 
-                    mActivateOnDockPreference.isChecked() ? 1 : 0);
+    public void onResume() {
+        logd("onResume()");
+        super.onResume();
+        refreshFromBackend();
+
+        // listen for package changes
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        filter.addDataScheme(PACKAGE_SCHEME);
+        mContext.registerReceiver(mPackageReceiver , filter);
+    }
+
+    public static int getSummaryResource(Context context) {
+        DreamBackend backend = new DreamBackend(context);
+        boolean isEnabled = backend.isEnabled();
+        boolean activatedOnSleep = backend.isActivatedOnSleep();
+        boolean activatedOnDock = backend.isActivatedOnDock();
+        boolean activatedOnEither = activatedOnSleep && activatedOnDock;
+        return !isEnabled ? R.string.screensaver_settings_summary_off
+                : activatedOnEither ? R.string.screensaver_settings_summary_either_long
+                : activatedOnSleep ? R.string.screensaver_settings_summary_sleep
+                : activatedOnDock ? R.string.screensaver_settings_summary_dock
+                : 0;
+    }
+
+    private void refreshFromBackend() {
+        logd("refreshFromBackend()");
+        mRefreshing = true;
+        boolean dreamsEnabled = mBackend.isEnabled();
+        if (mSwitch.isChecked() != dreamsEnabled)
+            mSwitch.setChecked(dreamsEnabled);
+
+        mAdapter.clear();
+        if (dreamsEnabled) {
+            List<DreamInfo> dreamInfos = mBackend.getDreamInfos();
+            mAdapter.addAll(dreamInfos);
         }
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
+        if (mMenuItemsWhenEnabled != null)
+            for (MenuItem menuItem : mMenuItemsWhenEnabled)
+                menuItem.setEnabled(dreamsEnabled);
+        mRefreshing = false;
+    }
+
+    private static void logd(String msg, Object... args) {
+        if (DEBUG)
+            Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args));
+    }
+
+    private class DreamInfoAdapter extends ArrayAdapter<DreamInfo> {
+        private final LayoutInflater mInflater;
+
+        public DreamInfoAdapter(Context context) {
+            super(context, 0);
+            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            DreamInfo dreamInfo = getItem(position);
+            logd("getView(%s)", dreamInfo.caption);
+            final View row = convertView != null ? convertView : createDreamInfoRow(parent);
+            row.setTag(dreamInfo);
+
+            // bind icon
+            ((ImageView) row.findViewById(android.R.id.icon)).setImageDrawable(dreamInfo.icon);
+
+            // bind caption
+            ((TextView) row.findViewById(android.R.id.title)).setText(dreamInfo.caption);
+
+            // bind radio button
+            RadioButton radioButton = (RadioButton) row.findViewById(android.R.id.button1);
+            radioButton.setChecked(dreamInfo.isActive);
+            radioButton.setOnTouchListener(new OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    row.onTouchEvent(event);
+                    return false;
+                }});
+
+            // bind settings button + divider
+            boolean showSettings = dreamInfo.settingsComponentName != null;
+            View settingsDivider = row.findViewById(R.id.divider);
+            settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
+
+            ImageView settingsButton = (ImageView) row.findViewById(android.R.id.button2);
+            settingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
+            settingsButton.setOnClickListener(new OnClickListener(){
+                @Override
+                public void onClick(View v) {
+                    mBackend.launchSettings((DreamInfo) row.getTag());
+                }});
+
+            return row;
+        }
+
+        private View createDreamInfoRow(ViewGroup parent) {
+            final View row =  mInflater.inflate(R.layout.dream_info_row, parent, false);
+            row.setOnClickListener(new OnClickListener(){
+                @Override
+                public void onClick(View v) {
+                    v.setPressed(true);
+                    activate((DreamInfo) row.getTag());
+                }});
+            return row;
+        }
+
+        private DreamInfo getCurrentSelection() {
+            for (int i = 0; i < getCount(); i++) {
+                DreamInfo dreamInfo = getItem(i);
+                if (dreamInfo.isActive)
+                    return dreamInfo;
+            }
+            return null;
+        }
+        private void activate(DreamInfo dreamInfo) {
+            if (dreamInfo.equals(getCurrentSelection()))
+                return;
+            for (int i = 0; i < getCount(); i++) {
+                getItem(i).isActive = false;
+            }
+            dreamInfo.isActive = true;
+            mBackend.setActiveDream(dreamInfo.componentName);
+            notifyDataSetChanged();
+        }
+    }
+
+    private class PackageReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            logd("PackageReceiver.onReceive");
+            refreshFromBackend();
+        }
     }
 }
diff --git a/src/com/android/settings/DreamTesterPreference.java b/src/com/android/settings/DreamTesterPreference.java
deleted file mode 100644
index 87a142c..0000000
--- a/src/com/android/settings/DreamTesterPreference.java
+++ /dev/null
@@ -1,87 +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;
-
-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/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index 909496e..f521d6d 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -63,7 +63,7 @@
             "^$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
     private static final Pattern HOSTNAME_PATTERN;
     private static final String EXCLUSION_REGEXP =
-            "$|^(.?[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*)+$";
+            "$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
     private static final Pattern EXCLUSION_PATTERN;
     static {
         HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP);
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 5ba3837..d72508a 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -33,6 +33,7 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
+import android.telephony.CellInfo;
 import android.telephony.CellLocation;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
@@ -111,6 +112,7 @@
     private TextView mCfi;
     private TextView mLocation;
     private TextView mNeighboringCids;
+    private TextView mCellInfo;
     private TextView resets;
     private TextView attempts;
     private TextView successes;
@@ -140,6 +142,7 @@
     private String mHttpClientTestResult;
     private boolean mMwiValue = false;
     private boolean mCfiValue = false;
+    private List<CellInfo> mCellInfoValue;
 
     private PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
         @Override
@@ -171,6 +174,13 @@
             mCfiValue = cfi;
             updateCallRedirect();
         }
+
+        @Override
+        public void onCellInfoChanged(List<CellInfo> arrayCi) {
+            Log.d(TAG, "[RadioInfo] onCellInfoChanged: arrayCi=" + arrayCi);
+            mCellInfoValue = arrayCi;
+            updateCellInfoTv();
+        }
     };
 
     private Handler mHandler = new Handler() {
@@ -263,6 +273,7 @@
         mCfi = (TextView) findViewById(R.id.cfi);
         mLocation = (TextView) findViewById(R.id.location);
         mNeighboringCids = (TextView) findViewById(R.id.neighboring);
+        mCellInfo = (TextView) findViewById(R.id.cellinfo);
 
         resets = (TextView) findViewById(R.id.resets);
         attempts = (TextView) findViewById(R.id.attempts);
@@ -326,6 +337,10 @@
                 mHandler.obtainMessage(EVENT_QUERY_NEIGHBORING_CIDS_DONE));
 
         CellLocation.requestLocationUpdate();
+
+        // Get current cell info
+        mCellInfoValue = mTelephonyManager.getAllCellInfo();
+        Log.d(TAG, "[RadioInfo] onCreate: mCellInfoValue=" + mCellInfoValue);
     }
 
     @Override
@@ -356,7 +371,8 @@
                 | PhoneStateListener.LISTEN_DATA_ACTIVITY
                 | PhoneStateListener.LISTEN_CELL_LOCATION
                 | PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR
-                | PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR);
+                | PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR
+                | PhoneStateListener.LISTEN_CELL_INFO);
     }
 
     @Override
@@ -508,6 +524,23 @@
         mNeighboringCids.setText(sb.toString());
     }
 
+    private final void updateCellInfoTv() {
+        StringBuilder value = new StringBuilder();
+        if (mCellInfoValue != null) {
+            int index = 0;
+            for (CellInfo ci : mCellInfoValue) {
+                value.append('[');
+                value.append(index);
+                value.append("]=");
+                value.append(ci.toString());
+                if (++index < mCellInfoValue.size()) {
+                    value.append("\n");
+                }
+            }
+        }
+        mCellInfo.setText(value.toString());
+    }
+
     private final void
     updateMessageWaiting() {
         mMwi.setText(String.valueOf(mMwiValue));
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index a12da3e..8f33b9b 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -26,7 +26,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.UserId;
+import android.os.UserHandle;
 import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -141,7 +141,7 @@
         DevicePolicyManager dpm =
                 (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
 
-        if (UserId.myUserId() == 0) {
+        if (UserHandle.myUserId() == 0) {
             switch (dpm.getStorageEncryptionStatus()) {
             case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
                 // The device is currently encrypted.
@@ -193,7 +193,7 @@
             }
         }
 
-        if (UserId.myUserId() > 0) {
+        if (UserHandle.myUserId() > 0) {
             return root;
         }
         // Rest are for primary user...
@@ -446,7 +446,9 @@
                 resultCode == Activity.RESULT_OK) {
             final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
             lockPatternUtils.setBiometricWeakLivelinessEnabled(false);
-            mBiometricWeakLiveliness.setChecked(false);
+	    // Setting the mBiometricWeakLiveliness checked value to false is handled when onResume
+	    // is called by grabbing the value from lockPatternUtils.  We can't set it here
+	    // because mBiometricWeakLiveliness could be null
             return;
         }
         createPreferenceHierarchy();
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index ebbec5dd..d5a90f6 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -24,6 +24,7 @@
 import com.android.settings.bluetooth.BluetoothEnabler;
 import com.android.settings.deviceinfo.Memory;
 import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.vpn2.VpnSettings;
 import com.android.settings.wifi.WifiEnabler;
 
 import android.accounts.Account;
@@ -40,7 +41,7 @@
 import android.os.INetworkManagementService;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.os.UserId;
+import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceActivity.Header;
@@ -96,12 +97,19 @@
 
     // Show only these settings for restricted users
     private int[] SETTINGS_FOR_RESTRICTED = {
+            R.id.wireless_section,
             R.id.wifi_settings,
             R.id.bluetooth_settings,
+            R.id.device_section,
             R.id.sound_settings,
             R.id.display_settings,
+            R.id.storage_settings,
+            R.id.application_settings,
+            R.id.personal_section,
             R.id.security_settings,
             R.id.account_settings,
+            R.id.account_add,
+            R.id.system_section,
             R.id.about_settings
     };
 
@@ -355,7 +363,8 @@
                 WirelessSettings.class.getName().equals(fragmentName) ||
                 SoundSettings.class.getName().equals(fragmentName) ||
                 PrivacySettings.class.getName().equals(fragmentName) ||
-                ManageAccountsSettings.class.getName().equals(fragmentName)) {
+                ManageAccountsSettings.class.getName().equals(fragmentName) ||
+                VpnSettings.class.getName().equals(fragmentName)) {
             intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
         }
 
@@ -410,13 +419,13 @@
                 i = insertAccountsHeaders(target, headerIndex);
             } else if (id == R.id.user_settings) {
                 if (!mEnableUserManagement
-                        || !UserId.MU_ENABLED || UserId.myUserId() != 0
+                        || !UserHandle.MU_ENABLED || UserHandle.myUserId() != 0
                         || !getResources().getBoolean(R.bool.enable_user_management)
                         || Utils.isMonkeyRunning()) {
                     target.remove(header);
                 }
             }
-            if (UserId.MU_ENABLED && UserId.myUserId() != 0
+            if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
                     && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
                 target.remove(header);
             }
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index b9efa72..3d66b77 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -203,7 +203,9 @@
             @Override
             public void onPageFinished(WebView view, String url) {
                 mSpinnerDlg.dismiss();
-                mTextDlg.show();
+                if (SettingsLicenseActivity.this.isResumed()) {
+                    mTextDlg.show();
+                }
             }
         });
 
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 4a79eca..ce53550 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -55,6 +55,7 @@
  */
 public class TetherSettings extends SettingsPreferenceFragment
         implements DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener {
+    private static final String TAG = "TetherSettings";
 
     private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
     private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
@@ -234,8 +235,10 @@
                     switch (intent
                             .getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)) {
                         case BluetoothAdapter.STATE_ON:
-                            mBluetoothPan.setBluetoothTethering(true);
-                            mBluetoothEnableForTether = false;
+                            if(mBluetoothPan != null) {
+                                mBluetoothPan.setBluetoothTethering(true);
+                                mBluetoothEnableForTether = false;
+                            }
                             break;
 
                         case BluetoothAdapter.STATE_OFF:
@@ -392,7 +395,8 @@
         } else if (btState == BluetoothAdapter.STATE_TURNING_ON) {
             mBluetoothTether.setEnabled(false);
             mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
-        } else if (btState == BluetoothAdapter.STATE_ON && mBluetoothPan.isTetheringOn()) {
+        } else if (btState == BluetoothAdapter.STATE_ON &&
+                    mBluetoothPan != null && mBluetoothPan.isTetheringOn()) {
             mBluetoothTether.setChecked(true);
             mBluetoothTether.setEnabled(true);
             if (bluetoothTethered > 1) {
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index a029342..777a712 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -371,11 +371,15 @@
         if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
             statusString = res.getString(R.string.battery_info_status_charging);
             if (plugType > 0) {
-                statusString = statusString
-                        + " "
-                        + res.getString((plugType == BatteryManager.BATTERY_PLUGGED_AC)
-                                ? R.string.battery_info_status_charging_ac
-                                : R.string.battery_info_status_charging_usb);
+                int resId;
+                if (plugType == BatteryManager.BATTERY_PLUGGED_AC) {
+                    resId = R.string.battery_info_status_charging_ac;
+                } else if (plugType == BatteryManager.BATTERY_PLUGGED_USB) {
+                    resId = R.string.battery_info_status_charging_usb;
+                } else {
+                    resId = R.string.battery_info_status_charging_wireless;
+                }
+                statusString = statusString + " " + res.getString(resId);
             }
         } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {
             statusString = res.getString(R.string.battery_info_status_discharging);
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 3256fb2..cca9086 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -786,7 +786,10 @@
 
     private long getTotalExternalSize(PackageStats ps) {
         if (ps != null) {
+            // We also include the cache size here because for non-emulated
+            // we don't automtically clean cache files.
             return ps.externalCodeSize + ps.externalDataSize
+                    + ps.externalCacheSize
                     + ps.externalMediaSize + ps.externalObbSize;
         }
         return SIZE_INVALID;
@@ -822,7 +825,7 @@
                             long externalCodeSize = stats.externalCodeSize
                                     + stats.externalObbSize;
                             long externalDataSize = stats.externalDataSize
-                                    + stats.externalMediaSize + stats.externalCacheSize;
+                                    + stats.externalMediaSize;
                             long newSize = externalCodeSize + externalDataSize
                                     + getTotalInternalSize(stats);
                             if (entry.size != newSize ||
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 7fe3711..2c1944d 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -322,6 +322,9 @@
                         Log.w(TAG, "Unable to get package info", e);
                     }
                 }
+            } else if ((mPackageInfo.applicationInfo.flags
+                    & ApplicationInfo.FLAG_INSTALLED) == 0) {
+                mUninstallButton.setText(R.string.install_text);
             } else {
                 mUninstallButton.setText(R.string.uninstall_text);
             }
@@ -384,7 +387,12 @@
         mDataSize = (TextView)view.findViewById(R.id.data_size_text);
         mExternalCodeSize = (TextView)view.findViewById(R.id.external_code_size_text);
         mExternalDataSize = (TextView)view.findViewById(R.id.external_data_size_text);
-        
+
+        if (Environment.isExternalStorageEmulated()) {
+            ((View)mExternalCodeSize.getParent()).setVisibility(View.GONE);
+            ((View)mExternalDataSize.getParent()).setVisibility(View.GONE);
+        }
+
         // Get Control button panel
         View btnPanel = view.findViewById(R.id.control_buttons_panel);
         mForceStopButton = (Button) btnPanel.findViewById(R.id.left_button);
@@ -675,22 +683,28 @@
             
         } else {
             mHaveSizes = true;
-            if (mLastCodeSize != mAppEntry.codeSize) {
-                mLastCodeSize = mAppEntry.codeSize;
-                mAppSize.setText(getSizeStr(mAppEntry.codeSize));
+            long codeSize = mAppEntry.codeSize;
+            long dataSize = mAppEntry.dataSize;
+            if (Environment.isExternalStorageEmulated()) {
+                codeSize += mAppEntry.externalCodeSize;
+                dataSize +=  mAppEntry.externalDataSize;
+            } else {
+                if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
+                    mLastExternalCodeSize = mAppEntry.externalCodeSize;
+                    mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
+                }
+                if (mLastExternalDataSize !=  mAppEntry.externalDataSize) {
+                    mLastExternalDataSize =  mAppEntry.externalDataSize;
+                    mExternalDataSize.setText(getSizeStr( mAppEntry.externalDataSize));
+                }
             }
-            if (mLastDataSize != mAppEntry.dataSize) {
-                mLastDataSize = mAppEntry.dataSize;
-                mDataSize.setText(getSizeStr(mAppEntry.dataSize));
+            if (mLastCodeSize != codeSize) {
+                mLastCodeSize = codeSize;
+                mAppSize.setText(getSizeStr(codeSize));
             }
-            if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
-                mLastExternalCodeSize = mAppEntry.externalCodeSize;
-                mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
-            }
-            long nonCacheExtDataSize = mAppEntry.externalDataSize - mAppEntry.externalCacheSize;
-            if (mLastExternalDataSize != nonCacheExtDataSize) {
-                mLastExternalDataSize = nonCacheExtDataSize;
-                mExternalDataSize.setText(getSizeStr(nonCacheExtDataSize));
+            if (mLastDataSize != dataSize) {
+                mLastDataSize = dataSize;
+                mDataSize.setText(getSizeStr(dataSize));
             }
             long cacheSize = mAppEntry.cacheSize + mAppEntry.externalCacheSize;
             if (mLastCacheSize != cacheSize) {
@@ -702,7 +716,7 @@
                 mTotalSize.setText(getSizeStr(mAppEntry.size));
             }
             
-            if ((mAppEntry.dataSize+nonCacheExtDataSize) <= 0 || !mCanClearData) {
+            if ((mAppEntry.dataSize+ mAppEntry.externalDataSize) <= 0 || !mCanClearData) {
                 mClearDataButton.setEnabled(false);
             } else {
                 mClearDataButton.setEnabled(true);
@@ -1031,6 +1045,12 @@
                                 PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
                         .execute((Object)null);
                     }
+                } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
+                    try {
+                        mPm.installExistingPackage(packageName);
+                        refreshUi();
+                    } catch (NameNotFoundException e) {
+                    }
                 } else {
                     uninstallPkg(packageName);
                 }
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 1cc9dcc..1240d43 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -341,7 +341,8 @@
                     final int N = mApplications.getCount();
                     for (int i=0; i<N; i++) {
                         ApplicationsState.AppEntry ae = mApplications.getAppEntry(i);
-                        mAppStorage += ae.externalCodeSize + ae.externalDataSize;
+                        mAppStorage += ae.externalCodeSize + ae.externalDataSize
+                                + ae.externalCacheSize;
                     }
                 }
             } else {
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 7c3ebb0..67221ae 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -26,6 +26,7 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.preference.PreferenceActivity;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
@@ -42,6 +43,7 @@
 import android.widget.AbsListView.RecyclerListener;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 
@@ -49,10 +51,12 @@
         implements AdapterView.OnItemClickListener, RecyclerListener,
         RunningState.OnRefreshUiListener {
     
+    final int mMyUserId;
+
     long SECONDARY_SERVER_MEM;
     
     final HashMap<View, ActiveItem> mActiveItems = new HashMap<View, ActiveItem>();
-    
+
     ActivityManager mAm;
     
     RunningState mState;
@@ -167,9 +171,12 @@
                 if (item.mPackageInfo == null && item instanceof RunningState.MergedItem) {
                     // Items for background processes don't normally load
                     // their labels for performance reasons.  Do it now.
-                    ((RunningState.MergedItem)item).mProcess.ensureLabel(pm);
-                    item.mPackageInfo = ((RunningState.MergedItem)item).mProcess.mPackageInfo;
-                    item.mDisplayLabel = ((RunningState.MergedItem)item).mProcess.mDisplayLabel;
+                    RunningState.MergedItem mergedItem = (RunningState.MergedItem)item;
+                    if (mergedItem.mProcess != null) {
+                        ((RunningState.MergedItem)item).mProcess.ensureLabel(pm);
+                        item.mPackageInfo = ((RunningState.MergedItem)item).mProcess.mPackageInfo;
+                        item.mDisplayLabel = ((RunningState.MergedItem)item).mProcess.mDisplayLabel;
+                    }
                 }
                 name.setText(item.mDisplayLabel);
                 ActiveItem ai = new ActiveItem();
@@ -183,9 +190,7 @@
                     description.setText(item.mDescription);
                 }
                 item.mCurSizeStr = null;
-                if (item.mPackageInfo != null) {
-                    icon.setImageDrawable(item.mPackageInfo.loadIcon(pm));
-                }
+                icon.setImageDrawable(item.loadIcon(rootView.getContext(), state));
                 icon.setVisibility(View.VISIBLE);
                 ai.updateTime(rootView.getContext(), builder);
                 return ai;
@@ -203,7 +208,9 @@
         final RunningState mState;
         final LayoutInflater mInflater;
         boolean mShowBackground;
-        ArrayList<RunningState.MergedItem> mItems;
+        ArrayList<RunningState.MergedItem> mOrigItems;
+        final ArrayList<RunningState.MergedItem> mItems
+                = new ArrayList<RunningState.MergedItem>();
         
         ServiceListAdapter(RunningState state) {
             mState = state;
@@ -230,11 +237,17 @@
             ArrayList<RunningState.MergedItem> newItems =
                 mShowBackground ? mState.getCurrentBackgroundItems()
                         : mState.getCurrentMergedItems();
-            if (mItems != newItems) {
-                mItems = newItems;
-            }
-            if (mItems == null) {
-                mItems = new ArrayList<RunningState.MergedItem>();
+            if (mOrigItems != newItems) {
+                mOrigItems = newItems;
+                if (newItems == null) {
+                    mItems.clear();
+                } else {
+                    mItems.clear();
+                    mItems.addAll(newItems);
+                    if (mShowBackground) {
+                        Collections.sort(mItems, mState.mBackgroundComparator);
+                    }
+                }
             }
         }
         
@@ -374,8 +387,11 @@
         if (mOwner != null) {
             // start new fragment to display extended information
             Bundle args = new Bundle();
-            args.putInt(RunningServiceDetails.KEY_UID, mi.mProcess.mUid);
-            args.putString(RunningServiceDetails.KEY_PROCESS, mi.mProcess.mProcessName);
+            if (mi.mProcess != null) {
+                args.putInt(RunningServiceDetails.KEY_UID, mi.mProcess.mUid);
+                args.putString(RunningServiceDetails.KEY_PROCESS, mi.mProcess.mProcessName);
+            }
+            args.putInt(RunningServiceDetails.KEY_USER_ID, mi.mUserId);
             args.putBoolean(RunningServiceDetails.KEY_BACKGROUND, mAdapter.mShowBackground);
     
             PreferenceActivity pa = (PreferenceActivity)mOwner.getActivity();
@@ -390,6 +406,7 @@
 
     public RunningProcessesView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mMyUserId = UserHandle.myUserId();
     }
     
     public void doCreate(Bundle savedInstanceState) {
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index 2087f21..52ed458 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -26,6 +26,7 @@
 import android.os.Debug;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -39,35 +40,38 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 
 public class RunningServiceDetails extends Fragment
         implements RunningState.OnRefreshUiListener {
     static final String TAG = "RunningServicesDetails";
-    
+
     static final String KEY_UID = "uid";
+    static final String KEY_USER_ID = "user_id";
     static final String KEY_PROCESS = "process";
     static final String KEY_BACKGROUND = "background";
-    
+
     static final int DIALOG_CONFIRM_STOP = 1;
-    
+
     ActivityManager mAm;
     LayoutInflater mInflater;
-    
+
     RunningState mState;
     boolean mHaveData;
-    
+
     int mUid;
+    int mUserId;
     String mProcessName;
     boolean mShowBackground;
-    
+
     RunningState.MergedItem mMergedItem;
-    
+
     View mRootView;
     ViewGroup mAllDetails;
     ViewGroup mSnippet;
     RunningProcessesView.ActiveItem mSnippetActiveItem;
     RunningProcessesView.ViewHolder mSnippetViewHolder;
-    
+
     int mNumServices, mNumProcesses;
     
     TextView mServicesHeader;
@@ -195,8 +199,14 @@
         if (newItems != null) {
             for (int i=0; i<newItems.size(); i++) {
                 RunningState.MergedItem mi = newItems.get(i);
-                if (mi.mProcess.mUid == mUid
-                        && mi.mProcess.mProcessName.equals(mProcessName)) {
+                if (mi.mUserId != mUserId) {
+                    continue;
+                }
+                if (mUid >= 0 && mi.mProcess != null && mi.mProcess.mUid != mUid) {
+                    continue;
+                }
+                if (mProcessName == null || (mi.mProcess != null
+                        && mProcessName.equals(mi.mProcess.mProcessName))) {
                     item = mi;
                     break;
                 }
@@ -209,8 +219,8 @@
         }
         return false;
     }
-    
-    void addServiceDetailsView(RunningState.ServiceItem si, RunningState.MergedItem mi) {
+
+    void addServicesHeader() {
         if (mNumServices == 0) {
             mServicesHeader = (TextView)mInflater.inflate(R.layout.separator_label,
                     mAllDetails, false);
@@ -218,7 +228,30 @@
             mAllDetails.addView(mServicesHeader);
         }
         mNumServices++;
-        
+    }
+
+    void addProcessesHeader() {
+        if (mNumProcesses == 0) {
+            mProcessesHeader = (TextView)mInflater.inflate(R.layout.separator_label,
+                    mAllDetails, false);
+            mProcessesHeader.setText(R.string.runningservicedetails_processes_title);
+            mAllDetails.addView(mProcessesHeader);
+        }
+        mNumProcesses++;
+    }
+
+    void addServiceDetailsView(RunningState.ServiceItem si, RunningState.MergedItem mi,
+            boolean isService, boolean inclDetails) {
+        if (isService) {
+            addServicesHeader();
+        } else if (mi.mUserId != UserHandle.myUserId()) {
+            // This is being called for another user, and is not a service...
+            // That is, it is a background processes, being added for the
+            // details of a user.  In this case we want a header for processes,
+            // since the top subject line is for the user.
+            addProcessesHeader();
+        }
+
         RunningState.BaseItem bi = si != null ? si : mi;
         
         ActiveDetail detail = new ActiveDetail();
@@ -229,68 +262,74 @@
         detail.mServiceItem = si;
         detail.mViewHolder = new RunningProcessesView.ViewHolder(root);
         detail.mActiveItem = detail.mViewHolder.bind(mState, bi, mBuilder);
-        
+
+        if (!inclDetails) {
+            root.findViewById(R.id.service).setVisibility(View.GONE);
+        }
+
         if (si != null && si.mRunningService.clientLabel != 0) {
             detail.mManageIntent = mAm.getRunningServiceControlPanel(
                     si.mRunningService.service);
         }
         
         TextView description = (TextView)root.findViewById(R.id.comp_description);
-        if (si != null && si.mServiceInfo.descriptionRes != 0) {
-            description.setText(getActivity().getPackageManager().getText(
-                    si.mServiceInfo.packageName, si.mServiceInfo.descriptionRes,
-                    si.mServiceInfo.applicationInfo));
+        detail.mStopButton = (Button)root.findViewById(R.id.left_button);
+        detail.mReportButton = (Button)root.findViewById(R.id.right_button);
+
+        if (isService && mi.mUserId != UserHandle.myUserId()) {
+            // For services from other users, we don't show any description or
+            // controls, because the current user can not perform
+            // actions on them.
+            description.setVisibility(View.GONE);
+            root.findViewById(R.id.control_buttons_panel).setVisibility(View.GONE);
         } else {
-            if (mi.mBackground) {
-                description.setText(R.string.background_process_stop_description);
-            } else if (detail.mManageIntent != null) {
-                try {
-                    Resources clientr = getActivity().getPackageManager().getResourcesForApplication(
-                            si.mRunningService.clientPackage);
-                    String label = clientr.getString(si.mRunningService.clientLabel);
-                    description.setText(getActivity().getString(R.string.service_manage_description,
-                            label));
-                } catch (PackageManager.NameNotFoundException e) {
-                }
+            if (si != null && si.mServiceInfo.descriptionRes != 0) {
+                description.setText(getActivity().getPackageManager().getText(
+                        si.mServiceInfo.packageName, si.mServiceInfo.descriptionRes,
+                        si.mServiceInfo.applicationInfo));
             } else {
-                description.setText(getActivity().getText(si != null
-                        ? R.string.service_stop_description
-                        : R.string.heavy_weight_stop_description));
+                if (mi.mBackground) {
+                    description.setText(R.string.background_process_stop_description);
+                } else if (detail.mManageIntent != null) {
+                    try {
+                        Resources clientr = getActivity().getPackageManager().getResourcesForApplication(
+                                si.mRunningService.clientPackage);
+                        String label = clientr.getString(si.mRunningService.clientLabel);
+                        description.setText(getActivity().getString(R.string.service_manage_description,
+                                label));
+                    } catch (PackageManager.NameNotFoundException e) {
+                    }
+                } else {
+                    description.setText(getActivity().getText(si != null
+                            ? R.string.service_stop_description
+                            : R.string.heavy_weight_stop_description));
+                }
+            }
+
+            detail.mStopButton.setOnClickListener(detail);
+            detail.mStopButton.setText(getActivity().getText(detail.mManageIntent != null
+                    ? R.string.service_manage : R.string.service_stop));
+            detail.mReportButton.setOnClickListener(detail);
+            detail.mReportButton.setText(com.android.internal.R.string.report);
+            // check if error reporting is enabled in secure settings
+            int enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
+                    Settings.Secure.SEND_ACTION_APP_ERROR, 0);
+            if (enabled != 0 && si != null) {
+                detail.mInstaller = ApplicationErrorReport.getErrorReportReceiver(
+                        getActivity(), si.mServiceInfo.packageName,
+                        si.mServiceInfo.applicationInfo.flags);
+                detail.mReportButton.setEnabled(detail.mInstaller != null);
+            } else {
+                detail.mReportButton.setEnabled(false);
             }
         }
-        
-        detail.mStopButton = (Button)root.findViewById(R.id.left_button);
-        detail.mStopButton.setOnClickListener(detail);
-        detail.mStopButton.setText(getActivity().getText(detail.mManageIntent != null
-                ? R.string.service_manage : R.string.service_stop));
 
-        detail.mReportButton = (Button)root.findViewById(R.id.right_button);
-        detail.mReportButton.setOnClickListener(detail);
-        detail.mReportButton.setText(com.android.internal.R.string.report);
-        // check if error reporting is enabled in secure settings
-        int enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
-                Settings.Secure.SEND_ACTION_APP_ERROR, 0);
-        if (enabled != 0 && si != null) {
-            detail.mInstaller = ApplicationErrorReport.getErrorReportReceiver(
-                    getActivity(), si.mServiceInfo.packageName,
-                    si.mServiceInfo.applicationInfo.flags);
-            detail.mReportButton.setEnabled(detail.mInstaller != null);
-        } else {
-            detail.mReportButton.setEnabled(false);
-        }
-        
         mActiveDetails.add(detail);
     }
-    
+
     void addProcessDetailsView(RunningState.ProcessItem pi, boolean isMain) {
-        if (mNumProcesses == 0) {
-            mProcessesHeader = (TextView)mInflater.inflate(R.layout.separator_label,
-                    mAllDetails, false);
-            mProcessesHeader.setText(R.string.runningservicedetails_processes_title);
-            mAllDetails.addView(mProcessesHeader);
-        }
-        mNumProcesses++;
-        
+        addProcessesHeader();
+
         ActiveDetail detail = new ActiveDetail();
         View root = mInflater.inflate(R.layout.running_service_details_process,
                 mAllDetails, false);
@@ -300,7 +339,11 @@
         detail.mActiveItem = detail.mViewHolder.bind(mState, pi, mBuilder);
         
         TextView description = (TextView)root.findViewById(R.id.comp_description);
-        if (isMain) {
+        if (pi.mUserId != UserHandle.myUserId()) {
+            // Processes for another user are all shown batched together; there is
+            // no reason to have a description.
+            description.setVisibility(View.GONE);
+        } else if (isMain) {
             description.setText(R.string.main_running_process_description);
         } else {
             int textid = 0;
@@ -342,7 +385,39 @@
         
         mActiveDetails.add(detail);
     }
+
+    void addDetailsViews(RunningState.MergedItem item, boolean inclServices,
+            boolean inclProcesses) {
+        if (item != null) {
+            if (inclServices) {
+                for (int i=0; i<item.mServices.size(); i++) {
+                    addServiceDetailsView(item.mServices.get(i), item, true, true);
+                }
+            }
+
+            if (inclProcesses) {
+                if (item.mServices.size() <= 0) {
+                    // This item does not have any services, so it must be
+                    // another interesting process...  we will put a fake service
+                    // entry for it, to allow the user to "stop" it.
+                    addServiceDetailsView(null, item, false, item.mUserId != UserHandle.myUserId());
+                } else {
+                    // This screen is actually showing services, so also show
+                    // the process details.
+                    for (int i=-1; i<item.mOtherProcesses.size(); i++) {
+                        RunningState.ProcessItem pi = i < 0 ? item.mProcess
+                                : item.mOtherProcesses.get(i);
+                        if (pi != null && pi.mPid <= 0) {
+                            continue;
+                        }
     
+                        addProcessDetailsView(pi, i < 0);
+                    }
+                }
+            }
+        }
+    }
+
     void addDetailViews() {
         for (int i=mActiveDetails.size()-1; i>=0; i--) {
             mAllDetails.removeView(mActiveDetails.get(i).mRootView);
@@ -358,30 +433,25 @@
             mAllDetails.removeView(mProcessesHeader);
             mProcessesHeader = null;
         }
-        
+
         mNumServices = mNumProcesses = 0;
-        
-        if (mMergedItem != null) {
-            for (int i=0; i<mMergedItem.mServices.size(); i++) {
-                addServiceDetailsView(mMergedItem.mServices.get(i), mMergedItem);
+
+        if (mMergedItem.mUser != null) {
+            ArrayList<RunningState.MergedItem> items;
+            if (mShowBackground) {
+                items = new ArrayList<RunningState.MergedItem>(mMergedItem.mChildren);
+                Collections.sort(items, mState.mBackgroundComparator);
+            } else {
+                items = mMergedItem.mChildren;
             }
-            
-            if (mMergedItem.mServices.size() <= 0) {
-                // This item does not have any services, so it must be
-                // another interesting process...  we will put a fake service
-                // entry for it, to allow the user to "stop" it.
-                addServiceDetailsView(null, mMergedItem);
+            for (int i=0; i<items.size(); i++) {
+                addDetailsViews(items.get(i), true, false);
             }
-            
-            for (int i=-1; i<mMergedItem.mOtherProcesses.size(); i++) {
-                RunningState.ProcessItem pi = i < 0 ? mMergedItem.mProcess
-                        : mMergedItem.mOtherProcesses.get(i);
-                if (pi.mPid <= 0) {
-                    continue;
-                }
-                
-                addProcessDetailsView(pi, i < 0);
+            for (int i=0; i<items.size(); i++) {
+                addDetailsViews(items.get(i), false, true);
             }
+        } else {
+            addDetailsViews(mMergedItem, true, true);
         }
     }
     
@@ -423,8 +493,9 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-        mUid = getArguments().getInt(KEY_UID, 0);
-        mProcessName = getArguments().getString(KEY_PROCESS);
+        mUid = getArguments().getInt(KEY_UID, -1);
+        mUserId = getArguments().getInt(KEY_USER_ID, 0);
+        mProcessName = getArguments().getString(KEY_PROCESS, null);
         mShowBackground = getArguments().getBoolean(KEY_BACKGROUND, false);
         
         mAm = (ActivityManager)getActivity().getSystemService(Context.ACTIVITY_SERVICE);
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 1b5310d..838e4fe 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -27,12 +27,16 @@
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
 import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.text.format.Formatter;
 import android.util.Log;
 import android.util.SparseArray;
@@ -49,6 +53,9 @@
  * applications/processes/services.
  */
 public class RunningState {
+    static final String TAG = "RunningState";
+    static final boolean DEBUG_COMPARE = false;
+
     static Object sGlobalLock = new Object();
     static RunningState sInstance;
 
@@ -65,6 +72,8 @@
     final Context mApplicationContext;
     final ActivityManager mAm;
     final PackageManager mPm;
+    final UserManager mUm;
+    final int mMyUserId;
 
     OnRefreshUiListener mRefreshUiListener;
 
@@ -100,6 +109,17 @@
     // All processes, used for retrieving memory information.
     final ArrayList<ProcessItem> mAllProcessItems = new ArrayList<ProcessItem>();
 
+    // If there are other users on the device, these are the merged items
+    // representing all items that would be put in mMergedItems for that user.
+    final SparseArray<MergedItem> mOtherUserMergedItems = new SparseArray<MergedItem>();
+
+    // If there are other users on the device, these are the merged items
+    // representing all items that would be put in mUserBackgroundItems for that user.
+    final SparseArray<MergedItem> mOtherUserBackgroundItems = new SparseArray<MergedItem>();
+
+    // Tracking of information about users.
+    final SparseArray<UserState> mUsers = new SparseArray<UserState>();
+
     static class AppProcessInfo {
         final ActivityManager.RunningAppProcessInfo info;
         boolean hasServices;
@@ -114,7 +134,64 @@
     final SparseArray<AppProcessInfo> mTmpAppProcesses = new SparseArray<AppProcessInfo>();
 
     int mSequence = 0;
-    
+
+    final Comparator<RunningState.MergedItem> mBackgroundComparator
+        = new Comparator<RunningState.MergedItem>() {
+            @Override
+            public int compare(MergedItem lhs, MergedItem rhs) {
+                if (DEBUG_COMPARE) {
+                    Log.i(TAG, "Comparing " + lhs + " with " + rhs);
+                    Log.i(TAG, "     Proc " + lhs.mProcess + " with " + rhs.mProcess);
+                    Log.i(TAG, "   UserId " + lhs.mUserId + " with " + rhs.mUserId);
+                }
+                if (lhs.mUserId != rhs.mUserId) {
+                    if (lhs.mUserId == mMyUserId) return -1;
+                    if (rhs.mUserId == mMyUserId) return 1;
+                    return lhs.mUserId < rhs.mUserId ? -1 : 1;
+                }
+                if (lhs.mProcess == rhs.mProcess) {
+                    if (lhs.mLabel == rhs.mLabel) {
+                        return 0;
+                    }
+                    return lhs.mLabel != null ? lhs.mLabel.compareTo(rhs.mLabel) : -1;
+                }
+                if (lhs.mProcess == null) return -1;
+                if (rhs.mProcess == null) return 1;
+                if (DEBUG_COMPARE) Log.i(TAG, "    Label " + lhs.mProcess.mLabel
+                        + " with " + rhs.mProcess.mLabel);
+                final ActivityManager.RunningAppProcessInfo lhsInfo
+                        = lhs.mProcess.mRunningProcessInfo;
+                final ActivityManager.RunningAppProcessInfo rhsInfo
+                        = rhs.mProcess.mRunningProcessInfo;
+                final boolean lhsBg = lhsInfo.importance
+                        >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
+                final boolean rhsBg = rhsInfo.importance
+                        >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
+                        if (DEBUG_COMPARE) Log.i(TAG, "       Bg " + lhsBg + " with " + rhsBg);
+                if (lhsBg != rhsBg) {
+                    return lhsBg ? 1 : -1;
+                }
+                final boolean lhsA = (lhsInfo.flags
+                        & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
+                final boolean rhsA = (rhsInfo.flags
+                        & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
+                if (DEBUG_COMPARE) Log.i(TAG, "      Act " + lhsA + " with " + rhsA);
+                if (lhsA != rhsA) {
+                    return lhsA ? -1 : 1;
+                }
+                if (DEBUG_COMPARE) Log.i(TAG, "      Lru " + lhsInfo.lru + " with " + rhsInfo.lru);
+                if (lhsInfo.lru != rhsInfo.lru) {
+                    return lhsInfo.lru < rhsInfo.lru ? -1 : 1;
+                }
+                if (lhs.mProcess.mLabel == rhs.mProcess.mLabel) {
+                    return 0;
+                }
+                if (lhs.mProcess.mLabel == null) return 1;
+                if (rhs.mProcess.mLabel == null) return -1;
+                return lhs.mProcess.mLabel.compareTo(rhs.mProcess.mLabel);
+            }
+    };
+
     // ----- following protected by mLock -----
     
     // Lock for protecting the state that will be shared between the
@@ -128,6 +205,7 @@
     ArrayList<BaseItem> mItems = new ArrayList<BaseItem>();
     ArrayList<MergedItem> mMergedItems = new ArrayList<MergedItem>();
     ArrayList<MergedItem> mBackgroundItems = new ArrayList<MergedItem>();
+    ArrayList<MergedItem> mUserBackgroundItems = new ArrayList<MergedItem>();
     
     int mNumBackgroundProcesses;
     long mBackgroundProcessMemory;
@@ -211,25 +289,40 @@
         public void onRefreshUi(int what);
     }
 
+    static class UserState {
+        UserInfo mInfo;
+        String mLabel;
+        Drawable mIcon;
+    }
+
     static class BaseItem {
         final boolean mIsProcess;
-        
+        final int mUserId;
+
         PackageItemInfo mPackageInfo;
         CharSequence mDisplayLabel;
         String mLabel;
         String mDescription;
-        
+
         int mCurSeq;
-        
+
         long mActiveSince;
         long mSize;
         String mSizeStr;
         String mCurSizeStr;
         boolean mNeedDivider;
         boolean mBackground;
-        
-        public BaseItem(boolean isProcess) {
+
+        public BaseItem(boolean isProcess, int userId) {
             mIsProcess = isProcess;
+            mUserId = userId;
+        }
+
+        public Drawable loadIcon(Context context, RunningState state) {
+            if (mPackageInfo != null) {
+                return mPackageInfo.loadIcon(state.mPm);
+            }
+            return null;
         }
     }
 
@@ -240,8 +333,8 @@
         
         MergedItem mMergedItem;
         
-        public ServiceItem() {
-            super(false);
+        public ServiceItem(int userId) {
+            super(false, userId);
         }
     }
 
@@ -271,7 +364,7 @@
         long mActiveSince;
         
         public ProcessItem(Context context, int uid, String processName) {
-            super(true);
+            super(true, UserHandle.getUserId(uid));
             mDescription = context.getResources().getString(
                     R.string.service_process_name, processName);
             mUid = uid;
@@ -332,8 +425,9 @@
             // If still don't have anything to display, just use the
             // service info.
             if (mServices.size() > 0) {
-                mPackageInfo = mServices.values().iterator().next()
+                ApplicationInfo ai = mServices.values().iterator().next()
                         .mServiceInfo.applicationInfo;
+                mPackageInfo = ai;
                 mDisplayLabel = mPackageInfo.loadLabel(pm);
                 mLabel = mDisplayLabel.toString();
                 return;
@@ -358,7 +452,7 @@
             ServiceItem si = mServices.get(service.service);
             if (si == null) {
                 changed = true;
-                si = new ServiceItem();
+                si = new ServiceItem(mUserId);
                 si.mRunningService = service;
                 try {
                     si.mServiceInfo = pm.getServiceInfo(service.service, 0);
@@ -456,55 +550,96 @@
 
     static class MergedItem extends BaseItem {
         ProcessItem mProcess;
+        UserState mUser;
         final ArrayList<ProcessItem> mOtherProcesses = new ArrayList<ProcessItem>();
         final ArrayList<ServiceItem> mServices = new ArrayList<ServiceItem>();
+        final ArrayList<MergedItem> mChildren = new ArrayList<MergedItem>();
         
         private int mLastNumProcesses = -1, mLastNumServices = -1;
 
-        MergedItem() {
-            super(false);
+        MergedItem(int userId) {
+            super(false, userId);
         }
-        
+
+        private void setDescription(Context context, int numProcesses, int numServices) {
+            if (mLastNumProcesses != numProcesses || mLastNumServices != numServices) {
+                mLastNumProcesses = numProcesses;
+                mLastNumServices = numServices;
+                int resid = R.string.running_processes_item_description_s_s;
+                if (numProcesses != 1) {
+                    resid = numServices != 1
+                            ? R.string.running_processes_item_description_p_p
+                            : R.string.running_processes_item_description_p_s;
+                } else if (numServices != 1) {
+                    resid = R.string.running_processes_item_description_s_p;
+                }
+                mDescription = context.getResources().getString(resid, numProcesses,
+                        numServices);
+            }
+        }
+
         boolean update(Context context, boolean background) {
-            mPackageInfo = mProcess.mPackageInfo;
-            mDisplayLabel = mProcess.mDisplayLabel;
-            mLabel = mProcess.mLabel;
             mBackground = background;
-            
-            if (!mBackground) {
-                int numProcesses = (mProcess.mPid > 0 ? 1 : 0) + mOtherProcesses.size();
-                int numServices = mServices.size();
-                if (mLastNumProcesses != numProcesses || mLastNumServices != numServices) {
-                    mLastNumProcesses = numProcesses;
-                    mLastNumServices = numServices;
-                    int resid = R.string.running_processes_item_description_s_s;
-                    if (numProcesses != 1) {
-                        resid = numServices != 1
-                                ? R.string.running_processes_item_description_p_p
-                                : R.string.running_processes_item_description_p_s;
-                    } else if (numServices != 1) {
-                        resid = R.string.running_processes_item_description_s_p;
+
+            if (mUser != null) {
+                // This is a merged item that contains a child collection
+                // of items...  that is, it is an entire user, containing
+                // everything associated with that user.  So set it up as such.
+                // For concrete stuff we need about the process of this item,
+                // we will just use the info from the first child.
+                MergedItem child0 = mChildren.get(0);
+                mPackageInfo = child0.mProcess.mPackageInfo;
+                mLabel = mUser != null ? mUser.mLabel : null;
+                mDisplayLabel = mLabel;
+                int numProcesses = 0;
+                int numServices = 0;
+                mActiveSince = -1;
+                for (int i=0; i<mChildren.size(); i++) {
+                    MergedItem child = mChildren.get(i);
+                    numProcesses += child.mLastNumProcesses;
+                    numServices += child.mLastNumServices;
+                    if (child.mActiveSince >= 0 && mActiveSince < child.mActiveSince) {
+                        mActiveSince = child.mActiveSince;
                     }
-                    mDescription = context.getResources().getString(resid, numProcesses,
-                            numServices);
+                }
+                if (!mBackground) {
+                    setDescription(context, numProcesses, numServices);
+                }
+            } else {
+                mPackageInfo = mProcess.mPackageInfo;
+                mDisplayLabel = mProcess.mDisplayLabel;
+                mLabel = mProcess.mLabel;
+                
+                if (!mBackground) {
+                    setDescription(context, (mProcess.mPid > 0 ? 1 : 0) + mOtherProcesses.size(),
+                            mServices.size());
+                }
+                
+                mActiveSince = -1;
+                for (int i=0; i<mServices.size(); i++) {
+                    ServiceItem si = mServices.get(i);
+                    if (si.mActiveSince >= 0 && mActiveSince < si.mActiveSince) {
+                        mActiveSince = si.mActiveSince;
+                    }
                 }
             }
-            
-            mActiveSince = -1;
-            for (int i=0; i<mServices.size(); i++) {
-                ServiceItem si = mServices.get(i);
-                if (si.mActiveSince >= 0 && mActiveSince < si.mActiveSince) {
-                    mActiveSince = si.mActiveSince;
-                }
-            }
-            
+
             return false;
         }
         
         boolean updateSize(Context context) {
-            mSize = mProcess.mSize;
-            for (int i=0; i<mOtherProcesses.size(); i++) {
-                mSize += mOtherProcesses.get(i).mSize;
+            if (mUser != null) {
+                mSize = 0;
+                for (int i=0; i<mChildren.size(); i++) {
+                    MergedItem child = mChildren.get(i);
+                    child.updateSize(context);
+                    mSize += child.mSize;
+                }
+            } else {
+                mSize = mProcess.mSize;
+                for (int i=0; i<mOtherProcesses.size(); i++) {
+                    mSize += mOtherProcesses.get(i).mSize;
+                }
             }
             
             String sizeStr = Formatter.formatShortFileSize(
@@ -518,10 +653,26 @@
             }
             return false;
         }
+
+        public Drawable loadIcon(Context context, RunningState state) {
+            if (mUser == null) {
+                return super.loadIcon(context, state);
+            }
+            if (mUser.mIcon != null) {
+                return mUser.mIcon.getConstantState().newDrawable();
+            }
+            return context.getResources().getDrawable(
+                    com.android.internal.R.drawable.ic_menu_cc);
+        }
     }
-    
-    static class ServiceProcessComparator implements Comparator<ProcessItem> {
+
+    class ServiceProcessComparator implements Comparator<ProcessItem> {
         public int compare(ProcessItem object1, ProcessItem object2) {
+            if (object1.mUserId != object2.mUserId) {
+                if (object1.mUserId == mMyUserId) return -1;
+                if (object2.mUserId == mMyUserId) return 1;
+                return object1.mUserId < object2.mUserId ? -1 : 1;
+            }
             if (object1.mIsStarted != object2.mIsStarted) {
                 // Non-started processes go last.
                 return object1.mIsStarted ? -1 : 1;
@@ -570,6 +721,8 @@
         mApplicationContext = context.getApplicationContext();
         mAm = (ActivityManager)mApplicationContext.getSystemService(Context.ACTIVITY_SERVICE);
         mPm = mApplicationContext.getPackageManager();
+        mUm = (UserManager)mApplicationContext.getSystemService(Context.USER_SERVICE);
+        mMyUserId = UserHandle.myUserId();
         mResumed = false;
         mBackgroundThread = new HandlerThread("RunningState:Background");
         mBackgroundThread.start();
@@ -646,6 +799,42 @@
         mRunningProcesses.clear();
         mProcessItems.clear();
         mAllProcessItems.clear();
+        mUsers.clear();
+    }
+
+    private void addOtherUserItem(Context context, ArrayList<MergedItem> newMergedItems,
+            SparseArray<MergedItem> userItems, MergedItem newItem) {
+        MergedItem userItem = userItems.get(newItem.mUserId);
+        boolean first = userItem == null || userItem.mCurSeq != mSequence;
+        if (first) {
+            if (userItem == null) {
+                userItem = new MergedItem(newItem.mUserId);
+                userItems.put(newItem.mUserId, userItem);
+            } else {
+                userItem.mChildren.clear();
+            }
+            userItem.mCurSeq = mSequence;
+            if ((userItem.mUser=mUsers.get(newItem.mUserId)) == null) {
+                userItem.mUser = new UserState();
+                UserInfo info = mUm.getUserInfo(newItem.mUserId);
+                userItem.mUser.mInfo = info;
+                if (info != null && info.iconPath != null) {
+                    try {
+                        userItem.mUser.mIcon = Drawable.createFromPath(info.iconPath);
+                    } catch (Exception e) {
+                        Log.w(TAG, "Failure loading user picture " + info.iconPath, e);
+                    }
+                }
+                String name = info != null ? info.name : null;
+                if (name == null) {
+                    name = Integer.toString(info.id);
+                }
+                userItem.mUser.mLabel = context.getResources().getString(
+                        R.string.running_process_item_user_label, name);
+            }
+            newMergedItems.add(userItem);
+        }
+        userItem.mChildren.add(newItem);
     }
 
     private boolean update(Context context, ActivityManager am) {
@@ -940,6 +1129,7 @@
             
             ArrayList<BaseItem> newItems = new ArrayList<BaseItem>();
             ArrayList<MergedItem> newMergedItems = new ArrayList<MergedItem>();
+            SparseArray<MergedItem> otherUsers = null;
             mProcessItems.clear();
             for (int i=0; i<sortedProcesses.size(); i++) {
                 ProcessItem pi = sortedProcesses.get(i);
@@ -975,7 +1165,7 @@
                 if (!haveAllMerged || mergedItem == null
                         || mergedItem.mServices.size() != pi.mServices.size()) {
                     // Whoops, we need to build a new MergedItem!
-                    mergedItem = new MergedItem();
+                    mergedItem = new MergedItem(pi.mUserId);
                     for (ServiceItem si : pi.mServices.values()) {
                         mergedItem.mServices.add(si);
                         si.mMergedItem = mergedItem;
@@ -988,9 +1178,13 @@
                 }
                 
                 mergedItem.update(context, false);
-                newMergedItems.add(mergedItem);
+                if (mergedItem.mUserId != mMyUserId) {
+                    addOtherUserItem(context, newMergedItems, mOtherUserMergedItems, mergedItem);
+                } else {
+                    newMergedItems.add(mergedItem);
+                }
             }
-            
+
             // Finally, interesting processes need to be shown and will
             // go at the top.
             NHP = mInterestingProcesses.size();
@@ -998,15 +1192,30 @@
                 ProcessItem proc = mInterestingProcesses.get(i);
                 if (proc.mClient == null && proc.mServices.size() <= 0) {
                     if (proc.mMergedItem == null) {
-                        proc.mMergedItem = new MergedItem();
+                        proc.mMergedItem = new MergedItem(proc.mUserId);
                         proc.mMergedItem.mProcess = proc;
                     }
                     proc.mMergedItem.update(context, false);
-                    newMergedItems.add(0, proc.mMergedItem);
+                    if (proc.mMergedItem.mUserId != mMyUserId) {
+                        addOtherUserItem(context, newMergedItems, mOtherUserMergedItems,
+                                proc.mMergedItem);
+                    } else {
+                        newMergedItems.add(0, proc.mMergedItem);
+                    }
                     mProcessItems.add(proc);
                 }
             }
-            
+
+            // Finally finally, user aggregated merged items need to be
+            // updated now that they have all of their children.
+            final int NU = mOtherUserMergedItems.size();
+            for (int i=0; i<NU; i++) {
+                MergedItem user = mOtherUserMergedItems.valueAt(i);
+                if (user.mCurSeq == mSequence) {
+                    user.update(context, false);
+                }
+            }
+
             synchronized (mLock) {
                 mItems = newItems;
                 mMergedItems = newMergedItems;
@@ -1047,6 +1256,8 @@
         long foregroundProcessMemory = 0;
         long serviceProcessMemory = 0;
         ArrayList<MergedItem> newBackgroundItems = null;
+        ArrayList<MergedItem> newUserBackgroundItems = null;
+        boolean diffUsers = false;
         try {
             final int numProc = mAllProcessItems.size();
             int[] pids = new int[numProc];
@@ -1066,18 +1277,22 @@
                     backgroundProcessMemory += proc.mSize;
                     MergedItem mergedItem;
                     if (newBackgroundItems != null) {
-                        mergedItem = proc.mMergedItem = new MergedItem();
+                        mergedItem = proc.mMergedItem = new MergedItem(proc.mUserId);
                         proc.mMergedItem.mProcess = proc;
+                        diffUsers |= mergedItem.mUserId != mMyUserId;
                         newBackgroundItems.add(mergedItem);
                     } else {
                         if (bgIndex >= mBackgroundItems.size()
                                 || mBackgroundItems.get(bgIndex).mProcess != proc) {
                             newBackgroundItems = new ArrayList<MergedItem>(numBackgroundProcesses);
                             for (int bgi=0; bgi<bgIndex; bgi++) {
-                                newBackgroundItems.add(mBackgroundItems.get(bgi));
+                                mergedItem = mBackgroundItems.get(bgi);
+                                diffUsers |= mergedItem.mUserId != mMyUserId;
+                                newBackgroundItems.add(mergedItem);
                             }
-                            mergedItem = proc.mMergedItem = new MergedItem();
+                            mergedItem = proc.mMergedItem = new MergedItem(proc.mUserId);
                             proc.mMergedItem.mProcess = proc;
+                            diffUsers |= mergedItem.mUserId != mMyUserId;
                             newBackgroundItems.add(mergedItem);
                         } else {
                             mergedItem = mBackgroundItems.get(bgIndex);
@@ -1099,7 +1314,42 @@
             if (mBackgroundItems.size() > numBackgroundProcesses) {
                 newBackgroundItems = new ArrayList<MergedItem>(numBackgroundProcesses);
                 for (int bgi=0; bgi<numBackgroundProcesses; bgi++) {
-                    newBackgroundItems.add(mBackgroundItems.get(bgi));
+                    MergedItem mergedItem = mBackgroundItems.get(bgi);
+                    diffUsers |= mergedItem.mUserId != mMyUserId;
+                    newBackgroundItems.add(mergedItem);
+                }
+            }
+        }
+
+        if (newBackgroundItems != null) {
+            // The background items have changed; we need to re-build the
+            // per-user items.
+            if (!diffUsers) {
+                // Easy: there are no other users, we can just use the same array.
+                newUserBackgroundItems = newBackgroundItems;
+            } else {
+                // We now need to re-build the per-user list so that background
+                // items for users are collapsed together.
+                newUserBackgroundItems = new ArrayList<MergedItem>();
+                final int NB = newBackgroundItems.size();
+                for (int i=0; i<NB; i++) {
+                    MergedItem mergedItem = newBackgroundItems.get(i);
+                    if (mergedItem.mUserId != mMyUserId) {
+                        addOtherUserItem(context, newUserBackgroundItems,
+                                mOtherUserBackgroundItems, mergedItem);
+                    } else {
+                        newUserBackgroundItems.add(mergedItem);
+                    }
+                }
+                // And user aggregated merged items need to be
+                // updated now that they have all of their children.
+                final int NU = mOtherUserBackgroundItems.size();
+                for (int i=0; i<NU; i++) {
+                    MergedItem user = mOtherUserBackgroundItems.valueAt(i);
+                    if (user.mCurSeq == mSequence) {
+                        user.update(context, true);
+                        user.updateSize(context);
+                    }
                 }
             }
         }
@@ -1117,6 +1367,7 @@
             mServiceProcessMemory = serviceProcessMemory;
             if (newBackgroundItems != null) {
                 mBackgroundItems = newBackgroundItems;
+                mUserBackgroundItems = newUserBackgroundItems;
                 if (mWatchingBackgroundItems) {
                     changed = true;
                 }
@@ -1150,7 +1401,7 @@
 
     ArrayList<MergedItem> getCurrentBackgroundItems() {
         synchronized (mLock) {
-            return mBackgroundItems;
+            return mUserBackgroundItems;
         }
     }
 }
diff --git a/src/com/android/settings/bluetooth/A2dpProfile.java b/src/com/android/settings/bluetooth/A2dpProfile.java
old mode 100644
new mode 100755
index b7ba44d..fbf24c9
--- a/src/com/android/settings/bluetooth/A2dpProfile.java
+++ b/src/com/android/settings/bluetooth/A2dpProfile.java
@@ -24,17 +24,19 @@
 import android.bluetooth.BluetoothUuid;
 import android.content.Context;
 import android.os.ParcelUuid;
+import android.util.Log;
 
 import com.android.settings.R;
 
+import java.util.ArrayList;
 import java.util.List;
 
-/**
- * A2dpProfile handles Bluetooth A2DP.
- * TODO: add null checks around calls to mService object.
- */
 final class A2dpProfile implements LocalBluetoothProfile {
+    private static final String TAG = "A2dpProfile";
+    private static boolean V = true;
+
     private BluetoothA2dp mService;
+    private boolean mIsProfileReady;
 
     static final ParcelUuid[] SINK_UUIDS = {
         BluetoothUuid.AudioSink,
@@ -42,6 +44,7 @@
     };
 
     static final String NAME = "A2DP";
+    private final LocalBluetoothProfileManager mProfileManager;
 
     // Order of this profile in device profiles list
     private static final int ORDINAL = 1;
@@ -51,15 +54,22 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothA2dp) proxy;
+            mIsProfileReady=true;
         }
 
         public void onServiceDisconnected(int profile) {
-            mService = null;
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mIsProfileReady=false;
         }
     }
 
-    A2dpProfile(Context context) {
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+    A2dpProfile(Context context, LocalBluetoothProfileManager profileManager) {
+        mProfileManager = profileManager;
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         adapter.getProfileProxy(context, new A2dpServiceListener(),
                 BluetoothProfile.A2DP);
@@ -73,7 +83,8 @@
         return true;
     }
 
-    private List<BluetoothDevice> getConnectedDevices() {
+    public List<BluetoothDevice> getConnectedDevices() {
+        if (mService == null) return new ArrayList<BluetoothDevice>(0);
         return mService.getDevicesMatchingConnectionStates(
               new int[] {BluetoothProfile.STATE_CONNECTED,
                          BluetoothProfile.STATE_CONNECTING,
@@ -81,6 +92,7 @@
     }
 
     public boolean connect(BluetoothDevice device) {
+        if (mService == null) return false;
         List<BluetoothDevice> sinks = getConnectedDevices();
         if (sinks != null) {
             for (BluetoothDevice sink : sinks) {
@@ -91,22 +103,33 @@
     }
 
     public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
+        // Downgrade priority as user is disconnecting the headset.
+        if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON){
+            mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+        }
         return mService.disconnect(device);
     }
 
     public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) {
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
         return mService.getConnectionState(device);
     }
 
     public boolean isPreferred(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
     }
 
     public int getPreferred(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
         return mService.getPriority(device);
     }
 
     public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (mService == null) return;
         if (preferred) {
             if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
                 mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -115,8 +138,8 @@
             mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
         }
     }
-
     boolean isA2dpPlaying() {
+        if (mService == null) return false;
         List<BluetoothDevice> sinks = mService.getConnectedDevices();
         if (!sinks.isEmpty()) {
             if (mService.isA2dpPlaying(sinks.get(0))) {
@@ -126,10 +149,6 @@
         return false;
     }
 
-    public boolean isProfileReady() {
-        return mService != null;
-    }
-
     public String toString() {
         return NAME;
     }
@@ -143,7 +162,7 @@
     }
 
     public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = mService.getConnectionState(device);
+        int state = getConnectionStatus(device);
         switch (state) {
             case BluetoothProfile.STATE_DISCONNECTED:
                 return R.string.bluetooth_a2dp_profile_summary_use_for;
@@ -159,4 +178,17 @@
     public int getDrawableResource(BluetoothClass btClass) {
         return R.drawable.ic_bt_headphones_a2dp;
     }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.A2DP,
+                                                                       mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up A2DP proxy", t);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index babf1e2..d687136 100755
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -29,6 +29,9 @@
 
 import com.android.settings.R;
 
+import android.text.format.Time;
+import android.util.Log;
+
 /**
  * BluetoothDiscoverableEnabler is a helper to manage the "Discoverable"
  * checkbox. It sets/unsets discoverability and keeps track of how much time
@@ -36,6 +39,8 @@
  */
 final class BluetoothDiscoverableEnabler implements Preference.OnPreferenceClickListener {
 
+    private static final String TAG = "BluetoothDiscoverableEnabler";
+
     private static final String SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT =
             "debug.bt.discoverable_time";
 
@@ -128,15 +133,20 @@
     private void setEnabled(boolean enable) {
         if (enable) {
             int timeout = getDiscoverableTimeout();
-            mLocalAdapter.setDiscoverableTimeout(timeout);
-
             long endTimestamp = System.currentTimeMillis() + timeout * 1000L;
             LocalBluetoothPreferences.persistDiscoverableEndTimestamp(mContext, endTimestamp);
 
             mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, timeout);
             updateCountdownSummary();
+
+            Log.d(TAG, "setEnabled(): enabled = " + enable + "timeout = " + timeout);
+
+            if (timeout > 0) {
+                BluetoothDiscoverableTimeoutReceiver.setDiscoverableAlarm(mContext, endTimestamp);
+            }
         } else {
             mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+            BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext);
         }
     }
 
@@ -238,6 +248,7 @@
     }
 
     void handleModeChanged(int mode) {
+        Log.d(TAG, "handleModeChanged(): mode = " + mode);
         if (mode == BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
             mDiscoverable = true;
             updateCountdownSummary();
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java
new file mode 100644
index 0000000..14f7b22
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.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.bluetooth;
+
+/* Required to handle timeout notification when phone is suspended */
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+
+public class BluetoothDiscoverableTimeoutReceiver extends BroadcastReceiver {
+    private static final String TAG = "BluetoothDiscoverableTimeoutReceiver";
+
+    private static final String INTENT_DISCOVERABLE_TIMEOUT =
+        "android.bluetooth.intent.DISCOVERABLE_TIMEOUT";
+
+    static void setDiscoverableAlarm(Context context, long alarmTime) {
+        Log.d(TAG, "setDiscoverableAlarm(): alarmTime = " + alarmTime);
+
+        Intent intent = new Intent(INTENT_DISCOVERABLE_TIMEOUT);
+        intent.setClass(context, BluetoothDiscoverableTimeoutReceiver.class);
+        PendingIntent pending = PendingIntent.getBroadcast(
+            context, 0, intent, 0);
+        AlarmManager alarmManager =
+              (AlarmManager) context.getSystemService (Context.ALARM_SERVICE);
+
+        if (pending != null) {
+            // Cancel any previous alarms that do the same thing.
+            alarmManager.cancel(pending);
+            Log.d(TAG, "setDiscoverableAlarm(): cancel prev alarm");
+        }
+        pending = PendingIntent.getBroadcast(
+            context, 0, intent, 0);
+
+        alarmManager.set(AlarmManager.RTC_WAKEUP, alarmTime, pending);
+    }
+
+    static void cancelDiscoverableAlarm(Context context) {
+        Log.d(TAG, "cancelDiscoverableAlarm(): Enter");
+
+        Intent intent = new Intent(INTENT_DISCOVERABLE_TIMEOUT);
+        intent.setClass(context, BluetoothDiscoverableTimeoutReceiver.class);
+        PendingIntent pending = PendingIntent.getBroadcast(
+            context, 0, intent, PendingIntent.FLAG_NO_CREATE);
+        if (pending != null) {
+            // Cancel any previous alarms that do the same thing.
+            AlarmManager alarmManager =
+              (AlarmManager) context.getSystemService (Context.ALARM_SERVICE);
+
+            alarmManager.cancel(pending);
+        }
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        LocalBluetoothAdapter localBluetoothAdapter = LocalBluetoothAdapter.getInstance();
+
+         if(localBluetoothAdapter != null  &&
+            localBluetoothAdapter.getState() == BluetoothAdapter.STATE_ON) {
+            Log.d(TAG, "Disable discoverable...");
+
+            localBluetoothAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+         } else {
+            Log.e(TAG, "localBluetoothAdapter is NULL!!");
+        }
+    }
+};
diff --git a/src/com/android/settings/bluetooth/BluetoothEventManager.java b/src/com/android/settings/bluetooth/BluetoothEventManager.java
old mode 100644
new mode 100755
index a6d9bcf..0eead85
--- a/src/com/android/settings/bluetooth/BluetoothEventManager.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventManager.java
@@ -21,6 +21,7 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -99,6 +100,7 @@
 
         // Dock event broadcasts
         addHandler(Intent.ACTION_DOCK_EVENT, new DockEventHandler());
+
         mContext.registerReceiver(mBroadcastReceiver, mAdapterIntentFilter);
     }
 
@@ -163,6 +165,8 @@
                     callback.onBluetoothStateChanged(state);
                 }
             }
+            // Inform CachedDeviceManager that the adapter state has changed
+            mDeviceManager.onBluetoothStateChanged(state);
         }
     }
 
@@ -365,7 +369,6 @@
             }
         }
     }
-
     boolean readPairedDevices() {
         Set<BluetoothDevice> bondedDevices = mLocalAdapter.getBondedDevices();
         if (bondedDevices == null) {
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index d30e428..f44efc4 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -125,7 +125,7 @@
                 activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
                         ActionBar.LayoutParams.WRAP_CONTENT,
                         ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                        Gravity.CENTER_VERTICAL | Gravity.END));
             }
         }
 
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
old mode 100644
new mode 100755
index 01fd1b2..4b19b9c
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -25,6 +25,7 @@
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
+import android.bluetooth.BluetoothAdapter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -118,7 +119,11 @@
             Log.d(TAG, "onProfileStateChanged: profile " + profile +
                     " newProfileState " + newProfileState);
         }
-
+        if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_TURNING_OFF)
+        {
+            if (Utils.D) Log.d(TAG, " BT Turninig Off...Profile conn state change ignored...");
+            return;
+        }
         mProfileConnectionState.put(profile, newProfileState);
         if (newProfileState == BluetoothProfile.STATE_CONNECTED) {
             if (!mProfiles.contains(profile)) {
@@ -156,6 +161,14 @@
         for (LocalBluetoothProfile profile : mProfiles) {
             disconnect(profile);
         }
+        // Disconnect  PBAP server in case its connected
+        // This is to ensure all the profiles are disconnected as some CK/Hs do not
+        // disconnect  PBAP connection when HF connection is brought down
+        PbapServerProfile PbapProfile = mProfileManager.getPbapProfile();
+        if (PbapProfile.getConnectionStatus(mDevice) == BluetoothProfile.STATE_CONNECTED)
+        {
+            PbapProfile.disconnect(mDevice);
+        }
     }
 
     void disconnect(LocalBluetoothProfile profile) {
@@ -184,12 +197,15 @@
     private void connectWithoutResettingTimer(boolean connectAllProfiles) {
         // Try to initialize the profiles if they were not.
         if (mProfiles.isEmpty()) {
-            if (!updateProfiles()) {
-                // If UUIDs are not available yet, connect will be happen
-                // upon arrival of the ACTION_UUID intent.
-                if (DEBUG) Log.d(TAG, "No profiles. Maybe we will connect later");
-                return;
-            }
+            // if mProfiles is empty, then do not invoke updateProfiles. This causes a race
+            // condition with carkits during pairing, wherein RemoteDevice.UUIDs have been updated
+            // from bluetooth stack but ACTION.uuid is not sent yet.
+            // Eventually ACTION.uuid will be received which shall trigger the connection of the
+            // various profiles
+            // If UUIDs are not available yet, connect will be happen
+            // upon arrival of the ACTION_UUID intent.
+            Log.d(TAG, "No profiles. Maybe we will connect later");
+            return;
         }
 
         // Reset the only-show-one-error-dialog tracking variable
@@ -236,9 +252,11 @@
         // Reset the only-show-one-error-dialog tracking variable
         mIsConnectingErrorPossible = true;
         connectInt(profile);
+        // Refresh the UI based on profile.connect() call
+        refresh();
     }
 
-    private void connectInt(LocalBluetoothProfile profile) {
+    synchronized void connectInt(LocalBluetoothProfile profile) {
         if (!ensurePaired()) {
             return;
         }
@@ -283,8 +301,6 @@
     }
 
     void unpair() {
-        disconnect();
-
         int state = getBondState();
 
         if (state == BluetoothDevice.BOND_BONDING) {
@@ -317,6 +333,16 @@
         return mProfileConnectionState.get(profile);
     }
 
+    public void clearProfileConnectionState ()
+    {
+        if (Utils.D) {
+            Log.d(TAG," Clearing all connection state for dev:" + mDevice.getName());
+        }
+        for (LocalBluetoothProfile profile :getProfiles()) {
+            mProfileConnectionState.put(profile, BluetoothProfile.STATE_DISCONNECTED);
+        }
+    }
+
     // TODO: do any of these need to run async on a background thread?
     private void fillData() {
         fetchName();
@@ -436,7 +462,7 @@
         ParcelUuid[] localUuids = mLocalAdapter.getUuids();
         if (localUuids == null) return false;
 
-        mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles);
+        mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles, mLocalNapRoleConnected);
 
         if (DEBUG) {
             Log.e(TAG, "updating profiles for " + mDevice.getAliasName());
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
old mode 100644
new mode 100755
index 77f6b2c..ff282cc
--- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.util.Log;
@@ -134,6 +135,24 @@
         }
     }
 
+    public synchronized void onBluetoothStateChanged(int bluetoothState) {
+        // When Bluetooth is turning off, we need to clear the non-bonded devices
+        // Otherwise, they end up showing up on the next BT enable
+        if (bluetoothState == BluetoothAdapter.STATE_TURNING_OFF) {
+            for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
+                CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
+                if (cachedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {
+                   cachedDevice.setVisible(false);
+                   mCachedDevices.remove(i);
+                } else {
+                    // For bonded devices, we need to clear the connection status so that
+                    // when BT is enabled next time, device connection status shall be retrieved
+                    // by making a binder call.
+                    cachedDevice.clearProfileConnectionState();
+                }
+            }
+        }
+    }
     private void log(String msg) {
         if (DEBUG) {
             Log.d(TAG, msg);
diff --git a/src/com/android/settings/bluetooth/HeadsetProfile.java b/src/com/android/settings/bluetooth/HeadsetProfile.java
old mode 100644
new mode 100755
index 99d070b..83c8e8e
--- a/src/com/android/settings/bluetooth/HeadsetProfile.java
+++ b/src/com/android/settings/bluetooth/HeadsetProfile.java
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -16,6 +16,7 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
@@ -27,6 +28,7 @@
 
 import com.android.settings.R;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,9 +36,10 @@
  */
 final class HeadsetProfile implements LocalBluetoothProfile {
     private static final String TAG = "HeadsetProfile";
+    private static boolean V = true;
 
     private BluetoothHeadset mService;
-    private boolean mProfileReady;
+    private boolean mIsProfileReady;
 
     private final LocalBluetoothAdapter mLocalAdapter;
     private final CachedBluetoothDeviceManager mDeviceManager;
@@ -57,38 +60,38 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothHeadset) proxy;
-            mProfileReady = true;
             // We just bound to the service, so refresh the UI of the
             // headset device.
             List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-            if (deviceList.isEmpty()) {
-                return;
+            if (!deviceList.isEmpty()) {
+                BluetoothDevice firstDevice = deviceList.get(0);
+                CachedBluetoothDevice device = mDeviceManager.findDevice(firstDevice);
+                // we may add a new device here, but generally this should not happen
+                if (device == null) {
+                    Log.w(TAG, "HeadsetProfile found new device: " + firstDevice);
+                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, firstDevice);
+                }
+                device.onProfileStateChanged(HeadsetProfile.this,
+                        BluetoothProfile.STATE_CONNECTED);
             }
-            BluetoothDevice firstDevice = deviceList.get(0);
-            CachedBluetoothDevice device = mDeviceManager.findDevice(firstDevice);
-            // we may add a new device here, but generally this should not happen
-            if (device == null) {
-                Log.w(TAG, "HeadsetProfile found new device: " + firstDevice);
-                device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, firstDevice);
-            }
-            device.onProfileStateChanged(HeadsetProfile.this,
-                    BluetoothProfile.STATE_CONNECTED);
 
             mProfileManager.callServiceConnectedListeners();
+            mIsProfileReady=true;
         }
 
         public void onServiceDisconnected(int profile) {
-            mProfileReady = false;
-            mService = null;
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
             mProfileManager.callServiceDisconnectedListeners();
+            mIsProfileReady=false;
         }
     }
 
-    // TODO(): The calls must get queued if mService becomes null.
-    // It can happen when the phone app crashes for some reason.
-    // All callers should have service listeners. Dock Service is the only
-    // one right now.
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+
     HeadsetProfile(Context context, LocalBluetoothAdapter adapter,
             CachedBluetoothDeviceManager deviceManager,
             LocalBluetoothProfileManager profileManager) {
@@ -108,6 +111,7 @@
     }
 
     public boolean connect(BluetoothDevice device) {
+        if (mService == null) return false;
         List<BluetoothDevice> sinks = mService.getConnectedDevices();
         if (sinks != null) {
             for (BluetoothDevice sink : sinks) {
@@ -118,6 +122,7 @@
     }
 
     public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
         List<BluetoothDevice> deviceList = mService.getConnectedDevices();
         if (!deviceList.isEmpty() && deviceList.get(0).equals(device)) {
             // Downgrade priority as user is disconnecting the headset.
@@ -132,7 +137,6 @@
 
     public int getConnectionStatus(BluetoothDevice device) {
         if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
-
         List<BluetoothDevice> deviceList = mService.getConnectedDevices();
 
         return !deviceList.isEmpty() && deviceList.get(0).equals(device)
@@ -141,14 +145,17 @@
     }
 
     public boolean isPreferred(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
     }
 
     public int getPreferred(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
         return mService.getPriority(device);
     }
 
     public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (mService == null) return;
         if (preferred) {
             if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
                 mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -158,8 +165,12 @@
         }
     }
 
-    public synchronized boolean isProfileReady() {
-        return mProfileReady;
+    public List<BluetoothDevice> getConnectedDevices() {
+        if (mService == null) return new ArrayList<BluetoothDevice>(0);
+        return mService.getDevicesMatchingConnectionStates(
+              new int[] {BluetoothProfile.STATE_CONNECTED,
+                         BluetoothProfile.STATE_CONNECTING,
+                         BluetoothProfile.STATE_DISCONNECTING});
     }
 
     public String toString() {
@@ -175,7 +186,7 @@
     }
 
     public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = mService.getConnectionState(device);
+        int state = getConnectionStatus(device);
         switch (state) {
             case BluetoothProfile.STATE_DISCONNECTED:
                 return R.string.bluetooth_headset_profile_summary_use_for;
@@ -191,4 +202,17 @@
     public int getDrawableResource(BluetoothClass btClass) {
         return R.drawable.ic_bt_headset_hfp;
     }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.HEADSET,
+                                                                       mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up HID proxy", t);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/HidProfile.java b/src/com/android/settings/bluetooth/HidProfile.java
old mode 100644
new mode 100755
index 920f4bb..c502850
--- a/src/com/android/settings/bluetooth/HidProfile.java
+++ b/src/com/android/settings/bluetooth/HidProfile.java
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -16,11 +16,13 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothInputDevice;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
+import android.util.Log;
 
 import com.android.settings.R;
 
@@ -30,8 +32,11 @@
  * HidProfile handles Bluetooth HID profile.
  */
 final class HidProfile implements LocalBluetoothProfile {
+    private static final String TAG = "HidProfile";
+    private static boolean V = true;
+
     private BluetoothInputDevice mService;
-    private boolean mProfileReady;
+    private boolean mIsProfileReady;
 
     static final String NAME = "HID";
 
@@ -43,16 +48,21 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothInputDevice) proxy;
-            mProfileReady = true;
+            mIsProfileReady=true;
         }
 
         public void onServiceDisconnected(int profile) {
-            mProfileReady = false;
-            mService = null;
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mIsProfileReady=false;
         }
     }
 
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+
     HidProfile(Context context, LocalBluetoothAdapter adapter) {
         adapter.getProfileProxy(context, new InputDeviceServiceListener(),
                 BluetoothProfile.INPUT_DEVICE);
@@ -67,14 +77,19 @@
     }
 
     public boolean connect(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.connect(device);
     }
 
     public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.disconnect(device);
     }
 
     public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) {
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
         List<BluetoothDevice> deviceList = mService.getConnectedDevices();
 
         return !deviceList.isEmpty() && deviceList.get(0).equals(device)
@@ -83,14 +98,17 @@
     }
 
     public boolean isPreferred(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
     }
 
     public int getPreferred(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
         return mService.getPriority(device);
     }
 
     public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (mService == null) return;
         if (preferred) {
             if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
                 mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -100,10 +118,6 @@
         }
     }
 
-    public boolean isProfileReady() {
-        return mProfileReady;
-    }
-
     public String toString() {
         return NAME;
     }
@@ -118,7 +132,7 @@
     }
 
     public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = mService.getConnectionState(device);
+        int state = getConnectionStatus(device);
         switch (state) {
             case BluetoothProfile.STATE_DISCONNECTED:
                 return R.string.bluetooth_hid_profile_summary_use_for;
@@ -149,4 +163,17 @@
                 return R.drawable.ic_bt_misc_hid;
         }
     }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.INPUT_DEVICE,
+                                                                       mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up HID proxy", t);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index 7e62b0e..36bc7c8 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -19,6 +19,7 @@
 import android.app.QueuedWork;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 
 /**
  * LocalBluetoothPreferences provides an interface to the preferences
@@ -63,6 +64,12 @@
             return false;
         }
 
+        // If in appliance mode, do not show dialog in foreground.
+        if ((context.getResources().getConfiguration().uiMode &
+                Configuration.UI_MODE_TYPE_APPLIANCE) == Configuration.UI_MODE_TYPE_APPLIANCE) {
+            return false;
+        }
+
         // If Bluetooth Settings is visible
         if (manager.isForegroundActivity()) {
             return true;
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfile.java b/src/com/android/settings/bluetooth/LocalBluetoothProfile.java
old mode 100644
new mode 100755
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
old mode 100644
new mode 100755
index f3143f0..916ef9e
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -21,17 +21,22 @@
 import android.bluetooth.BluetoothHeadset;
 import android.bluetooth.BluetoothInputDevice;
 import android.bluetooth.BluetoothPan;
+import android.bluetooth.BluetoothPbap;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothUuid;
 import android.content.Context;
 import android.content.Intent;
 import android.os.ParcelUuid;
 import android.util.Log;
+import android.os.Handler;
+import android.os.Message;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.List;
 
 /**
  * LocalBluetoothProfileManager provides access to the LocalBluetoothProfile
@@ -77,6 +82,7 @@
     private final HidProfile mHidProfile;
     private OppProfile mOppProfile;
     private final PanProfile mPanProfile;
+    private final PbapServerProfile mPbapProfile;
 
     /**
      * Mapping from profile name, e.g. "HEADSET" to profile object.
@@ -113,6 +119,10 @@
         addPanProfile(mPanProfile, PanProfile.NAME,
                 BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
 
+       //Create PBAP server profile, but do not add it to list of profiles
+       // as we do not need to monitor the profile as part of profile list
+        mPbapProfile = new PbapServerProfile(context);
+
         Log.d(TAG, "LocalBluetoothProfileManager construction complete");
     }
 
@@ -128,7 +138,7 @@
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSource)) {
             if (mA2dpProfile == null) {
                 Log.d(TAG, "Adding local A2DP profile");
-                mA2dpProfile = new A2dpProfile(mContext);
+                mA2dpProfile = new A2dpProfile(mContext, this);
                 addProfile(mA2dpProfile, A2dpProfile.NAME,
                         BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
             }
@@ -287,6 +297,11 @@
         return mHeadsetProfile;
     }
 
+    PbapServerProfile getPbapProfile(){
+        return mPbapProfile;
+    }
+
+
     /**
      * Fill in a list of LocalBluetoothProfile objects that are supported by
      * the local device and the remote device.
@@ -298,7 +313,8 @@
      */
     synchronized void updateProfiles(ParcelUuid[] uuids, ParcelUuid[] localUuids,
             Collection<LocalBluetoothProfile> profiles,
-            Collection<LocalBluetoothProfile> removedProfiles) {
+            Collection<LocalBluetoothProfile> removedProfiles,
+            boolean isPanNapConnected) {
         // Copy previous profile list into removedProfiles
         removedProfiles.clear();
         removedProfiles.addAll(profiles);
@@ -336,10 +352,13 @@
             removedProfiles.remove(mHidProfile);
         }
 
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
-            mPanProfile != null) {
+        if(isPanNapConnected)
+            Log.d(TAG, "Valid PAN-NAP connection exists.");
+        if ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
+            mPanProfile != null) || isPanNapConnected) {
             profiles.add(mPanProfile);
             removedProfiles.remove(mPanProfile);
         }
     }
+
 }
diff --git a/src/com/android/settings/bluetooth/OppProfile.java b/src/com/android/settings/bluetooth/OppProfile.java
old mode 100644
new mode 100755
diff --git a/src/com/android/settings/bluetooth/PBAPServerProfile.java b/src/com/android/settings/bluetooth/PBAPServerProfile.java
new file mode 100755
index 0000000..7217574
--- /dev/null
+++ b/src/com/android/settings/bluetooth/PBAPServerProfile.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothPbap;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.util.Log;
+
+import com.android.settings.R;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *PBAPServer Profile
+ */
+final class PbapServerProfile implements LocalBluetoothProfile {
+    private static final String TAG = "PbapServerProfile";
+    private static boolean V = true;
+
+    private BluetoothPbap mService;
+    private boolean mIsProfileReady;
+
+    static final String NAME = "PBAP Server";
+
+    // Order of this profile in device profiles list
+    private static final int ORDINAL = 6;
+
+    // These callbacks run on the main thread.
+    private final class PbapServiceListener
+            implements BluetoothPbap.ServiceListener {
+
+        public void onServiceConnected(BluetoothPbap proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
+            mService = (BluetoothPbap) proxy;
+            mIsProfileReady=true;
+        }
+
+        public void onServiceDisconnected() {
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mIsProfileReady=false;
+        }
+    }
+
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+
+    PbapServerProfile(Context context) {
+        BluetoothPbap pbap = new BluetoothPbap(context, new PbapServiceListener());
+    }
+
+    public boolean isConnectable() {
+        return true;
+    }
+
+    public boolean isAutoConnectable() {
+        return false;
+    }
+
+    public boolean connect(BluetoothDevice device) {
+        /*Can't connect from server */
+        return false;
+
+    }
+
+    public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
+        return mService.disconnect();
+    }
+
+    public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) {
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
+        if (mService.isConnected(device))
+            return BluetoothProfile.STATE_CONNECTED;
+        else
+            return BluetoothProfile.STATE_DISCONNECTED;
+    }
+
+    public boolean isPreferred(BluetoothDevice device) {
+        return false;
+    }
+
+    public int getPreferred(BluetoothDevice device) {
+        return -1;
+    }
+
+    public void setPreferred(BluetoothDevice device, boolean preferred) {
+        // ignore: isPreferred is always true for PBAP
+    }
+
+    public String toString() {
+        return NAME;
+    }
+
+    public int getOrdinal() {
+        return ORDINAL;
+    }
+
+    public int getNameResource(BluetoothDevice device) {
+      return 0;
+    }
+
+    public int getSummaryResourceForDevice(BluetoothDevice device) {
+        return 0;
+    }
+
+    public int getDrawableResource(BluetoothClass btClass) {
+        return 0;
+    }
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                mService.close();
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up PBAP proxy", t);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/PanProfile.java b/src/com/android/settings/bluetooth/PanProfile.java
old mode 100644
new mode 100755
index 3db4a2b..b9db77b
--- a/src/com/android/settings/bluetooth/PanProfile.java
+++ b/src/com/android/settings/bluetooth/PanProfile.java
@@ -22,6 +22,7 @@
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
+import android.util.Log;
 
 import com.android.settings.R;
 
@@ -32,7 +33,11 @@
  * PanProfile handles Bluetooth PAN profile (NAP and PANU).
  */
 final class PanProfile implements LocalBluetoothProfile {
+    private static final String TAG = "PanProfile";
+    private static boolean V = true;
+
     private BluetoothPan mService;
+    private boolean mIsProfileReady;
 
     // Tethering direction for each device
     private final HashMap<BluetoothDevice, Integer> mDeviceRoleMap =
@@ -48,14 +53,21 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothPan) proxy;
+            mIsProfileReady=true;
         }
 
         public void onServiceDisconnected(int profile) {
-            mService = null;
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mIsProfileReady=false;
         }
     }
 
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+
     PanProfile(Context context) {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         adapter.getProfileProxy(context, new PanServiceListener(),
@@ -71,6 +83,7 @@
     }
 
     public boolean connect(BluetoothDevice device) {
+        if (mService == null) return false;
         List<BluetoothDevice> sinks = mService.getConnectedDevices();
         if (sinks != null) {
             for (BluetoothDevice sink : sinks) {
@@ -81,10 +94,14 @@
     }
 
     public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.disconnect(device);
     }
 
     public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) {
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
         return mService.getConnectionState(device);
     }
 
@@ -100,10 +117,6 @@
         // ignore: isPreferred is always true for PAN
     }
 
-    public boolean isProfileReady() {
-        return true;
-    }
-
     public String toString() {
         return NAME;
     }
@@ -121,7 +134,7 @@
     }
 
     public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = mService.getConnectionState(device);
+        int state = getConnectionStatus(device);
         switch (state) {
             case BluetoothProfile.STATE_DISCONNECTED:
                 return R.string.bluetooth_pan_profile_summary_use_for;
@@ -154,4 +167,16 @@
             return false;
         }
     }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.PAN, mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up PAN proxy", t);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index 529312d..08c10fb 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -228,8 +228,12 @@
         } else if (mLocalAdapter.setScanMode(
                 BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, mTimeout)) {
             // If already in discoverable mode, this will extend the timeout.
+            long endTime = System.currentTimeMillis() + (long) mTimeout * 1000;
             LocalBluetoothPreferences.persistDiscoverableEndTimestamp(
-                    this, System.currentTimeMillis() + (long) mTimeout * 1000);
+                    this, endTime);
+            if (0 < mTimeout) {
+               BluetoothDiscoverableTimeoutReceiver.setDiscoverableAlarm(this, endTime);
+            }
             returnCode = mTimeout;
             // Activity.RESULT_FIRST_USER should be 1
             if (returnCode < RESULT_FIRST_USER) {
diff --git a/src/com/android/settings/deviceinfo/MiscFilesHandler.java b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
index 2f9697f..5c803ad 100644
--- a/src/com/android/settings/deviceinfo/MiscFilesHandler.java
+++ b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
@@ -20,6 +20,7 @@
 import android.app.ListActivity;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.os.storage.StorageVolume;
 import android.text.format.Formatter;
 import android.util.Log;
@@ -193,8 +194,8 @@
             mContext = activity;
             final StorageVolume storageVolume = activity.getIntent().getParcelableExtra(
                     StorageVolume.EXTRA_STORAGE_VOLUME);
-            StorageMeasurement mMeasurement = 
-                StorageMeasurement.getInstance(activity, storageVolume, false /*Unused as a key*/);
+            StorageMeasurement mMeasurement = StorageMeasurement.getInstance(
+                    activity, storageVolume, new UserHandle(UserHandle.USER_CURRENT), false);
             if (mMeasurement == null) return;
             mData = (ArrayList<StorageMeasurement.FileInfo>) mMeasurement.mFileInfoForMisc;
             if (mData != null) {
diff --git a/src/com/android/settings/deviceinfo/PercentageBarChart.java b/src/com/android/settings/deviceinfo/PercentageBarChart.java
index 95973c4..b45eb69 100644
--- a/src/com/android/settings/deviceinfo/PercentageBarChart.java
+++ b/src/com/android/settings/deviceinfo/PercentageBarChart.java
@@ -71,29 +71,56 @@
 
         final int width = right - left;
 
-        float lastX = left;
+        final boolean isLayoutRtl = isLayoutRtl();
+        if (isLayoutRtl) {
+            float nextX = right;
 
-        if (mEntries != null) {
-            for (final Entry e : mEntries) {
-                final float entryWidth;
-                if (e.percentage == 0.0f) {
-                    entryWidth = 0.0f;
-                } else {
-                    entryWidth = Math.max(mMinTickWidth, width * e.percentage);
+            if (mEntries != null) {
+                for (final Entry e : mEntries) {
+                    final float entryWidth;
+                    if (e.percentage == 0.0f) {
+                        entryWidth = 0.0f;
+                    } else {
+                        entryWidth = Math.max(mMinTickWidth, width * e.percentage);
+                    }
+
+                    final float lastX = nextX - entryWidth;
+                    if (lastX < left) {
+                        canvas.drawRect(left, top, nextX, bottom, e.paint);
+                        return;
+                    }
+
+                    canvas.drawRect(lastX, top, nextX, bottom, e.paint);
+                    nextX = lastX;
                 }
-
-                final float nextX = lastX + entryWidth;
-                if (nextX > right) {
-                    canvas.drawRect(lastX, top, right, bottom, e.paint);
-                    return;
-                }
-
-                canvas.drawRect(lastX, top, nextX, bottom, e.paint);
-                lastX = nextX;
             }
-        }
 
-        canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
+            canvas.drawRect(left, top, nextX, bottom, mEmptyPaint);
+        } else {
+            float lastX = left;
+
+            if (mEntries != null) {
+                for (final Entry e : mEntries) {
+                    final float entryWidth;
+                    if (e.percentage == 0.0f) {
+                        entryWidth = 0.0f;
+                    } else {
+                        entryWidth = Math.max(mMinTickWidth, width * e.percentage);
+                    }
+
+                    final float nextX = lastX + entryWidth;
+                    if (nextX > right) {
+                        canvas.drawRect(lastX, top, right, bottom, e.paint);
+                        return;
+                    }
+
+                    canvas.drawRect(lastX, top, nextX, bottom, e.paint);
+                    lastX = nextX;
+                }
+            }
+
+            canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
+        }
     }
 
     /**
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
new file mode 100644
index 0000000..6a76a86
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RectShape;
+import android.preference.Preference;
+
+import com.android.settings.R;
+
+public class StorageItemPreference extends Preference {
+
+    private int mColor = Color.MAGENTA;
+
+    public StorageItemPreference(Context context, String key, int titleRes, int colorRes) {
+        this(context, key, context.getText(titleRes), colorRes);
+    }
+
+    public StorageItemPreference(Context context, String key, CharSequence title, int colorRes) {
+        super(context);
+        //setLayoutResource(R.layout.app_percentage_item);
+
+        if (colorRes != 0) {
+            mColor = context.getResources().getColor(colorRes);
+
+            final Resources res = context.getResources();
+            final int width = res.getDimensionPixelSize(R.dimen.device_memory_usage_button_width);
+            final int height = res.getDimensionPixelSize(R.dimen.device_memory_usage_button_height);
+            setIcon(createRectShape(width, height, mColor));
+        }
+
+        setKey(key);
+        setTitle(title);
+        setSummary(R.string.memory_calculating_size);
+    }
+
+    private static ShapeDrawable createRectShape(int width, int height, int color) {
+        ShapeDrawable shape = new ShapeDrawable(new RectShape());
+        shape.setIntrinsicHeight(height);
+        shape.setIntrinsicWidth(width);
+        shape.getPaint().setColor(color);
+        return shape;
+    }
+
+    public int getColor() {
+        return mColor;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageMeasurement.java b/src/com/android/settings/deviceinfo/StorageMeasurement.java
index 2792d09..ccdd600 100644
--- a/src/com/android/settings/deviceinfo/StorageMeasurement.java
+++ b/src/com/android/settings/deviceinfo/StorageMeasurement.java
@@ -32,18 +32,21 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.os.storage.StorageVolume;
 import android.util.Log;
+import android.util.Pair;
 
 import com.android.internal.app.IMediaContainerService;
+import com.android.internal.util.Preconditions;
+import com.google.android.collect.Maps;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Measure the memory for various systems.
@@ -86,9 +89,8 @@
 
     private final MeasurementHandler mHandler;
 
-    private static Map<StorageVolume, StorageMeasurement> sInstances =
-        new ConcurrentHashMap<StorageVolume, StorageMeasurement>();
-    private static StorageMeasurement sInternalInstance;
+    private static HashMap<Pair<StorageVolume, UserHandle>, StorageMeasurement>
+            sInstances = Maps.newHashMap();
 
     private volatile WeakReference<MeasurementReceiver> mReceiver;
 
@@ -99,19 +101,24 @@
     private long mMiscSize;
     private long[] mMediaSizes = new long[StorageVolumePreferenceCategory.sMediaCategories.length];
 
-    final private StorageVolume mStorageVolume;
-    final private boolean mIsPrimary;
-    final private boolean mIsInternal;
+    private final StorageVolume mStorageVolume;
+    private final UserHandle mUser;
+    private final boolean mIsPrimary;
+    private final boolean mIsInternal;
+
+    private boolean mIncludeAppCodeSize = true;
 
     List<FileInfo> mFileInfoForMisc;
 
     public interface MeasurementReceiver {
-        public void updateApproximate(Bundle bundle);
-        public void updateExact(Bundle bundle);
+        public void updateApproximate(StorageMeasurement meas, Bundle bundle);
+        public void updateExact(StorageMeasurement meas, Bundle bundle);
     }
 
-    private StorageMeasurement(Context context, StorageVolume storageVolume, boolean isPrimary) {
+    private StorageMeasurement(
+            Context context, StorageVolume storageVolume, UserHandle user, boolean isPrimary) {
         mStorageVolume = storageVolume;
+        mUser = Preconditions.checkNotNull(user);
         mIsInternal = storageVolume == null;
         mIsPrimary = !mIsInternal && isPrimary;
 
@@ -121,29 +128,33 @@
         mHandler = new MeasurementHandler(context, handlerThread.getLooper());
     }
 
+    public void setIncludeAppCodeSize(boolean include) {
+        mIncludeAppCodeSize = include;
+    }
+
     /**
      * Get the singleton of the StorageMeasurement class. The application
      * context is used to avoid leaking activities.
      * @param storageVolume The {@link StorageVolume} that will be measured
      * @param isPrimary true when this storage volume is the primary volume
      */
-    public static StorageMeasurement getInstance(Context context, StorageVolume storageVolume,
-            boolean isPrimary) {
-        if (storageVolume == null) {
-            if (sInternalInstance == null) {
-                sInternalInstance =
-                    new StorageMeasurement(context.getApplicationContext(), storageVolume, isPrimary);
+    public static StorageMeasurement getInstance(
+            Context context, StorageVolume storageVolume, UserHandle user, boolean isPrimary) {
+        final Pair<StorageVolume, UserHandle> key = new Pair<StorageVolume, UserHandle>(
+                storageVolume, user);
+        synchronized (sInstances) {
+            StorageMeasurement value = sInstances.get(key);
+            if (value == null) {
+                value = new StorageMeasurement(
+                        context.getApplicationContext(), storageVolume, user, isPrimary);
+                sInstances.put(key, value);
             }
-            return sInternalInstance;
+            return value;
         }
-        if (sInstances.containsKey(storageVolume)) {
-            return sInstances.get(storageVolume);
-        } else {
-            StorageMeasurement storageMeasurement =
-                new StorageMeasurement(context.getApplicationContext(), storageVolume, isPrimary);
-            sInstances.put(storageVolume, storageMeasurement);
-            return storageMeasurement;
-        }
+    }
+
+    public UserHandle getUser() {
+        return mUser;
     }
 
     public void setReceiver(MeasurementReceiver receiver) {
@@ -178,7 +189,7 @@
         bundle.putLong(TOTAL_SIZE, mTotalSize);
         bundle.putLong(AVAIL_SIZE, mAvailSize);
 
-        receiver.updateApproximate(bundle);
+        receiver.updateApproximate(this, bundle);
     }
 
     private void sendExactUpdate() {
@@ -198,7 +209,7 @@
         bundle.putLong(MISC_SIZE, mMiscSize);
         bundle.putLongArray(MEDIA_SIZES, mMediaSizes);
 
-        receiver.updateExact(bundle);
+        receiver.updateExact(this, bundle);
     }
 
     private class MeasurementHandler extends Handler {
@@ -265,7 +276,7 @@
                         } else {
                             Intent service = new Intent().setComponent(DEFAULT_CONTAINER_COMPONENT);
                             context.bindService(service, mDefContainerConn,
-                                    Context.BIND_AUTO_CREATE);
+                                    Context.BIND_AUTO_CREATE, mUser.getIdentifier());
                         }
                     }
                     break;
@@ -327,13 +338,19 @@
 
                 if (succeeded) {
                     if (mIsInternal) {
-                        mAppsSizeForThisStatsObserver += stats.codeSize + stats.dataSize;
+                        if (mIncludeAppCodeSize) {
+                            mAppsSizeForThisStatsObserver += stats.codeSize;
+                        }
+                        mAppsSizeForThisStatsObserver += stats.dataSize;
                     } else if (!Environment.isExternalStorageEmulated()) {
                         mAppsSizeForThisStatsObserver += stats.externalObbSize +
                                 stats.externalCodeSize + stats.externalDataSize +
                                 stats.externalCacheSize + stats.externalMediaSize;
                     } else {
-                        mAppsSizeForThisStatsObserver += stats.codeSize + stats.dataSize +
+                        if (mIncludeAppCodeSize) {
+                            mAppsSizeForThisStatsObserver += stats.codeSize;
+                        }
+                        mAppsSizeForThisStatsObserver += stats.dataSize +
                                 stats.externalCodeSize + stats.externalDataSize +
                                 stats.externalCacheSize + stats.externalMediaSize +
                                 stats.externalObbSize;
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
index 156184a..cb4d1c0 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -16,20 +16,22 @@
 
 package com.android.settings.deviceinfo;
 
+import android.app.ActivityManagerNative;
 import android.app.ActivityThread;
 import android.app.DownloadManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.IPackageManager;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.RectShape;
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
 import android.preference.Preference;
@@ -38,69 +40,55 @@
 
 import com.android.settings.R;
 import com.android.settings.deviceinfo.StorageMeasurement.MeasurementReceiver;
+import com.google.android.collect.Lists;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
-public class StorageVolumePreferenceCategory extends PreferenceCategory implements
-        MeasurementReceiver {
+public class StorageVolumePreferenceCategory extends PreferenceCategory
+        implements MeasurementReceiver {
+    private static final String KEY_TOTAL_SIZE = "total_size";
+    private static final String KEY_APPLICATIONS = "applications";
+    private static final String KEY_DCIM = "dcim"; // Pictures and Videos
+    private static final String KEY_MUSIC = "music";
+    private static final String KEY_DOWNLOADS = "downloads";
+    private static final String KEY_MISC = "misc";
+    private static final String KEY_AVAILABLE = "available";
+    private static final String KEY_USER_PREFIX = "user";
 
-    static final int TOTAL_SIZE = 0;
-    static final int APPLICATIONS = 1;
-    static final int DCIM = 2; // Pictures and Videos
-    static final int MUSIC = 3;
-    static final int DOWNLOADS = 4;
-    static final int MISC = 5;
-    static final int AVAILABLE = 6;
+    private static final int ORDER_USAGE_BAR = -2;
+    private static final int ORDER_STORAGE_LOW = -1;
 
     private UsageBarPreference mUsageBarPreference;
-    private Preference[] mPreferences;
     private Preference mMountTogglePreference;
     private Preference mFormatPreference;
     private Preference mStorageLow;
-    private int[] mColors;
 
-    private Resources mResources;
+    private final Resources mResources;
 
-    private StorageVolume mStorageVolume;
+    private final StorageVolume mStorageVolume;
+    private final StorageManager mStorageManager;
 
-    private StorageManager mStorageManager = null;
-
-    private StorageMeasurement mMeasurement;
+    /** Measurement for local user. */
+    private StorageMeasurement mLocalMeasure;
+    /** All used measurements, including other users. */
+    private List<StorageMeasurement> mAllMeasures = Lists.newArrayList();
 
     private boolean mAllowFormat;
+    private final boolean mMeasureUsers;
 
     private boolean mUsbConnected;
     private String mUsbFunction;
-
-    static class CategoryInfo {
-        final int mTitle;
-        final int mColor;
-
-        public CategoryInfo(int title, int color) {
-            mTitle = title;
-            mColor = color;
-        }
-    }
-
-    static final CategoryInfo[] sCategoryInfos = new CategoryInfo[] {
-        new CategoryInfo(R.string.memory_size, 0),
-        new CategoryInfo(R.string.memory_apps_usage, R.color.memory_apps_usage),
-        new CategoryInfo(R.string.memory_dcim_usage, R.color.memory_dcim),
-        new CategoryInfo(R.string.memory_music_usage, R.color.memory_music),
-        new CategoryInfo(R.string.memory_downloads_usage, R.color.memory_downloads),
-        new CategoryInfo(R.string.memory_media_misc_usage, R.color.memory_misc),
-        new CategoryInfo(R.string.memory_available, R.color.memory_avail),
-    };
+    private boolean mShowingApprox;
 
     public static final Set<String> sPathsExcludedForMisc = new HashSet<String>();
 
     static class MediaCategory {
         final String[] mDirPaths;
-        final int mCategory;
-        //final int mMediaType;
+        final String mCategory;
 
-        public MediaCategory(int category, String... directories) {
+        public MediaCategory(String category, String... directories) {
             mCategory = category;
             final int length = directories.length;
             mDirPaths = new String[length];
@@ -115,9 +103,9 @@
     }
 
     static final MediaCategory[] sMediaCategories = new MediaCategory[] {
-        new MediaCategory(DCIM, Environment.DIRECTORY_DCIM, Environment.DIRECTORY_MOVIES,
+        new MediaCategory(KEY_DCIM, Environment.DIRECTORY_DCIM, Environment.DIRECTORY_MOVIES,
                 Environment.DIRECTORY_PICTURES),
-        new MediaCategory(MUSIC, Environment.DIRECTORY_MUSIC, Environment.DIRECTORY_ALARMS,
+        new MediaCategory(KEY_MUSIC, Environment.DIRECTORY_MUSIC, Environment.DIRECTORY_ALARMS,
                 Environment.DIRECTORY_NOTIFICATIONS, Environment.DIRECTORY_RINGTONES,
                 Environment.DIRECTORY_PODCASTS)
     };
@@ -142,22 +130,36 @@
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case MSG_UI_UPDATE_APPROXIMATE: {
-                    Bundle bundle = msg.getData();
+                    final UserHandle user = (UserHandle) msg.obj;
+                    final Bundle bundle = msg.getData();
                     final long totalSize = bundle.getLong(StorageMeasurement.TOTAL_SIZE);
                     final long availSize = bundle.getLong(StorageMeasurement.AVAIL_SIZE);
-                    updateApproximate(totalSize, availSize);
+
+                    if (user.getIdentifier() == UserHandle.USER_CURRENT) {
+                        updateApproximate(totalSize, availSize);
+                    }
                     break;
                 }
                 case MSG_UI_UPDATE_EXACT: {
-                    Bundle bundle = msg.getData();
+                    final UserHandle user = (UserHandle) msg.obj;
+                    final Bundle bundle = msg.getData();
                     final long totalSize = bundle.getLong(StorageMeasurement.TOTAL_SIZE);
                     final long availSize = bundle.getLong(StorageMeasurement.AVAIL_SIZE);
                     final long appsUsed = bundle.getLong(StorageMeasurement.APPS_USED);
                     final long downloadsSize = bundle.getLong(StorageMeasurement.DOWNLOADS_SIZE);
                     final long miscSize = bundle.getLong(StorageMeasurement.MISC_SIZE);
                     final long[] mediaSizes = bundle.getLongArray(StorageMeasurement.MEDIA_SIZES);
-                    updateExact(totalSize, availSize, appsUsed, downloadsSize, miscSize,
-                            mediaSizes);
+
+                    if (user.getIdentifier() == UserHandle.USER_CURRENT) {
+                        updateExact(totalSize, availSize, appsUsed, downloadsSize, miscSize,
+                                mediaSizes);
+                    } else {
+                        long usedSize = appsUsed + downloadsSize + miscSize;
+                        for (long mediaSize : mediaSizes) {
+                            usedSize += mediaSize;
+                        }
+                        updateUserExact(user, totalSize, usedSize);
+                    }
                     break;
                 }
             }
@@ -172,54 +174,97 @@
         mStorageManager = storageManager;
         setTitle(storageVolume != null ? storageVolume.getDescription(context)
                 : resources.getText(R.string.internal_storage));
-        mMeasurement = StorageMeasurement.getInstance(context, storageVolume, isPrimary);
-        mMeasurement.setReceiver(this);
+        mLocalMeasure = StorageMeasurement.getInstance(
+                context, storageVolume, new UserHandle(UserHandle.USER_CURRENT), isPrimary);
+        mAllMeasures.add(mLocalMeasure);
 
         // Cannot format emulated storage
         mAllowFormat = mStorageVolume != null && !mStorageVolume.isEmulated();
         // For now we are disabling reformatting secondary external storage
         // until some interoperability problems with MTP are fixed
         if (!isPrimary) mAllowFormat = false;
+
+        // Measure other users when showing primary emulated storage
+        mMeasureUsers = (mStorageVolume != null && mStorageVolume.isEmulated()) && isPrimary;
+    }
+
+    private void addStorageItem(String key, int titleRes, int colorRes) {
+        addPreference(new StorageItemPreference(getContext(), key, titleRes, colorRes));
+    }
+
+    private static String buildUserKey(UserHandle user) {
+        return KEY_USER_PREFIX + user.getIdentifier();
     }
 
     public void init() {
-        mUsageBarPreference = new UsageBarPreference(getContext());
+        final Context context = getContext();
 
-        final int width = (int) mResources.getDimension(R.dimen.device_memory_usage_button_width);
-        final int height = (int) mResources.getDimension(R.dimen.device_memory_usage_button_height);
+        mUsageBarPreference = new UsageBarPreference(context);
+        mUsageBarPreference.setOrder(ORDER_USAGE_BAR);
+        addPreference(mUsageBarPreference);
 
-        final int numberOfCategories = sCategoryInfos.length;
-        mPreferences = new Preference[numberOfCategories];
-        mColors = new int[numberOfCategories];
-        for (int i = 0; i < numberOfCategories; i++) {
-            final Preference preference = new Preference(getContext());
-            mPreferences[i] = preference;
-            preference.setTitle(sCategoryInfos[i].mTitle);
-            preference.setSummary(R.string.memory_calculating_size);
-            if (i != TOTAL_SIZE) {
-                // TOTAL_SIZE has no associated color
-                mColors[i] = mResources.getColor(sCategoryInfos[i].mColor);
-                preference.setIcon(createRectShape(width, height, mColors[i]));
+        addStorageItem(KEY_TOTAL_SIZE, R.string.memory_size, 0);
+        addStorageItem(KEY_APPLICATIONS, R.string.memory_apps_usage, R.color.memory_apps_usage);
+        addStorageItem(KEY_DCIM, R.string.memory_dcim_usage, R.color.memory_dcim);
+        addStorageItem(KEY_MUSIC, R.string.memory_music_usage, R.color.memory_music);
+        addStorageItem(KEY_DOWNLOADS, R.string.memory_downloads_usage, R.color.memory_downloads);
+        addStorageItem(KEY_MISC, R.string.memory_media_misc_usage, R.color.memory_misc);
+        addStorageItem(KEY_AVAILABLE, R.string.memory_available, R.color.memory_avail);
+
+        if (mMeasureUsers) {
+            final UserManager userManager = (UserManager) context.getSystemService(
+                    Context.USER_SERVICE);
+
+            final UserInfo currentUser;
+            try {
+                currentUser = ActivityManagerNative.getDefault().getCurrentUser();
+            } catch (RemoteException e) {
+                throw new RuntimeException("Failed to get current user");
+            }
+
+            int count = 0;
+            for (UserInfo info : userManager.getUsers()) {
+                // Only measure other users
+                if (info.id == currentUser.id) {
+                    continue;
+                }
+
+                final UserHandle user = new UserHandle(info.id);
+                final String key = buildUserKey(user);
+
+                final StorageMeasurement measure = StorageMeasurement.getInstance(
+                        context, mStorageVolume, user, true);
+                measure.setIncludeAppCodeSize(false);
+                mAllMeasures.add(measure);
+
+                final int colorRes = count++ % 2 == 0 ? R.color.memory_user_light
+                        : R.color.memory_user_dark;
+                addPreference(new StorageItemPreference(getContext(), key, info.name, colorRes));
             }
         }
 
-        mMountTogglePreference = new Preference(getContext());
+        mMountTogglePreference = new Preference(context);
         mMountTogglePreference.setTitle(R.string.sd_eject);
         mMountTogglePreference.setSummary(R.string.sd_eject_summary);
+        addPreference(mMountTogglePreference);
 
         if (mAllowFormat) {
-            mFormatPreference = new Preference(getContext());
+            mFormatPreference = new Preference(context);
             mFormatPreference.setTitle(R.string.sd_format);
             mFormatPreference.setSummary(R.string.sd_format_summary);
+            addPreference(mFormatPreference);
         }
 
         final IPackageManager pm = ActivityThread.getPackageManager();
         try {
             if (pm.isStorageLow()) {
-                mStorageLow = new Preference(getContext());
+                mStorageLow = new Preference(context);
+                mStorageLow.setOrder(ORDER_STORAGE_LOW);
                 mStorageLow.setTitle(R.string.storage_low_title);
                 mStorageLow.setSummary(R.string.storage_low_summary);
-            } else {
+                addPreference(mStorageLow);
+            } else if (mStorageLow != null) {
+                removePreference(mStorageLow);
                 mStorageLow = null;
             }
         } catch (RemoteException e) {
@@ -230,39 +275,8 @@
         return mStorageVolume;
     }
 
-    /**
-     * Successive mounts can change the list of visible preferences.
-     * This makes sure all preferences are visible and displayed in the right order.
-     */
-    private void resetPreferences() {
-        final int numberOfCategories = sCategoryInfos.length;
-
-        removePreference(mUsageBarPreference);
-        for (int i = 0; i < numberOfCategories; i++) {
-            removePreference(mPreferences[i]);
-        }
-        removePreference(mMountTogglePreference);
-        if (mFormatPreference != null) {
-            removePreference(mFormatPreference);
-        }
-
-        addPreference(mUsageBarPreference);
-        if (mStorageLow != null) {
-            addPreference(mStorageLow);
-        }
-        for (int i = 0; i < numberOfCategories; i++) {
-            addPreference(mPreferences[i]);
-        }
-        addPreference(mMountTogglePreference);
-        if (mFormatPreference != null) {
-            addPreference(mFormatPreference);
-        }
-
-        mMountTogglePreference.setEnabled(true);
-    }
-
     private void updatePreferencesFromState() {
-        resetPreferences();
+        mMountTogglePreference.setEnabled(true);
 
         String state = mStorageVolume != null
                 ? mStorageManager.getVolumeState(mStorageVolume.getPath())
@@ -285,7 +299,8 @@
         }
 
         if (Environment.MEDIA_MOUNTED.equals(state)) {
-            mPreferences[AVAILABLE].setSummary(mPreferences[AVAILABLE].getSummary() + readOnly);
+            final Preference pref = findPreference(KEY_AVAILABLE);
+            pref.setSummary(pref.getSummary() + readOnly);
 
             mMountTogglePreference.setEnabled(true);
             mMountTogglePreference.setTitle(mResources.getString(R.string.sd_eject));
@@ -303,8 +318,8 @@
             }
 
             removePreference(mUsageBarPreference);
-            removePreference(mPreferences[TOTAL_SIZE]);
-            removePreference(mPreferences[AVAILABLE]);
+            removePreference(findPreference(KEY_TOTAL_SIZE));
+            removePreference(findPreference(KEY_AVAILABLE));
             if (mFormatPreference != null) {
                 removePreference(mFormatPreference);
             }
@@ -329,67 +344,98 @@
     }
 
     public void updateApproximate(long totalSize, long availSize) {
-        mPreferences[TOTAL_SIZE].setSummary(formatSize(totalSize));
-        mPreferences[AVAILABLE].setSummary(formatSize(availSize));
+        findPreference(KEY_TOTAL_SIZE).setSummary(formatSize(totalSize));
+        findPreference(KEY_AVAILABLE).setSummary(formatSize(availSize));
 
         final long usedSize = totalSize - availSize;
 
         mUsageBarPreference.clear();
         mUsageBarPreference.addEntry(usedSize / (float) totalSize, android.graphics.Color.GRAY);
         mUsageBarPreference.commit();
+        mShowingApprox = true;
 
         updatePreferencesFromState();
     }
 
     public void updateExact(long totalSize, long availSize, long appsSize, long downloadsSize,
             long miscSize, long[] mediaSizes) {
-        mUsageBarPreference.clear();
+        if (mShowingApprox) {
+            mUsageBarPreference.clear();
+            mShowingApprox = false;
+        }
 
-        mPreferences[TOTAL_SIZE].setSummary(formatSize(totalSize));
+        findPreference(KEY_TOTAL_SIZE).setSummary(formatSize(totalSize));
 
-        if (mMeasurement.isExternalSDCard()) {
+        if (mLocalMeasure.isExternalSDCard()) {
             // TODO FIXME: external SD card will not report any size. Show used space in bar graph
             final long usedSize = totalSize - availSize;
             mUsageBarPreference.addEntry(usedSize / (float) totalSize, android.graphics.Color.GRAY);
         }
 
-        updatePreference(appsSize, totalSize, APPLICATIONS);
+        updatePreference(appsSize, totalSize, KEY_APPLICATIONS);
 
         long totalMediaSize = 0;
         for (int i = 0; i < sMediaCategories.length; i++) {
-            final int category = sMediaCategories[i].mCategory;
+            final String category = sMediaCategories[i].mCategory;
             final long size = mediaSizes[i];
             updatePreference(size, totalSize, category);
             totalMediaSize += size;
         }
 
-        updatePreference(downloadsSize, totalSize, DOWNLOADS);
+        updatePreference(downloadsSize, totalSize, KEY_DOWNLOADS);
 
         // Note miscSize != totalSize - availSize - appsSize - downloadsSize - totalMediaSize
         // Block size is taken into account. That can be extra space from folders. TODO Investigate
-        updatePreference(miscSize, totalSize, MISC);
+        updatePreference(miscSize, totalSize, KEY_MISC);
 
-        updatePreference(availSize, totalSize, AVAILABLE);
+        updatePreference(availSize, totalSize, KEY_AVAILABLE, false);
 
         mUsageBarPreference.commit();
     }
 
-    private void updatePreference(long size, long totalSize, int category) {
-        if (size > 0) {
-            mPreferences[category].setSummary(formatSize(size));
-            mUsageBarPreference.addEntry(size / (float) totalSize, mColors[category]);
-        } else {
-            removePreference(mPreferences[category]);
+    public void updateUserExact(UserHandle user, long totalSize, long usedSize) {
+        if (mShowingApprox) {
+            mUsageBarPreference.clear();
+            mShowingApprox = false;
+        }
+
+        final String key = buildUserKey(user);
+
+        findPreference(key).setSummary(formatSize(usedSize));
+        updatePreference(usedSize, totalSize, key);
+
+        mUsageBarPreference.commit();
+    }
+
+    private void updatePreference(long size, long totalSize, String category) {
+        updatePreference(size, totalSize, category, true);
+    }
+
+    private void updatePreference(long size, long totalSize, String category, boolean showBar) {
+        final StorageItemPreference pref = (StorageItemPreference) findPreference(category);
+        if (pref != null) {
+            if (size > 0) {
+                pref.setSummary(formatSize(size));
+                if (showBar) {
+                    mUsageBarPreference.addEntry(size / (float) totalSize, pref.getColor());
+                }
+            } else {
+                removePreference(pref);
+            }
         }
     }
 
     private void measure() {
-        mMeasurement.invalidate();
-        mMeasurement.measure();
+        for (StorageMeasurement measure : mAllMeasures) {
+            measure.invalidate();
+            measure.measure();
+        }
     }
 
     public void onResume() {
-        mMeasurement.setReceiver(this);
+        for (StorageMeasurement measure : mAllMeasures) {
+            measure.setReceiver(this);
+        }
         measure();
     }
 
@@ -407,15 +453,9 @@
     }
 
     public void onPause() {
-        mMeasurement.cleanUp();
-    }
-
-    private static ShapeDrawable createRectShape(int width, int height, int color) {
-        ShapeDrawable shape = new ShapeDrawable(new RectShape());
-        shape.setIntrinsicHeight(height);
-        shape.setIntrinsicWidth(width);
-        shape.getPaint().setColor(color);
-        return shape;
+        for (StorageMeasurement measure : mAllMeasures) {
+            measure.cleanUp();
+        }
     }
 
     private String formatSize(long size) {
@@ -423,15 +463,17 @@
     }
 
     @Override
-    public void updateApproximate(Bundle bundle) {
+    public void updateApproximate(StorageMeasurement meas, Bundle bundle) {
         final Message message = mUpdateHandler.obtainMessage(MSG_UI_UPDATE_APPROXIMATE);
+        message.obj = meas.getUser();
         message.setData(bundle);
         mUpdateHandler.sendMessage(message);
     }
 
     @Override
-    public void updateExact(Bundle bundle) {
+    public void updateExact(StorageMeasurement meas, Bundle bundle) {
         final Message message = mUpdateHandler.obtainMessage(MSG_UI_UPDATE_EXACT);
+        message.obj = meas.getUser();
         message.setData(bundle);
         mUpdateHandler.sendMessage(message);
     }
@@ -440,34 +482,35 @@
         return preference == mMountTogglePreference;
     }
 
-    public Intent intentForClick(Preference preference) {
+    public Intent intentForClick(Preference pref) {
         Intent intent = null;
 
         // TODO The current "delete" story is not fully handled by the respective applications.
         // When it is done, make sure the intent types below are correct.
         // If that cannot be done, remove these intents.
-        if (preference == mFormatPreference) {
+        final String key = pref.getKey();
+        if (pref == mFormatPreference) {
             intent = new Intent(Intent.ACTION_VIEW);
             intent.setClass(getContext(), com.android.settings.MediaFormat.class);
             intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mStorageVolume);
-        } else if (preference == mPreferences[APPLICATIONS]) {
+        } else if (KEY_APPLICATIONS.equals(key)) {
             intent = new Intent(Intent.ACTION_MANAGE_PACKAGE_STORAGE);
             intent.setClass(getContext(),
                     com.android.settings.Settings.ManageApplicationsActivity.class);
-        } else if (preference == mPreferences[DOWNLOADS]) {
+        } else if (KEY_DOWNLOADS.equals(key)) {
             intent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).putExtra(
                     DownloadManager.INTENT_EXTRAS_SORT_BY_SIZE, true);
-        } else if (preference == mPreferences[MUSIC]) {
+        } else if (KEY_MUSIC.equals(key)) {
             intent = new Intent(Intent.ACTION_GET_CONTENT);
             intent.setType("audio/mp3");
-        } else if (preference == mPreferences[DCIM]) {
+        } else if (KEY_DCIM.equals(key)) {
             intent = new Intent(Intent.ACTION_VIEW);
             intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
             // TODO Create a Videos category, type = vnd.android.cursor.dir/video
             intent.setType("vnd.android.cursor.dir/image");
-        } else if (preference == mPreferences[MISC]) {
+        } else if (KEY_MISC.equals(key)) {
             Context context = getContext().getApplicationContext();
-            if (mMeasurement.getMiscSize() > 0) {
+            if (mLocalMeasure.getMiscSize() > 0) {
                 intent = new Intent(context, MiscFilesHandler.class);
                 intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mStorageVolume);
             }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index fa2b02d..ab2c891 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -436,6 +436,7 @@
         final int NU = uidStats.size();
         for (int iu = 0; iu < NU; iu++) {
             Uid u = uidStats.valueAt(iu);
+            double p;
             double power = 0;
             double highestDrain = 0;
             String packageWithHighestDrain = null;
@@ -445,11 +446,11 @@
             long cpuFgTime = 0;
             long wakelockTime = 0;
             long gpsTime = 0;
+            if (DEBUG) Log.i(TAG, "UID " + u.getUid());
             if (processStats.size() > 0) {
                 // Process CPU time
                 for (Map.Entry<String, ? extends BatteryStats.Uid.Proc> ent
                         : processStats.entrySet()) {
-                    if (DEBUG) Log.i(TAG, "Process name = " + ent.getKey());
                     Uid.Proc ps = ent.getValue();
                     final long userTime = ps.getUserTime(which);
                     final long systemTime = ps.getSystemTime(which);
@@ -470,6 +471,10 @@
                         processPower += ratio * tmpCpuTime * powerCpuNormal[step];
                     }
                     cpuTime += tmpCpuTime;
+                    if (DEBUG && processPower != 0) {
+                        Log.i(TAG, String.format("process %s, cpu power=%.2f",
+                                ent.getKey(), processPower / 1000));
+                    }
                     power += processPower;
                     if (packageWithHighestDrain == null
                             || packageWithHighestDrain.startsWith("*")) {
@@ -481,8 +486,6 @@
                         packageWithHighestDrain = ent.getKey();
                     }
                 }
-                if (DEBUG) Log.i(TAG, "Max drain of " + highestDrain 
-                        + " by " + packageWithHighestDrain);
             }
             if (cpuFgTime > cpuTime) {
                 if (DEBUG && cpuFgTime > cpuTime + 10000) {
@@ -491,6 +494,7 @@
                 cpuTime = cpuFgTime; // Statistics may not have been gathered yet.
             }
             power /= 1000;
+            if (DEBUG && power != 0) Log.i(TAG, String.format("total cpu power=%.2f", power));
 
             // Process wake lock usage
             Map<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats = u.getWakelockStats();
@@ -508,19 +512,32 @@
             appWakelockTime += wakelockTime;
 
             // Add cost of holding a wake lock
-            power += (wakelockTime
+            p = (wakelockTime
                     * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wakelock power=%.2f", p));
             
             // Add cost of data traffic
             long tcpBytesReceived = u.getTcpBytesReceived(mStatsType);
             long tcpBytesSent = u.getTcpBytesSent(mStatsType);
-            power += (tcpBytesReceived+tcpBytesSent) * averageCostPerByte;
+            p = (tcpBytesReceived+tcpBytesSent) * averageCostPerByte;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("tcp power=%.2f", p));
 
             // Add cost of keeping WIFI running.
             long wifiRunningTimeMs = u.getWifiRunningTime(uSecTime, which) / 1000;
             mAppWifiRunning += wifiRunningTimeMs;
-            power += (wifiRunningTimeMs
+            p = (wifiRunningTimeMs
                     * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi running power=%.2f", p));
+
+            // Add cost of WIFI scans
+            long wifiScanTimeMs = u.getWifiScanTime(uSecTime, which) / 1000;
+            p = (wifiScanTimeMs
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_SCAN)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi scanning power=%.2f", p));
 
             // Process Sensor usage
             Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();
@@ -541,16 +558,16 @@
                                 sensorManager.getDefaultSensor(sensorType);
                         if (sensorData != null) {
                             multiplier = sensorData.getPower();
-                            if (DEBUG) {
-                                Log.i(TAG, "Got sensor " + sensorData.getName() + " with power = "
-                                        + multiplier);
-                            }
                         }
                 }
-                power += (multiplier * sensorTime) / 1000;
+                p = (multiplier * sensorTime) / 1000;
+                power += p;
+                if (DEBUG && p != 0) {
+                    Log.i(TAG, String.format("sensor %s power=%.2f", sensor.toString(), p));
+                }
             }
 
-            if (DEBUG) Log.i(TAG, "UID " + u.getUid() + ": power=" + power);
+            if (DEBUG) Log.i(TAG, String.format("UID %d total power=%.2f", u.getUid(), power));
 
             // Add the app to the list if it is consuming power
             if (power != 0 || u.getUid() == 0) {
@@ -583,7 +600,6 @@
                 if (power > mMaxPower) mMaxPower = power;
                 mTotalPower += power;
             }
-            if (DEBUG) Log.i(TAG, "Added power = " + power);
         }
 
         // The device has probably been awake for longer than the screen on
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index a6bd037..bf02c13 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -58,7 +58,7 @@
                 activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(
                         ActionBar.LayoutParams.WRAP_CONTENT,
                         ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                        Gravity.CENTER_VERTICAL | Gravity.END));
                 activity.getActionBar().setTitle(R.string.android_beam_settings_title);
             }
         }
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 603d028..6718ab0 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -149,14 +149,6 @@
         }
     }
 
-    @Override
-    public void onPause() {
-        super.onPause();
-        if ((mDefaultRatePref != null) && (mDefaultRatePref.getDialog() != null)) {
-            mDefaultRatePref.getDialog().dismiss();
-        }
-    }
-
     private void initSettings() {
         final ContentResolver resolver = getContentResolver();
 
@@ -288,6 +280,7 @@
         }
     }
 
+    @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         if (KEY_DEFAULT_RATE.equals(preference.getKey())) {
             // Default rate
@@ -309,6 +302,7 @@
     /**
      * Called when mPlayExample is clicked
      */
+    @Override
     public boolean onPreferenceClick(Preference preference) {
         if (preference == mPlayExample) {
             // Get the sample text from the TTS engine; onActivityResult will do
@@ -335,6 +329,7 @@
         builder.setCancelable(true);
         builder.setPositiveButton(android.R.string.ok,
                 new DialogInterface.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int which) {
                        updateDefaultEngine(key);
                     }
diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java
index 196882f..3d612f0 100644
--- a/src/com/android/settings/tts/TtsEnginePreference.java
+++ b/src/com/android/settings/tts/TtsEnginePreference.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.tts;
 
-import com.android.settings.R;
-
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -31,6 +29,9 @@
 import android.widget.RadioButton;
 
 
+import com.android.settings.R;
+
+
 public class TtsEnginePreference extends Preference {
 
     /**
@@ -173,7 +174,8 @@
     }
 
     private void onRadioButtonClicked(CompoundButton buttonView, boolean isChecked) {
-        if (mPreventRadioButtonCallbacks) {
+        if (mPreventRadioButtonCallbacks ||
+                (mSharedState.getCurrentChecked() == buttonView)) {
             return;
         }
 
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index fcc2f2e..0c98819 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -16,11 +16,11 @@
 
 package com.android.settings.tts;
 
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
 import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -31,8 +31,15 @@
 import android.speech.tts.TtsEngines;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Pair;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Locale;
 
 
@@ -45,11 +52,14 @@
     private static final String KEY_ENGINE_SETTINGS = "tts_engine_settings";
     private static final String KEY_INSTALL_DATA = "tts_install_data";
 
+    private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;
+
     private TtsEngines mEnginesHelper;
     private ListPreference mLocalePreference;
     private Preference mEngineSettingsPreference;
     private Preference mInstallVoicesPreference;
     private Intent mEngineSettingsIntent;
+    private Intent mVoiceDataDetails;
 
     private TextToSpeech mTts;
 
@@ -63,13 +73,22 @@
                     @Override
                     public void run() {
                         mLocalePreference.setEnabled(true);
-                        updateVoiceDetails();
                     }
                 });
             }
         }
     };
 
+    private final BroadcastReceiver mLanguagesChangedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            // Installed or uninstalled some data packs
+            if (TextToSpeech.Engine.ACTION_TTS_DATA_INSTALLED.equals(intent.getAction())) {
+                checkTtsData();
+            }
+        }
+    };
+
     public TtsEngineSettingsFragment() {
         super();
     }
@@ -89,7 +108,8 @@
         mInstallVoicesPreference.setOnPreferenceClickListener(this);
         // Remove this preference unless voices are indeed available to install.
         root.removePreference(mInstallVoicesPreference);
-
+        // Remove this preference unless locales are indeed available.
+        root.removePreference(mLocalePreference);
 
         root.setTitle(getEngineLabel());
         root.setKey(getEngineName());
@@ -103,30 +123,60 @@
         mInstallVoicesPreference.setEnabled(false);
 
         mLocalePreference.setEnabled(false);
+        mLocalePreference.setEntries(new CharSequence[0]);
+        mLocalePreference.setEntryValues(new CharSequence[0]);
+
+        mVoiceDataDetails = getArguments().getParcelable(TtsEnginePreference.FRAGMENT_ARGS_VOICES);
+
         mTts = new TextToSpeech(getActivity().getApplicationContext(), mTtsInitListener,
                 getEngineName());
+
+
+        // Check if data packs changed
+        checkTtsData();
+
+        getActivity().registerReceiver(mLanguagesChangedReceiver,
+                new IntentFilter(TextToSpeech.Engine.ACTION_TTS_DATA_INSTALLED));
     }
 
     @Override
     public void onDestroy() {
+        getActivity().unregisterReceiver(mLanguagesChangedReceiver);
         mTts.shutdown();
         super.onDestroy();
     }
 
+    private final void checkTtsData() {
+        Intent intent = new Intent(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
+        intent.setPackage(getEngineName());
+        try {
+            if (DBG) Log.d(TAG, "Updating engine: Checking voice data: " + intent.toUri(0));
+            startActivityForResult(intent, VOICE_DATA_INTEGRITY_CHECK);
+        } catch (ActivityNotFoundException ex) {
+            Log.e(TAG, "Failed to check TTS data, no activity found for " + intent + ")");
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == VOICE_DATA_INTEGRITY_CHECK) {
+            mVoiceDataDetails = data;
+            updateVoiceDetails();
+        }
+    }
+
     private void updateVoiceDetails() {
-        final Intent voiceDataDetails = getArguments().getParcelable(
-                TtsEnginePreference.FRAGMENT_ARGS_VOICES);
-        if (DBG) Log.d(TAG, "Parsing voice data details, data: " + voiceDataDetails.toUri(0));
-        ArrayList<String> available = voiceDataDetails.getStringArrayListExtra(
+        if (DBG) Log.d(TAG, "Parsing voice data details, data: " + mVoiceDataDetails.toUri(0));
+
+        final ArrayList<String> available = mVoiceDataDetails.getStringArrayListExtra(
                 TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
-        ArrayList<String> unavailable = voiceDataDetails.getStringArrayListExtra(
+        final ArrayList<String> unavailable = mVoiceDataDetails.getStringArrayListExtra(
                 TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
 
         if (available == null){
             Log.e(TAG, "TTS data check failed (available == null).");
-            final CharSequence[] empty = new CharSequence[0];
-            mLocalePreference.setEntries(empty);
-            mLocalePreference.setEntryValues(empty);
+            mLocalePreference.setEnabled(false);
+            getPreferenceScreen().removePreference(mLocalePreference);
             return;
         }
 
@@ -138,11 +188,12 @@
         }
 
         if (available.size() > 0) {
+            mLocalePreference.setEnabled(true);
+            getPreferenceScreen().addPreference(mLocalePreference);
             updateDefaultLocalePref(available);
         } else {
-            final CharSequence[] empty = new CharSequence[0];
-            mLocalePreference.setEntries(empty);
-            mLocalePreference.setEntryValues(empty);
+            mLocalePreference.setEnabled(false);
+            getPreferenceScreen().removePreference(mLocalePreference);
         }
     }
 
@@ -150,10 +201,8 @@
         String currentLocale = mEnginesHelper.getLocalePrefForEngine(
                 getEngineName());
 
-        CharSequence[] entries = new CharSequence[availableLangs.size()];
-        CharSequence[] entryValues = new CharSequence[availableLangs.size()];
-
-        int selectedLanguageIndex = -1;
+        ArrayList<Pair<String, String>> entryPairs =
+                Lists.newArrayListWithCapacity(availableLangs.size());
         for (int i = 0; i < availableLangs.size(); i++) {
             String[] langCountryVariant = availableLangs.get(i).split("-");
             Locale loc = null;
@@ -166,14 +215,32 @@
                                  langCountryVariant[2]);
             }
             if (loc != null){
-                entries[i] = loc.getDisplayName();
-                entryValues[i] = availableLangs.get(i);
-                if (availableLangs.get(i).equalsIgnoreCase(currentLocale)) {
-                    selectedLanguageIndex = i;
-                }
+                entryPairs.add(new Pair<String, String>(
+                        loc.getDisplayName(), availableLangs.get(i)));
             }
         }
 
+        // Sort it
+        Collections.sort(entryPairs, new Comparator<Pair<String, String>>() {
+            @Override
+            public int compare(Pair<String, String> lhs, Pair<String, String> rhs) {
+                return lhs.first.compareToIgnoreCase(rhs.first);
+            }
+        });
+
+        // Get two arrays out of one of pairs
+        int selectedLanguageIndex = -1;
+        CharSequence[] entries = new CharSequence[availableLangs.size()];
+        CharSequence[] entryValues = new CharSequence[availableLangs.size()];
+        int i = 0;
+        for (Pair<String, String> entry : entryPairs) {
+            if (entry.second.equalsIgnoreCase(currentLocale)) {
+                selectedLanguageIndex = i;
+            }
+            entries[i] = entry.first;
+            entryValues[i++] = entry.second;
+        }
+
         mLocalePreference.setEntries(entries);
         mLocalePreference.setEntryValues(entryValues);
         if (selectedLanguageIndex > -1) {
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 84cabe9..518c6b6 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -16,8 +16,10 @@
 
 package com.android.settings.users;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -26,12 +28,15 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.os.SystemProperties;
+import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
@@ -50,7 +55,8 @@
 import java.util.List;
 
 public class UserDetailsSettings extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener, DialogCreatable {
+        implements Preference.OnPreferenceChangeListener, DialogCreatable,
+                   Preference.OnPreferenceClickListener {
 
     private static final String TAG = "UserDetailsSettings";
 
@@ -58,32 +64,19 @@
     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";
+    private static final String KEY_USER_PICTURE = "user_picture";
+
     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"
-    };
+    private static final int RESULT_PICK_IMAGE = 1;
+    private static final int RESULT_CROP_IMAGE = 2;
 
-    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 Preference mPicturePref;
 
     private IPackageManager mIPm;
     private PackageManager mPm;
+    private UserManager mUm;
     private int mUserId;
     private boolean mNewUser;
 
@@ -95,18 +88,20 @@
         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"));
+        mUm = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+
+        if (icicle != null && icicle.containsKey(EXTRA_USER_ID)) {
+            mUserId = icicle.getInt(EXTRA_USER_ID);
+            mNewUser = false;
+        }
 
         if (mUserId == -1) {
-            try {
-                mUserId = mIPm.createUser(getString(R.string.user_new_user_name), 0).id;
-            } catch (RemoteException re) {
-            }
+            mUserId = mUm.createUser(getString(R.string.user_new_user_name), 0).id;
         }
-        mSystemAppGroup = (PreferenceGroup) findPreference(KEY_SYSTEM_APPS);
-        mInstalledAppGroup = (PreferenceGroup) findPreference(KEY_INSTALLED_APPS);
         mNamePref = (EditTextPreference) findPreference(KEY_USER_NAME);
         mNamePref.setOnPreferenceChangeListener(this);
-
+        mPicturePref = findPreference(KEY_USER_PICTURE);
+        mPicturePref.setOnPreferenceClickListener(this);
         setHasOptionsMenu(true);
     }
 
@@ -114,16 +109,24 @@
     public void onResume() {
         super.onResume();
         mPm = getActivity().getPackageManager();
-        if (mUserId > 0) {
+        if (mUserId >= 0) {
             initExistingUser();
         } else {
             initNewUser();
         }
-        refreshApps();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(EXTRA_USER_ID, mUserId);
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (mUserId == 0) {
+            return;
+        }
         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
@@ -142,7 +145,7 @@
     }
 
     private void initExistingUser() {
-        List<UserInfo> users = mPm.getUsers();
+        List<UserInfo> users = mUm.getUsers();
         UserInfo foundUser = null;
         for (UserInfo user : users) {
             if (user.id == mUserId) {
@@ -153,6 +156,9 @@
         if (foundUser != null) {
             mNamePref.setSummary(foundUser.name);
             mNamePref.setText(foundUser.name);
+            if (foundUser.iconPath != null) {
+                setPhotoId(foundUser.iconPath);
+            }
         }
     }
 
@@ -171,71 +177,10 @@
     }
 
     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);
-        }
+        mUm.removeUser(mUserId);
         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) {
@@ -253,12 +198,8 @@
             if (TextUtils.isEmpty(name)) {
                 return false;
             }
-            try {
-                mIPm.updateUserName(mUserId, (String) newValue);
-                mNamePref.setSummary((String) newValue);
-            } catch (RemoteException re) {
-                return false;
-            }
+            mUm.setUserName(mUserId, (String) newValue);
+            mNamePref.setSummary((String) newValue);
         }
         return true;
     }
@@ -282,4 +223,66 @@
                 return null;
         }
     }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference == mPicturePref) {
+            Intent intent = new Intent();
+            intent.setType("image/*");
+            intent.setAction(Intent.ACTION_GET_CONTENT);
+
+            startActivityForResult(intent, RESULT_PICK_IMAGE);
+        }
+        return false;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+        switch (requestCode) {
+        case RESULT_PICK_IMAGE:
+            if (data.getData() != null) {
+                Uri imageUri = data.getData();
+                System.err.println("imageUri = " + imageUri);
+                cropImage(imageUri);
+            }
+            break;
+        case RESULT_CROP_IMAGE:
+            saveCroppedImage(data);
+            break;
+        }
+    }
+
+    private void cropImage(Uri imageUri) {
+        final Uri inputPhotoUri = imageUri;
+        Intent intent = new Intent("com.android.camera.action.CROP");
+        intent.setDataAndType(inputPhotoUri, "image/*");
+        intent.putExtra("crop", "true");
+        intent.putExtra("aspectX", 1);
+        intent.putExtra("aspectY", 1);
+        intent.putExtra("outputX", 96);
+        intent.putExtra("outputY", 96);
+        intent.putExtra("return-data", true);
+        startActivityForResult(intent, RESULT_CROP_IMAGE);
+    }
+
+    private void saveCroppedImage(Intent data) {
+        if (data.hasExtra("data")) {
+            Bitmap bitmap = (Bitmap) data.getParcelableExtra("data");
+            ParcelFileDescriptor fd = mUm.setUserIcon(mUserId);
+            if (fd != null) {
+                bitmap.compress(CompressFormat.PNG, 100,
+                        new ParcelFileDescriptor.AutoCloseOutputStream(fd));
+                setPhotoId(mUm.getUserInfo(mUserId).iconPath);
+            }
+        }
+    }
+
+    private void setPhotoId(String realPath) {
+        Drawable d = Drawable.createFromPath(realPath);
+        if (d == null) return;
+        mPicturePref.setIcon(d);
+    }
 }
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 9380586..e530493 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -16,8 +16,11 @@
 
 package com.android.settings.users;
 
+import android.content.Context;
 import android.content.pm.UserInfo;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
@@ -79,19 +82,28 @@
     }
 
     private void updateUserList() {
-        List<UserInfo> users = getActivity().getPackageManager().getUsers();
+        List<UserInfo> users = ((UserManager) getActivity().getSystemService(Context.USER_SERVICE))
+                .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);
+            if (user.iconPath != null) {
+                setPhotoId(pref, user.iconPath);
+            }
             mUserListCategory.addPreference(pref);
         }
     }
 
+    private void setPhotoId(Preference pref, String realPath) {
+        Drawable d = Drawable.createFromPath(realPath);
+        if (d == null) return;
+        pref.setIcon(d);
+    }
+
     @Override
     public boolean onPreferenceClick(Preference pref) {
         String sid = pref.getKey();
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index ca85d99..9ef269b 100644
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.vpn2;
 
+import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
 
 import android.app.AlertDialog;
diff --git a/src/com/android/settings/vpn2/VpnProfile.java b/src/com/android/settings/vpn2/VpnProfile.java
deleted file mode 100644
index d4d0e79..0000000
--- a/src/com/android/settings/vpn2/VpnProfile.java
+++ /dev/null
@@ -1,121 +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.vpn2;
-
-import java.nio.charset.Charsets;
-
-/**
- * Parcel-like entity class for VPN profiles. To keep things simple, all
- * fields are package private. Methods are provided for serialization, so
- * storage can be implemented easily. Two rules are set for this class.
- * First, all fields must be kept non-null. Second, always make a copy
- * using clone() before modifying.
- */
-class VpnProfile implements Cloneable {
-    // Match these constants with R.array.vpn_types.
-    static final int TYPE_PPTP = 0;
-    static final int TYPE_L2TP_IPSEC_PSK = 1;
-    static final int TYPE_L2TP_IPSEC_RSA = 2;
-    static final int TYPE_IPSEC_XAUTH_PSK = 3;
-    static final int TYPE_IPSEC_XAUTH_RSA = 4;
-    static final int TYPE_IPSEC_HYBRID_RSA = 5;
-    static final int TYPE_MAX = 5;
-
-    // Entity fields.
-    final String key;           // -1
-    String name = "";           // 0
-    int type = TYPE_PPTP;       // 1
-    String server = "";         // 2
-    String username = "";       // 3
-    String password = "";       // 4
-    String dnsServers = "";     // 5
-    String searchDomains = "";  // 6
-    String routes = "";         // 7
-    boolean mppe = true;        // 8
-    String l2tpSecret = "";     // 9
-    String ipsecIdentifier = "";// 10
-    String ipsecSecret = "";    // 11
-    String ipsecUserCert = "";  // 12
-    String ipsecCaCert = "";    // 13
-    String ipsecServerCert = "";// 14
-
-    // Helper fields.
-    boolean saveLogin = false;
-
-    VpnProfile(String key) {
-        this.key = key;
-    }
-
-    static VpnProfile decode(String key, byte[] value) {
-        try {
-            if (key == null) {
-                return null;
-            }
-
-            String[] values = new String(value, Charsets.UTF_8).split("\0", -1);
-            // There can be 14 or 15 values in ICS MR1.
-            if (values.length < 14 || values.length > 15) {
-                return null;
-            }
-
-            VpnProfile profile = new VpnProfile(key);
-            profile.name = values[0];
-            profile.type = Integer.valueOf(values[1]);
-            if (profile.type < 0 || profile.type > TYPE_MAX) {
-                return null;
-            }
-            profile.server = values[2];
-            profile.username = values[3];
-            profile.password = values[4];
-            profile.dnsServers = values[5];
-            profile.searchDomains = values[6];
-            profile.routes = values[7];
-            profile.mppe = Boolean.valueOf(values[8]);
-            profile.l2tpSecret = values[9];
-            profile.ipsecIdentifier = values[10];
-            profile.ipsecSecret = values[11];
-            profile.ipsecUserCert = values[12];
-            profile.ipsecCaCert = values[13];
-            profile.ipsecServerCert = (values.length > 14) ? values[14] : "";
-
-            profile.saveLogin = !profile.username.isEmpty() || !profile.password.isEmpty();
-            return profile;
-        } catch (Exception e) {
-            // ignore
-        }
-        return null;
-    }
-
-    byte[] encode() {
-        StringBuilder builder = new StringBuilder(name);
-        builder.append('\0').append(type);
-        builder.append('\0').append(server);
-        builder.append('\0').append(saveLogin ? username : "");
-        builder.append('\0').append(saveLogin ? password : "");
-        builder.append('\0').append(dnsServers);
-        builder.append('\0').append(searchDomains);
-        builder.append('\0').append(routes);
-        builder.append('\0').append(mppe);
-        builder.append('\0').append(l2tpSecret);
-        builder.append('\0').append(ipsecIdentifier);
-        builder.append('\0').append(ipsecSecret);
-        builder.append('\0').append(ipsecUserCert);
-        builder.append('\0').append(ipsecCaCert);
-        builder.append('\0').append(ipsecServerCert);
-        return builder.toString().getBytes(Charsets.UTF_8);
-    }
-}
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index a26623b..07aa04f 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -16,13 +16,14 @@
 
 package com.android.settings.vpn2;
 
-import com.android.settings.R;
-
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.net.ConnectivityManager;
 import android.net.IConnectivityManager;
-import android.net.LinkProperties;
-import android.net.RouteInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -31,30 +32,40 @@
 import android.preference.PreferenceGroup;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
 import android.widget.Toast;
 
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
+import com.android.internal.net.VpnProfile;
+import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.google.android.collect.Lists;
 
-import java.net.Inet4Address;
-import java.nio.charset.Charsets;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 public class VpnSettings extends SettingsPreferenceFragment implements
         Handler.Callback, Preference.OnPreferenceClickListener,
         DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
-
     private static final String TAG = "VpnSettings";
 
+    private static final String TAG_LOCKDOWN = "lockdown";
+
+    // TODO: migrate to using DialogFragment when editing
+
     private final IConnectivityManager mService = IConnectivityManager.Stub
             .asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
     private final KeyStore mKeyStore = KeyStore.getInstance();
@@ -72,8 +83,9 @@
     @Override
     public void onCreate(Bundle savedState) {
         super.onCreate(savedState);
+
+        setHasOptionsMenu(true);
         addPreferencesFromResource(R.xml.vpn_settings2);
-        getPreferenceScreen().setOrderingAsAdded(false);
 
         if (savedState != null) {
             VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"),
@@ -86,6 +98,35 @@
     }
 
     @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.vpn, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.vpn_create: {
+                // Generate a new key. Here we just use the current time.
+                long millis = System.currentTimeMillis();
+                while (mPreferences.containsKey(Long.toHexString(millis))) {
+                    ++millis;
+                }
+                mDialog = new VpnDialog(
+                        getActivity(), this, new VpnProfile(Long.toHexString(millis)), true);
+                mDialog.setOnDismissListener(this);
+                mDialog.show();
+                return true;
+            }
+            case R.id.vpn_lockdown: {
+                LockdownConfigFragment.show(this);
+                return true;
+            }
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle savedState) {
         // We do not save view hierarchy, as they are just profiles.
         if (mDialog != null) {
@@ -124,24 +165,14 @@
             mPreferences = new HashMap<String, VpnPreference>();
             PreferenceGroup group = getPreferenceScreen();
 
-            String[] keys = mKeyStore.saw(Credentials.VPN);
-            if (keys != null && keys.length > 0) {
-                Context context = getActivity();
-
-                for (String key : keys) {
-                    VpnProfile profile = VpnProfile.decode(key,
-                            mKeyStore.get(Credentials.VPN + key));
-                    if (profile == null) {
-                        Log.w(TAG, "bad profile: key = " + key);
-                        mKeyStore.delete(Credentials.VPN + key);
-                    } else {
-                        VpnPreference preference = new VpnPreference(context, profile);
-                        mPreferences.put(key, preference);
-                        group.addPreference(preference);
-                    }
-                }
+            final Context context = getActivity();
+            final List<VpnProfile> profiles = loadVpnProfiles(mKeyStore);
+            for (VpnProfile profile : profiles) {
+                final VpnPreference pref = new VpnPreference(context, profile);
+                pref.setOnPreferenceClickListener(this);
+                mPreferences.put(profile.key, pref);
+                group.addPreference(pref);
             }
-            group.findPreference("add_network").setOnPreferenceClickListener(this);
         }
 
         // Show the dialog if there is one.
@@ -196,6 +227,7 @@
                 preference.update(profile);
             } else {
                 preference = new VpnPreference(getActivity(), profile);
+                preference.setOnPreferenceClickListener(this);
                 mPreferences.put(profile.key, preference);
                 getPreferenceScreen().addPreference(preference);
             }
@@ -322,136 +354,12 @@
         return true;
     }
 
-    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;
-        for (RouteInfo route : network.getRoutes()) {
-            // Currently legacy VPN only works on IPv4.
-            if (route.isDefaultRoute() && route.getGateway() instanceof Inet4Address) {
-                gateway = route.getGateway().getHostAddress();
-                break;
-            }
-        }
-        if (gateway == null) {
-            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};
-    }
-
     private void connect(VpnProfile profile) throws Exception {
-        // Get the default interface and the default gateway.
-        String[] network = getDefaultNetwork();
-        String interfaze = network[0];
-        String gateway = network[1];
-
-        // Load certificates.
-        String privateKey = "";
-        String userCert = "";
-        String caCert = "";
-        String serverCert = "";
-        if (!profile.ipsecUserCert.isEmpty()) {
-            /*
-             * 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);
+        try {
+            mService.startLegacyVpn(profile);
+        } catch (IllegalStateException e) {
+            Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show();
         }
-        if (!profile.ipsecCaCert.isEmpty()) {
-            byte[] value = mKeyStore.get(Credentials.CA_CERTIFICATE + profile.ipsecCaCert);
-            caCert = (value == null) ? null : new String(value, Charsets.UTF_8);
-        }
-        if (!profile.ipsecServerCert.isEmpty()) {
-            byte[] value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecServerCert);
-            serverCert = (value == null) ? null : new String(value, Charsets.UTF_8);
-        }
-        if (privateKey == null || userCert == null || caCert == null || serverCert == null) {
-            Toast.makeText(getActivity(), R.string.vpn_missing_cert, Toast.LENGTH_LONG).show();
-            throw new IllegalStateException("Cannot load credentials");
-        }
-
-        // Prepare arguments for racoon.
-        String[] racoon = null;
-        switch (profile.type) {
-            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
-                racoon = new String[] {
-                    interfaze, profile.server, "udppsk", profile.ipsecIdentifier,
-                    profile.ipsecSecret, "1701",
-                };
-                break;
-            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
-                racoon = new String[] {
-                    interfaze, profile.server, "udprsa", privateKey, userCert,
-                    caCert, serverCert, "1701",
-                };
-                break;
-            case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
-                racoon = new String[] {
-                    interfaze, profile.server, "xauthpsk", profile.ipsecIdentifier,
-                    profile.ipsecSecret, profile.username, profile.password, "", gateway,
-                };
-                break;
-            case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
-                racoon = new String[] {
-                    interfaze, profile.server, "xauthrsa", privateKey, userCert,
-                    caCert, serverCert, profile.username, profile.password, "", gateway,
-                };
-                break;
-            case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
-                racoon = new String[] {
-                    interfaze, profile.server, "hybridrsa",
-                    caCert, serverCert, profile.username, profile.password, "", gateway,
-                };
-                break;
-        }
-
-        // Prepare arguments for mtpd.
-        String[] mtpd = null;
-        switch (profile.type) {
-            case VpnProfile.TYPE_PPTP:
-                mtpd = new String[] {
-                    interfaze, "pptp", profile.server, "1723",
-                    "name", profile.username, "password", profile.password,
-                    "linkname", "vpn", "refuse-eap", "nodefaultroute",
-                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",
-                    (profile.mppe ? "+mppe" : "nomppe"),
-                };
-                break;
-            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
-            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
-                mtpd = new String[] {
-                    interfaze, "l2tp", profile.server, "1701", profile.l2tpSecret,
-                    "name", profile.username, "password", profile.password,
-                    "linkname", "vpn", "refuse-eap", "nodefaultroute",
-                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",
-                };
-                break;
-        }
-
-        VpnConfig config = new VpnConfig();
-        config.user = profile.key;
-        config.interfaze = interfaze;
-        config.session = profile.name;
-        config.routes = profile.routes;
-        if (!profile.dnsServers.isEmpty()) {
-            config.dnsServers = Arrays.asList(profile.dnsServers.split(" +"));
-        }
-        if (!profile.searchDomains.isEmpty()) {
-            config.searchDomains = Arrays.asList(profile.searchDomains.split(" +"));
-        }
-
-        mService.startLegacyVpn(config, racoon, mtpd);
     }
 
     private void disconnect(String key) {
@@ -469,7 +377,7 @@
         return R.string.help_url_vpn;
     }
 
-    private class VpnPreference extends Preference {
+    private static class VpnPreference extends Preference {
         private VpnProfile mProfile;
         private int mState = -1;
 
@@ -477,7 +385,6 @@
             super(context);
             setPersistent(false);
             setOrder(0);
-            setOnPreferenceClickListener(VpnSettings.this);
 
             mProfile = profile;
             update();
@@ -525,4 +432,109 @@
             return result;
         }
     }
+
+    /**
+     * Dialog to configure always-on VPN.
+     */
+    public static class LockdownConfigFragment extends DialogFragment {
+        private List<VpnProfile> mProfiles;
+        private List<CharSequence> mTitles;
+        private int mCurrentIndex;
+
+        private static class TitleAdapter extends ArrayAdapter<CharSequence> {
+            public TitleAdapter(Context context, List<CharSequence> objects) {
+                super(context, com.android.internal.R.layout.select_dialog_singlechoice_holo,
+                        android.R.id.text1, objects);
+            }
+        }
+
+        public static void show(VpnSettings parent) {
+            if (!parent.isAdded()) return;
+
+            final LockdownConfigFragment dialog = new LockdownConfigFragment();
+            dialog.show(parent.getFragmentManager(), TAG_LOCKDOWN);
+        }
+
+        private static String getStringOrNull(KeyStore keyStore, String key) {
+            final byte[] value = keyStore.get(Credentials.LOCKDOWN_VPN);
+            return value == null ? null : new String(value);
+        }
+
+        private void initProfiles(KeyStore keyStore, Resources res) {
+            final String lockdownKey = getStringOrNull(keyStore, Credentials.LOCKDOWN_VPN);
+
+            mProfiles = loadVpnProfiles(keyStore);
+            mTitles = Lists.newArrayList();
+            mTitles.add(res.getText(R.string.vpn_lockdown_none));
+            mCurrentIndex = 0;
+
+            for (VpnProfile profile : mProfiles) {
+                if (TextUtils.equals(profile.key, lockdownKey)) {
+                    mCurrentIndex = mTitles.size();
+                }
+                mTitles.add(profile.name);
+            }
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+            final KeyStore keyStore = KeyStore.getInstance();
+
+            initProfiles(keyStore, context.getResources());
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
+
+            builder.setTitle(R.string.vpn_menu_lockdown);
+
+            final View view = dialogInflater.inflate(R.layout.vpn_lockdown_editor, null, false);
+            final ListView listView = (ListView) view.findViewById(android.R.id.list);
+            listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+            listView.setAdapter(new TitleAdapter(context, mTitles));
+            listView.setItemChecked(mCurrentIndex, true);
+            builder.setView(view);
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    final int newIndex = listView.getCheckedItemPosition();
+                    if (mCurrentIndex == newIndex) return;
+
+                    if (newIndex == 0) {
+                        keyStore.delete(Credentials.LOCKDOWN_VPN);
+
+                    } else {
+                        final VpnProfile profile = mProfiles.get(newIndex - 1);
+                        if (!profile.isValidLockdownProfile()) {
+                            Toast.makeText(context, R.string.vpn_lockdown_config_error,
+                                    Toast.LENGTH_LONG).show();
+                            return;
+                        }
+                        keyStore.put(Credentials.LOCKDOWN_VPN, profile.key.getBytes());
+                    }
+
+                    // kick profiles since we changed them
+                    ConnectivityManager.from(getActivity()).updateLockdownVpn();
+                }
+            });
+
+            return builder.create();
+        }
+    }
+
+    private static List<VpnProfile> loadVpnProfiles(KeyStore keyStore) {
+        final ArrayList<VpnProfile> result = Lists.newArrayList();
+        final String[] keys = keyStore.saw(Credentials.VPN);
+        if (keys != null) {
+            for (String key : keys) {
+                final VpnProfile profile = VpnProfile.decode(
+                        key, keyStore.get(Credentials.VPN + key));
+                if (profile != null) {
+                    result.add(profile);
+                }
+            }
+        }
+        return result;
+    }
 }
diff --git a/src/com/android/settings/widget/ChartView.java b/src/com/android/settings/widget/ChartView.java
index f410d57..6441612 100644
--- a/src/com/android/settings/widget/ChartView.java
+++ b/src/com/android/settings/widget/ChartView.java
@@ -38,7 +38,7 @@
 public class ChartView extends FrameLayout {
     // TODO: extend something that supports two-dimensional scrolling
 
-    private static final int SWEEP_GRAVITY = Gravity.TOP | Gravity.LEFT;
+    private static final int SWEEP_GRAVITY = Gravity.TOP | Gravity.START;
 
     ChartAxis mHoriz;
     ChartAxis mVert;
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 1d411f7..30ae7c3 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -34,6 +34,7 @@
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.IPowerManager;
+import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.provider.Settings;
@@ -94,16 +95,10 @@
         R.drawable.appwidget_settings_ind_on_r_holo
     };
 
-    /**
-     * Minimum and maximum brightnesses.  Don't go to 0 since that makes the display unusable
-     */
-    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);
+    private static final float HALF_BRIGHTNESS_THRESHOLD = 0.3f;
     /** Minimum brightness at which the indicator is shown at full */
-    private static final int FULL_BRIGHTNESS_THRESHOLD = (int) (0.8 * MAXIMUM_BACKLIGHT);
+    private static final float FULL_BRIGHTNESS_THRESHOLD = 0.8f;
 
     private static final StateTracker sWifiState = new WifiStateTracker();
     private static final StateTracker sBluetoothState = new BluetoothStateTracker();
@@ -166,6 +161,11 @@
         }
 
         /**
+         * Return the ID of the clickable container for the setting.
+         */
+        public abstract int getContainerId();
+
+        /**
          * Return the ID of the main large image button for the setting.
          */
         public abstract int getButtonId();
@@ -176,6 +176,11 @@
         public abstract int getIndicatorId();
 
         /**
+         * Returns the resource ID of the setting's content description.
+         */
+        public abstract int getButtonDescription();
+
+        /**
          * Returns the resource ID of the image to show as a function of
          * the on-vs-off state.
          */
@@ -191,16 +196,21 @@
          * turning off, turning on) of the setting.
          */
         public final void setImageViewResources(Context context, RemoteViews views) {
+            int containerId = getContainerId();
             int buttonId = getButtonId();
             int indicatorId = getIndicatorId();
             int pos = getPosition();
             switch (getTriState(context)) {
                 case STATE_DISABLED:
+                    views.setContentDescription(containerId,
+                        getContentDescription(context, R.string.gadget_state_off));
                     views.setImageViewResource(buttonId, getButtonImageId(false));
                     views.setImageViewResource(
                         indicatorId, IND_DRAWABLE_OFF[pos]);
                     break;
                 case STATE_ENABLED:
+                    views.setContentDescription(containerId,
+                        getContentDescription(context, R.string.gadget_state_on));
                     views.setImageViewResource(buttonId, getButtonImageId(true));
                     views.setImageViewResource(
                         indicatorId, IND_DRAWABLE_ON[pos]);
@@ -212,10 +222,14 @@
                     // user's intent.  This is much easier to see in
                     // sunlight.
                     if (isTurningOn()) {
+                        views.setContentDescription(containerId,
+                            getContentDescription(context, R.string.gadget_state_turning_on));
                         views.setImageViewResource(buttonId, getButtonImageId(true));
                         views.setImageViewResource(
                             indicatorId, IND_DRAWABLE_MID[pos]);
                     } else {
+                        views.setContentDescription(containerId,
+                            getContentDescription(context, R.string.gadget_state_turning_off));
                         views.setImageViewResource(buttonId, getButtonImageId(false));
                         views.setImageViewResource(
                             indicatorId, IND_DRAWABLE_OFF[pos]);
@@ -225,6 +239,16 @@
         }
 
         /**
+         * Returns the gadget state template populated with the gadget
+         * description and state.
+         */
+        private final String getContentDescription(Context context, int stateResId) {
+            final String gadget = context.getString(getButtonDescription());
+            final String state = context.getString(stateResId);
+            return context.getString(R.string.gadget_state_template, gadget, state);
+        }
+
+        /**
          * Update internal state from a broadcast state change.
          */
         public abstract void onActualStateChange(Context context, Intent intent);
@@ -327,8 +351,10 @@
      * Subclass of StateTracker to get/set Wifi state.
      */
     private static final class WifiStateTracker extends StateTracker {
+        public int getContainerId() { return R.id.btn_wifi; }
         public int getButtonId() { return R.id.img_wifi; }
         public int getIndicatorId() { return R.id.ind_wifi; }
+        public int getButtonDescription() { return R.string.gadget_wifi; }
         public int getButtonImageId(boolean on) {
             return on ? R.drawable.ic_appwidget_settings_wifi_on_holo
                     : R.drawable.ic_appwidget_settings_wifi_off_holo;
@@ -410,8 +436,10 @@
      * Subclass of StateTracker to get/set Bluetooth state.
      */
     private static final class BluetoothStateTracker extends StateTracker {
+        public int getContainerId() { return R.id.btn_bluetooth; }
         public int getButtonId() { return R.id.img_bluetooth; }
         public int getIndicatorId() { return R.id.ind_bluetooth; }
+        public int getButtonDescription() { return R.string.gadget_bluetooth; }
         public int getButtonImageId(boolean on) {
             return on ? R.drawable.ic_appwidget_settings_bluetooth_on_holo
                     : R.drawable.ic_appwidget_settings_bluetooth_off_holo;
@@ -481,8 +509,10 @@
      * Subclass of StateTracker for GPS state.
      */
     private static final class GpsStateTracker extends StateTracker {
+        public int getContainerId() { return R.id.btn_gps; }
         public int getButtonId() { return R.id.img_gps; }
         public int getIndicatorId() { return R.id.ind_gps; }
+        public int getButtonDescription() { return R.string.gadget_gps; }
         public int getButtonImageId(boolean on) {
             return on ? R.drawable.ic_appwidget_settings_gps_on_holo
                     : R.drawable.ic_appwidget_settings_gps_off_holo;
@@ -531,8 +561,10 @@
      * Subclass of StateTracker for sync state.
      */
     private static final class SyncStateTracker extends StateTracker {
+        public int getContainerId() { return R.id.btn_sync; }
         public int getButtonId() { return R.id.img_sync; }
         public int getIndicatorId() { return R.id.ind_sync; }
+        public int getButtonDescription() { return R.string.gadget_sync; }
         public int getButtonImageId(boolean on) {
             return on ? R.drawable.ic_appwidget_settings_sync_on_holo
                     : R.drawable.ic_appwidget_settings_sync_off_holo;
@@ -678,25 +710,42 @@
         sSyncState.setImageViewResources(context, views);
 
         if (getBrightnessMode(context)) {
+            views.setContentDescription(R.id.btn_brightness,
+                    context.getString(R.string.gadget_brightness_template,
+                            context.getString(R.string.gadget_brightness_state_auto)));
             views.setImageViewResource(R.id.img_brightness,
                     R.drawable.ic_appwidget_settings_brightness_auto_holo);
             views.setImageViewResource(R.id.ind_brightness,
                     R.drawable.appwidget_settings_ind_on_r_holo);
         } else {
             final int brightness = getBrightness(context);
+            final PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
             // Set the icon
-            if (brightness > FULL_BRIGHTNESS_THRESHOLD) {
+            final int full = (int)(pm.getMaximumScreenBrightnessSetting()
+                    * FULL_BRIGHTNESS_THRESHOLD);
+            final int half = (int)(pm.getMaximumScreenBrightnessSetting()
+                    * HALF_BRIGHTNESS_THRESHOLD);
+            if (brightness > full) {
+                views.setContentDescription(R.id.btn_brightness,
+                        context.getString(R.string.gadget_brightness_template,
+                                context.getString(R.string.gadget_brightness_state_full)));
                 views.setImageViewResource(R.id.img_brightness,
                         R.drawable.ic_appwidget_settings_brightness_full_holo);
-            } else if (brightness > HALF_BRIGHTNESS_THRESHOLD) {
+            } else if (brightness > half) {
+                views.setContentDescription(R.id.btn_brightness,
+                        context.getString(R.string.gadget_brightness_template,
+                                context.getString(R.string.gadget_brightness_state_half)));
                 views.setImageViewResource(R.id.img_brightness,
                         R.drawable.ic_appwidget_settings_brightness_half_holo);
             } else {
+                views.setContentDescription(R.id.btn_brightness,
+                        context.getString(R.string.gadget_brightness_template,
+                                context.getString(R.string.gadget_brightness_state_off)));
                 views.setImageViewResource(R.id.img_brightness,
                         R.drawable.ic_appwidget_settings_brightness_off_holo);
             }
             // Set the ON state
-            if (brightness > HALF_BRIGHTNESS_THRESHOLD) {
+            if (brightness > half) {
                 views.setImageViewResource(R.id.ind_brightness,
                         R.drawable.appwidget_settings_ind_on_r_holo);
             } else {
@@ -775,13 +824,9 @@
      */
     private static int getBrightness(Context context) {
         try {
-            IPowerManager power = IPowerManager.Stub.asInterface(
-                    ServiceManager.getService("power"));
-            if (power != null) {
-                int brightness = Settings.System.getInt(context.getContentResolver(),
-                        Settings.System.SCREEN_BRIGHTNESS);
-                return brightness;
-            }
+            int brightness = Settings.System.getInt(context.getContentResolver(),
+                    Settings.System.SCREEN_BRIGHTNESS);
+            return brightness;
         } catch (Exception e) {
         }
         return 0;
@@ -795,13 +840,9 @@
      */
     private static boolean getBrightnessMode(Context context) {
         try {
-            IPowerManager power = IPowerManager.Stub.asInterface(
-                    ServiceManager.getService("power"));
-            if (power != null) {
-                int brightnessMode = Settings.System.getInt(context.getContentResolver(),
-                        Settings.System.SCREEN_BRIGHTNESS_MODE);
-                return brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-            }
+            int brightnessMode = Settings.System.getInt(context.getContentResolver(),
+                    Settings.System.SCREEN_BRIGHTNESS_MODE);
+            return brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
         } catch (Exception e) {
             Log.d(TAG, "getBrightnessMode: " + e);
         }
@@ -818,6 +859,8 @@
             IPowerManager power = IPowerManager.Stub.asInterface(
                     ServiceManager.getService("power"));
             if (power != null) {
+                PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
+
                 ContentResolver cr = context.getContentResolver();
                 int brightness = Settings.System.getInt(cr,
                         Settings.System.SCREEN_BRIGHTNESS);
@@ -832,15 +875,15 @@
                 // Rotate AUTO -> MINIMUM -> DEFAULT -> MAXIMUM
                 // Technically, not a toggle...
                 if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
-                    brightness = MINIMUM_BACKLIGHT;
+                    brightness = pm.getMinimumScreenBrightnessSetting();
                     brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
-                } else if (brightness < DEFAULT_BACKLIGHT) {
-                    brightness = DEFAULT_BACKLIGHT;
-                } else if (brightness < MAXIMUM_BACKLIGHT) {
-                    brightness = MAXIMUM_BACKLIGHT;
+                } else if (brightness < pm.getDefaultScreenBrightnessSetting()) {
+                    brightness = pm.getDefaultScreenBrightnessSetting();
+                } else if (brightness < pm.getMaximumScreenBrightnessSetting()) {
+                    brightness = pm.getMaximumScreenBrightnessSetting();
                 } else {
                     brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-                    brightness = MINIMUM_BACKLIGHT;
+                    brightness = pm.getMinimumScreenBrightnessSetting();
                 }
 
                 if (context.getResources().getBoolean(
@@ -854,7 +897,7 @@
                     brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
                 }
                 if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL) {
-                    power.setBacklightBrightness(brightness);
+                    power.setTemporaryScreenBrightnessSettingOverride(brightness);
                     Settings.System.putInt(cr, Settings.System.SCREEN_BRIGHTNESS, brightness);
                 }
             }
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index bb50d2a..c9bf3bc 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -44,6 +44,7 @@
     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_POOR_NETWORK_DETECTION = "wifi_poor_network_detection";
+    private static final String KEY_SUSPEND_OPTIMIZATIONS = "suspend_optimizations";
 
     private WifiManager mWifiManager;
 
@@ -84,6 +85,11 @@
             }
         }
 
+        CheckBoxPreference suspendOptimizations =
+            (CheckBoxPreference) findPreference(KEY_SUSPEND_OPTIMIZATIONS);
+        suspendOptimizations.setChecked(Secure.getInt(getContentResolver(),
+                Secure.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, 1) == 1);
+
         ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
 
         if (mWifiManager.isDualBandSupported()) {
@@ -148,6 +154,10 @@
             Secure.putInt(getContentResolver(),
                     Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
                     ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
+        } else if (KEY_SUSPEND_OPTIMIZATIONS.equals(key)) {
+            Secure.putInt(getContentResolver(),
+                    Secure.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED,
+                    ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
         } else {
             return super.onPreferenceTreeClick(screen, preference);
         }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index de42f2a..a4ee589 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -114,7 +114,6 @@
     private final Scanner mScanner;
 
     private WifiManager mWifiManager;
-    private WifiManager.Channel mChannel;
     private WifiManager.ActionListener mConnectListener;
     private WifiManager.ActionListener mSaveListener;
     private WifiManager.ActionListener mForgetListener;
@@ -243,7 +242,6 @@
 
         mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-        mChannel = mWifiManager.initialize(getActivity(), getActivity().getMainLooper(), null);
 
         mConnectListener = new WifiManager.ActionListener() {
                                    public void onSuccess() {
@@ -344,7 +342,7 @@
                     activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
                             ActionBar.LayoutParams.WRAP_CONTENT,
                             ActionBar.LayoutParams.WRAP_CONTENT,
-                            Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                            Gravity.CENTER_VERTICAL | Gravity.END));
                 }
             }
 
@@ -373,7 +371,7 @@
         getActivity().registerReceiver(mReceiver, mFilter);
         if (mKeyStoreNetworkId != INVALID_NETWORK_ID &&
                 KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) {
-            mWifiManager.connect(mChannel, mKeyStoreNetworkId, mConnectListener);
+            mWifiManager.connect(mKeyStoreNetworkId, mConnectListener);
         }
         mKeyStoreNetworkId = INVALID_NETWORK_ID;
 
@@ -520,13 +518,13 @@
             case MENU_ID_CONNECT: {
                 if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
                     if (!requireKeyStore(mSelectedAccessPoint.getConfig())) {
-                        mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId,
+                        mWifiManager.connect(mSelectedAccessPoint.networkId,
                                 mConnectListener);
                     }
                 } else if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
                     /** Bypass dialog for unsecured networks */
                     mSelectedAccessPoint.generateOpenNetworkConfig();
-                    mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(),
+                    mWifiManager.connect(mSelectedAccessPoint.getConfig(),
                             mConnectListener);
                 } else {
                     showDialog(mSelectedAccessPoint, true);
@@ -534,7 +532,7 @@
                 return true;
             }
             case MENU_ID_FORGET: {
-                mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
+                mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
                 return true;
             }
             case MENU_ID_MODIFY: {
@@ -553,7 +551,7 @@
             if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
                     mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
                 mSelectedAccessPoint.generateOpenNetworkConfig();
-                mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(), mConnectListener);
+                mWifiManager.connect(mSelectedAccessPoint.getConfig(), mConnectListener);
             } else {
                 showDialog(mSelectedAccessPoint, false);
             }
@@ -863,18 +861,18 @@
             if (mSelectedAccessPoint != null
                     && !requireKeyStore(mSelectedAccessPoint.getConfig())
                     && mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
-                mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId,
+                mWifiManager.connect(mSelectedAccessPoint.networkId,
                         mConnectListener);
             }
         } else if (config.networkId != INVALID_NETWORK_ID) {
             if (mSelectedAccessPoint != null) {
-                mWifiManager.save(mChannel, config, mSaveListener);
+                mWifiManager.save(config, mSaveListener);
             }
         } else {
             if (configController.isEdit() || requireKeyStore(config)) {
-                mWifiManager.save(mChannel, config, mSaveListener);
+                mWifiManager.save(config, mSaveListener);
             } else {
-                mWifiManager.connect(mChannel, config, mConnectListener);
+                mWifiManager.connect(config, mConnectListener);
             }
         }
 
@@ -891,7 +889,7 @@
             return;
         }
 
-        mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
+        mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
 
         if (mWifiManager.isWifiEnabled()) {
             mScanner.resume();
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 8258b55..bc387cb 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -38,7 +38,6 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.android.internal.util.AsyncChannel;
 import com.android.settings.R;
 
 import java.util.Collection;
@@ -74,7 +73,6 @@
 
     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;
@@ -143,7 +141,6 @@
         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);
@@ -596,7 +593,7 @@
                     Log.d(TAG, String.format("forgeting Wi-Fi network \"%s\" (id: %d)",
                             config.SSID, config.networkId));
                 }
-                mWifiManager.forget(mChannel, config.networkId, new WifiManager.ActionListener() {
+                mWifiManager.forget(config.networkId, new WifiManager.ActionListener() {
                         public void onSuccess() {
                         }
                         public void onFailure(int reason) {
@@ -761,7 +758,7 @@
      */
     /* package */ void onSaveNetwork(WifiConfiguration config) {
         // We want to both save and connect a network. connectNetwork() does both.
-        mWifiManager.connect(mChannel, config, new WifiManager.ActionListener() {
+        mWifiManager.connect(config, new WifiManager.ActionListener() {
                 public void onSuccess() {
                 }
                 public void onFailure(int reason) {
diff --git a/src/com/android/settings/wifi/WpsDialog.java b/src/com/android/settings/wifi/WpsDialog.java
index 40b2a35..2a93884 100644
--- a/src/com/android/settings/wifi/WpsDialog.java
+++ b/src/com/android/settings/wifi/WpsDialog.java
@@ -56,7 +56,6 @@
     private static final int WPS_TIMEOUT_S = 120;
 
     private WifiManager mWifiManager;
-    private WifiManager.Channel mChannel;
     private WifiManager.WpsListener mWpsListener;
     private int mWpsSetup;
 
@@ -155,7 +154,6 @@
         });
 
         mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
-        mChannel = mWifiManager.initialize(mContext, mContext.getMainLooper(), null);
 
         setView(mView);
         super.onCreate(savedInstanceState);
@@ -184,13 +182,13 @@
 
         WpsInfo wpsConfig = new WpsInfo();
         wpsConfig.setup = mWpsSetup;
-        mWifiManager.startWps(mChannel, wpsConfig, mWpsListener);
+        mWifiManager.startWps(wpsConfig, mWpsListener);
     }
 
     @Override
     protected void onStop() {
         if (mDialogState != DialogState.WPS_COMPLETE) {
-            mWifiManager.cancelWps(mChannel, null);
+            mWifiManager.cancelWps(null);
         }
 
         if (mReceiver != null) {
@@ -203,31 +201,36 @@
         }
     }
 
-    private void updateDialog(DialogState state, String msg) {
+    private void updateDialog(final DialogState state, final 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;
+        mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    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);
                 }
-                break;
-        }
-        mTextView.setText(msg);
-    }
+            });
+   }
 
     private void handleEvent(Context context, Intent intent) {
         String action = intent.getAction();
diff --git a/tests/res/values-fa/strings.xml b/tests/res/values-fa/strings.xml
index 1422446..d3a16b0 100644
--- a/tests/res/values-fa/strings.xml
+++ b/tests/res/values-fa/strings.xml
@@ -21,8 +21,8 @@
     <string name="stop_scan" msgid="527546916633745779">"توقف اسکن"</string>
     <string name="operator_hello" msgid="292208161864910159">"سلام اپراتور!"</string>
     <string name="operator_settings_title" msgid="1410094511974808567">"اپراتور"</string>
-    <string name="operator_settings_summary" msgid="5916597343019392258">"گیره اپراتور که جهت شروع فعالیت مورد نظر استفاده می شود"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"گیره اپراتور که جهت شروع فعالیت مورد نظر استفاده می‌شود"</string>
     <string name="manufacturer_hello" msgid="7525744633645544137">"سلام سازنده!"</string>
     <string name="manufacturer_settings_title" msgid="2503105049808838612">"سازنده"</string>
-    <string name="manufacturer_settings_summary" msgid="766746044826063472">"گیره سازنده که می توان از آن برای شروع فعالیت دلخواه استفاده کرد"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"گیره سازنده که می‌توان از آن برای شروع فعالیت دلخواه استفاده کرد"</string>
 </resources>